~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);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
	208	+ menu.add("-");
	209	+ deleteItem = menu.add(new MenuItem("Delete"));
	210	+ deleteItem.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,73 +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);
	338	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	339	+ relinkverticesItem.addActionListener(this);
	340	+
	341	+ if (Globals.ADVANCED)
	342	+ {
222	343	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	344	setMasterItem.addActionListener(this);
	345	+ }
224	346
225	347	oe.menuBar.add(menu = new Menu("Group"));
226		- grabItem = menu.add(new MenuItem("Grab"));
227		- grabItem.addActionListener(this);
	348	+// grabItem = menu.add(new MenuItem("Grab"));
	349	+// grabItem.addActionListener(this);
228	350	backItem = menu.add(new MenuItem("Back"));
229	351	backItem.addActionListener(this);
230	352	frontItem = menu.add(new MenuItem("Front"));
231	353	frontItem.addActionListener(this);
232		- compositeItem = menu.add(new MenuItem("Composite"));
233		- compositeItem.addActionListener(this);
234		- menu.add("-");
235		- randomItem = menu.add(new MenuItem("Random"));
236		- randomItem.addActionListener(this);
237		- physicsItem = menu.add(new MenuItem("Physics"));
238		- physicsItem.addActionListener(this);
239		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
240		- frameselectorItem.addActionListener(this);
	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"));
	360	+ hideItem.addActionListener(this);
	361	+ }
	362	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	363	+ ungroupItem.addActionListener(this);
	364	+
	365	+// menu.add("-");
	366	+//
	367	+// switchItem = menu.add(new MenuItem("Switch node"));
	368	+// switchItem.addActionListener(this);
	369	+ if (Globals.ADVANCED)
	370	+ {
241	371	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242	372	switchGeoItem.addActionListener(this);
243	373	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244	374	switchTransfoItem.addActionListener(this);
245		- morphItem = menu.add(new MenuItem("Morph"));
	375	+ morphItem = menu.add(new MenuItem("Morph Group"));
246	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);
247	383	scriptNodeItem = menu.add(new MenuItem("Script Node"));
248	384	scriptNodeItem.addActionListener(this);
249		- cameraItem = menu.add(new MenuItem("Camera"));
250		- cameraItem.addActionListener(this);
	385	+ }
251	386
252	387	oe.menuBar.add(menu = new Menu("Object"));
253		- textureItem = menu.add(new MenuItem("Texture"));
254		- textureItem.addActionListener(this);
	388	+// textureItem = menu.add(new MenuItem("Texture"));
	389	+// textureItem.addActionListener(this);
	390	+ billboardItem = menu.add(new MenuItem("Billboard"));
	391	+ billboardItem.addActionListener(this);
255	392	csgItem = menu.add(new MenuItem("CSG"));
256	393	csgItem.addActionListener(this);
257		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	394	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
258	395	shadowXItem.addActionListener(this);
259		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	396	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
260	397	shadowYItem.addActionListener(this);
261		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	398	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
262	399	shadowZItem.addActionListener(this);
	400	+ attributeItem = menu.add(new MenuItem("Attribute"));
	401	+ attributeItem.addActionListener(this);
	402	+
	403	+ if (Globals.ADVANCED)
	404	+ {
	405	+ menu.add("-");
263	406	linkerItem = menu.add(new MenuItem("Linker"));
264	407	linkerItem.addActionListener(this);
265	408	templateItem = menu.add(new MenuItem("Template"));
266	409	templateItem.addActionListener(this);
267		- attributeItem = menu.add(new MenuItem("Attribute"));
268		- attributeItem.addActionListener(this);
269	410	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	411	pointflowItem.addActionListener(this);
	412	+ }
271	413	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	414	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	415	resetTransformItem.addActionListener(this);
276	416	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	417	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.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);
280	424
281	425	oe.menuBar.add(menu = new Menu("Geometry"));
282	426	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -287,6 +431,11 @@
287	431	genNormalsCADItem.addActionListener(this);
288	432	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
289	433	genNormalsMESHItem.addActionListener(this);
	434	+ if (Globals.ADVANCED)
	435	+ {
	436	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
	437	+ genNormalsMINEItem.addActionListener(this);
	438	+ }
290	439	stripifyItem = menu.add(new MenuItem("Stripify"));
291	440	stripifyItem.addActionListener(this);
292	441	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -308,23 +457,34 @@
308	457	reduce34MeshItem.addActionListener(this);
309	458	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
310	459	increaseMeshItem.addActionListener(this);
311		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
312		- smoothMeshItem.addActionListener(this);
313	460	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
314	461	clipMeshItem.addActionListener(this);
	462	+
	463	+ if (Globals.ADVANCED)
	464	+ {
	465	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	466	+ smoothMeshItem.addActionListener(this);
	467	+ }
315	468
316	469	oe.menuBar.add(menu = new Menu("Attributes"));
317	470	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
318	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);
319	476	menu.add("-");
320	477	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
321	478	liveleavesItem.addActionListener(this);
322	479	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
323	480	unliveleavesItem.addActionListener(this);
	481	+ if (Globals.ADVANCED)
	482	+ {
324	483	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
325	484	supportleavesItem.addActionListener(this);
326	485	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
327	486	unsupportleavesItem.addActionListener(this);
	487	+ }
328	488	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
329	489	hideleavesItem.addActionListener(this);
330	490	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -333,6 +493,14 @@
333	493	markleavesItem.addActionListener(this);
334	494	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
335	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);
336	504	menu.add("-");
337	505	flipVItem = menu.add(new MenuItem("Flip V"));
338	506	flipVItem.addActionListener(this);
..	..	@@ -368,35 +536,41 @@
368	536	sortbynameItem = menu.add(new MenuItem("Sort by name"));
369	537	sortbynameItem.addActionListener(this);
370	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.
371	546	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
372	547	extractGeometriesItem.addActionListener(this);
373	548	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
374	549	cloneGeometriesItem.addActionListener(this);
375		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
376		- shareGeometriesItem.addActionListener(this);
377		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
378		- mergeGeometriesItem.addActionListener(this);
	550	+ }
379	551
380	552	oe.menuBar.add(menu = new Menu("Insert"));
381	553	buildCreateMenu(menu);
382	554
383		-
384		- oe.menuBar.add(menu = new Menu("Include"));
385		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
386		- importGFDItem.addActionListener(this);
387		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
388		- importVRMLX3DItem.addActionListener(this);
389		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
390		- importOBJItem.addActionListener(this);
391		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
392		- import3DSItem.addActionListener(this);
393		-
394	555	oe.menuBar.add(menu = new Menu("Tools"));
395	556	buildToolsMenu(menu);
396	557	}
397	558
	559	+
398	560	void SetupUI2(ObjEditor oe)
399	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	+
400	574	//new Exception().printStackTrace();
401	575
402	576	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -425,150 +599,231 @@
425	599	oe.radioPanel.add(dummyButton);
426	600	oe.buttonGroup.add(dummyButton);
427	601	*/
428		- aConstraints.gridy += 1;
429		- oe.aConstraints.gridwidth = 1;
430		- oe.aConstraints.gridx = 0;
	602	+ cGridBag copyOptionsPanel = new cGridBag();
	603	+
	604	+ copyOptionsPanel.preferredHeight = 1;
431	605
432		- 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");
433	660	liveCB.addItemListener(this);
434	661
435		- oe.aConstraints.gridx += 1;
436		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
437		- supportCB.addItemListener(this);
438		-
439		- // oe.aConstraints.gridx += 1;
440		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
441		- // localCB.addItemListener(this);
442		-
443		- oe.aConstraints.gridx += 1;
444		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
445		- crowdCB.addItemListener(this);
446		-
447		- oe.aConstraints.gridx += 1;
448		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
449		- smoothCB.addItemListener(this);
450		-
451		- oe.aConstraints.gridx += 1;
452		- 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");
453	668	fastCB.addItemListener(this);
454		- oe.aConstraints.gridx += 1;
455		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
456		- slowCB.addItemListener(this);
457		- oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
459		- 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);
460	675
461		-// oe.aConstraints.gridx += 1;
462		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
463		-// speakerMocapCB.addItemListener(this);
464		-
465		- if (false)
466		- {
467		- // handled in scripts
468		- oe.aConstraints.gridx += 1;
469		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
470		- speakerCameraCB.addItemListener(this);
471		-
472		- oe.aConstraints.gridx += 1;
473		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
474		- speakerFocusCB.addItemListener(this);
475		-
476		- oe.aConstraints.gridx += 1;
477		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
478		- smoothfocusCB.addItemListener(this);
479		- }
480		-
481		-//oe.aConstraints.gridx += 1;
482		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
483		-// debugCB.addItemListener(this);
484		-
485		- oe.aConstraints.gridx += 1;
486		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
487		- oeilCB.addItemListener(this);
488		-
489		- oe.aConstraints.gridx += 1;
490		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
491		- lookAtCB.addItemListener(this);
492		-
493		- oe.aConstraints.gridx += 1;
494		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
495		- trackCB.addItemListener(this);
496		-
497		- oe.aConstraints.gridx += 1;
498		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
499		- screenfitButton.addActionListener(this);
500		- oe.aConstraints.gridx += 1;
501	676	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
502	677	// screenfitpointButton.addActionListener(this);
503		-// oe.aConstraints.gridx += 1;
504		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
505		- snapobjectButton.addActionListener(this);
506		- oe.aConstraints.gridx += 1;
507	678
508		- //aConstraints.gridx = 0;
509		- //aConstraints.gridy += 1;
510		- oe.aConstraints.weighty = 0;
511		- oe.aConstraints.gridwidth = 1;
512		-
513		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
514		- flashSelectionButton.addActionListener(this);
515		- oe.aConstraints.gridx += 1;
516		- oe.aConstraints.weighty = 0;
517		- 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));
518	687
519		- //
520		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
521		- twoButton.addActionListener(this);
522		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	688	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
523	689	fourButton.addActionListener(this);
524		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	690	+ fourButton.setToolTipText("Show left panel only");
	691	+
	692	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	693	+ twoButton.setToolTipText("Show right view only");
	694	+ twoButton.addActionListener(this);
	695	+ this.fullscreenLayout = twoButton;
	696	+
	697	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	698	+ sixButton.setToolTipText("Show left and right");
525	699	sixButton.addActionListener(this);
526		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
527		- threeButton.addActionListener(this);
528		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
529		- sevenButton.addActionListener(this);
	700	+// oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	701	+// threeButton.setToolTipText("2-column layout right");
	702	+// threeButton.addActionListener(this);
	703	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	704	+// sevenButton.setToolTipText("3-column layout");
	705	+// sevenButton.addActionListener(this);
530	706	//
531	707
532		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	708	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	709	+ rootButton.setToolTipText("Open selection in new tab");
533	710	rootButton.addActionListener(this);
534		- oe.aConstraints.gridx += 1;
535		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	711	+
	712	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	713	+ closeButton.setToolTipText("Close tab");
536	714	closeButton.addActionListener(this);
537	715	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
538	716	//clearButton.addActionListener(this);
539		- oe.aConstraints.gridx += 1;
540		-
541		- oe.aConstraints.gridx = 1; //
542		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
543		- editButton.addActionListener(this);
544		- oe.aConstraints.gridx += 1;
545		- oe.aConstraints.weighty = 0;
546		- oe.aConstraints.gridwidth = 1;
547	717
548		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	718	+ // INSERT
	719	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	720	+ gridButton.setToolTipText("Create grid");
	721	+ gridButton.addActionListener(this);
	722	+
	723	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	724	+ boxButton.setToolTipText("Create box");
	725	+ boxButton.addActionListener(this);
	726	+
	727	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	728	+ sphereButton.setToolTipText("Create sphere");
	729	+ sphereButton.addActionListener(this);
	730	+
	731	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	732	+ coneButton.setToolTipText("Create cone");
	733	+ coneButton.addActionListener(this);
	734	+
	735	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	736	+ torusButton.setToolTipText("Create torus");
	737	+ torusButton.addActionListener(this);
	738	+
	739	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	740	+ superButton.setToolTipText("Create superellipsoid");
	741	+ superButton.addActionListener(this);
	742	+
	743	+ if (Globals.ADVANCED)
	744	+ {
	745	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	746	+ kleinButton.setToolTipText("Create Klein bottle");
	747	+ kleinButton.addActionListener(this);
	748	+ }
	749	+
	750	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	751	+ particlesButton.setToolTipText("Create particle system");
	752	+ particlesButton.addActionListener(this);
	753	+
	754	+ oe.toolboxPanel.Return();
	755	+
	756	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	757	+ groupButton.setToolTipText("Create group");
	758	+ groupButton.addActionListener(this);
	759	+
	760	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	761	+ compositeButton.setToolTipText("Create composite");
	762	+ compositeButton.addActionListener(this);
	763	+
	764	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	765	+ switchButton.setToolTipText("Create item switcher");
	766	+ switchButton.addActionListener(this);
	767	+
	768	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	769	+ loopButton.setToolTipText("Create loop");
	770	+ loopButton.addActionListener(this);
	771	+
	772	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	773	+ textureButton.setToolTipText("Create texture");
	774	+ textureButton.addActionListener(this);
	775	+
	776	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	777	+ overlayButton.setToolTipText("Create overlay");
	778	+ overlayButton.addActionListener(this);
	779	+
	780	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	781	+ lightButton.setToolTipText("Create light");
	782	+ lightButton.addActionListener(this);
	783	+
	784	+ for (int i=6; --i>=0;)
	785	+ {
	786	+ oe.toolboxPanel.Return();
	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	+ oe.toolboxPanel.add(new cGridBag());
	794	+ }
	795	+
	796	+ // EDIT panel
	797	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	798	+ editButton.setToolTipText("Pin selection controls");
	799	+ editButton.addActionListener(this);
	800	+
	801	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	802	+ uneditButton.setToolTipText("Remove selection controls");
549	803	uneditButton.addActionListener(this);
550	804
551		- oe.aConstraints.gridx += 1;
552		- oe.aConstraints.weighty = 0;
553		- oe.aConstraints.gridwidth = 1;
554		-
555		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
556		- clearPanelButton.addActionListener(this);
557		-
558		- oe.aConstraints.gridx += 1;
559		- oe.aConstraints.weighty = 0;
560		- oe.aConstraints.gridwidth = 1;
561		-
562		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	805	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	806	+ allParamsButton.setToolTipText("Show all controle");
563	807	allParamsButton.addActionListener(this);
564	808
565		- oe.aConstraints.gridx += 1;
566		- oe.aConstraints.weighty = 0;
567		- oe.aConstraints.gridwidth = 1;
568		-
569		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	809	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	810	+ clearPanelButton.setToolTipText("Clear edit panel");
	811	+ clearPanelButton.addActionListener(this);
	812	+
	813	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	814	+ unselectButton.setToolTipText("Unselect");
570	815	unselectButton.addActionListener(this);
571	816
	817	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	818	+ flashSelectionButton.setToolTipText("Highlight selection");
	819	+ flashSelectionButton.addActionListener(this);
	820	+
	821	+ editCommandsPanel.preferredHeight = 1;
	822	+
	823	+ SetPinStates(false);
	824	+// oe.treePanel.add(commandsPanel);
	825	+// oe.treePanel.Return();
	826	+
572	827	// oe.aConstraints.gridx += 1;
573	828	// oe.aConstraints.weighty = 0;
574	829	// oe.aConstraints.gridwidth = 1;
..	..	@@ -580,40 +835,25 @@
580	835	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
581	836	// gcButton.addActionListener(this);
582	837
583		- oe.aConstraints.gridx = 0;
584		- oe.aConstraints.gridy += 1;
585		-
586		- //ctrlPanel.add(objList = new List(5, true));
587		- oe.aConstraints.gridwidth = 100;
588		- // oe.aConstraints.gridheight = 100;
589		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
590		- oe.aConstraints.gridheight = 1;
591		- oe.aConstraints.weighty = 0.5;
592		- oe.aConstraints.gridx = 0;
593		- JScrollPane jSP;
	838	+ cGridBag jSPPanel = new cGridBag();
	839	+
	840	+ JScrollPane jSP;
594	841	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
595		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	842	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
596	843	ResetModel();
597		- oe.aConstraints.weighty = 0.5;
598		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
599		- oe.aConstraints.gridy += 1;
600		- oe.aConstraints.gridwidth = 1;
601		-
602		- oe.aConstraints.weighty = 0;
603		- oe.aConstraints.gridwidth = 2;
604		-
605		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
606		- colorCB.addItemListener(this);
607		- oe.aConstraints.gridx += 2;
608		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
609		- materialCB.addItemListener(this);
610		- oe.aConstraints.gridx += 2;
611		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
612		- textureCB.addItemListener(this);
613		-
614		- oe.aConstraints.gridx = 0;
615		- oe.aConstraints.gridy += 1;
616	844
	845	+ oe.treePanel.add(jSPPanel);
	846	+ oe.treePanel.Return();
	847	+
	848	+ oe.treePanel.add(copyOptionsPanel);
	849	+ oe.treePanel.Return();
	850	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	851	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	852	+ sliderPane.preferredHeight = 1;
	853	+
	854	+// mainPanel.setDividerLocation(0.5); //1.0);
	855	+// mainPanel.setResizeWeight(0.5);
	856	+
617	857	//jList.addListSelectionListener(this);
618	858	oe.jTree.addTreeSelectionListener(this);
619	859	//jTree.setRootVisible(false);
..	..	@@ -632,23 +872,160 @@
632	872	dgr.addDragGestureListener(this);
633	873	}catch(Exception e) {}
634	874	*/
635		- radio.layout = sevenButton;
	875	+ radio.layout = sixButton; // sevenButton;
636	876	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
637	877	}
	878	+
	879	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	880	+ {
	881	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	882	+ colorCB.setToolTipText("Copy color when dropped");
	883	+ colorCB.addItemListener(this);
	884	+
	885	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	886	+ materialCB.setToolTipText("Copy material when dropped");
	887	+ materialCB.addItemListener(this);
	888	+
	889	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	890	+ textureCB.setToolTipText("Copy texture when dropped");
	891	+ textureCB.addItemListener(this);
	892	+
	893	+ panel.Return();
	894	+
	895	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	896	+ boxCB.setToolTipText("Display bounding boxes");
	897	+ boxCB.addItemListener(this);
	898	+
	899	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	900	+ zoomBoxCB.setToolTipText("Display only for wheel");
	901	+ zoomBoxCB.addItemListener(this);
	902	+
	903	+ if (true) // Globals.ADVANCED)
	904	+ {
	905	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	906	+// supportCB.setToolTipText("Enable rigging");
	907	+// supportCB.addItemListener(this);
	908	+
	909	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	910	+ freezeCB.setToolTipText("Fast moving camera");
	911	+ freezeCB.addItemListener(this);
	912	+
	913	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	914	+ // localCB.addItemListener(this);
	915	+
	916	+ panel.Return();
	917	+
	918	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	919	+ crowdCB.setToolTipText("Used for crowds");
	920	+ crowdCB.addItemListener(this);
	921	+
	922	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	923	+ smoothCB.setToolTipText("Snapping delay");
	924	+ smoothCB.addItemListener(this);
	925	+
	926	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	927	+ slowCB.setToolTipText("Smooth interpolation");
	928	+ slowCB.addItemListener(this);
	929	+
	930	+// constraints.gridy += 1;
	931	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	932	+// speakerMocapCB.addItemListener(this);
	933	+
	934	+ panel.Return();
	935	+
	936	+ if (false)
	937	+ {
	938	+ // handled in scripts
	939	+ //constraints.gridy += 1;
	940	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	941	+ speakerCameraCB.addItemListener(this);
	942	+
	943	+ //constraints.gridy += 1;
	944	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	945	+ speakerFocusCB.addItemListener(this);
	946	+
	947	+ //constraints.gridy += 1;
	948	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	949	+ smoothfocusCB.addItemListener(this);
	950	+ panel.Return();
	951	+ }
	952	+
	953	+//constraints.gridx += 1;
	954	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	955	+// debugCB.addItemListener(this);
	956	+
	957	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	958	+ trackCB.setToolTipText("Enable tracking target");
	959	+ trackCB.addItemListener(this);
	960	+
	961	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	962	+ oeilCB.setToolTipText("Move camera when tracking");
	963	+ oeilCB.addItemListener(this);
	964	+
	965	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	966	+ shadowCB.setToolTipText("When live compute shadows");
	967	+ shadowCB.addItemListener(this);
	968	+
	969	+ panel.Return();
	970	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	971	+ toggleTextureCB.setToolTipText("Load textures");
	972	+ toggleTextureCB.addItemListener(this);
	973	+
	974	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	975	+ toggleSwitchCB.setToolTipText("Choose a single item");
	976	+ toggleSwitchCB.addItemListener(this);
	977	+
	978	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	979	+ autokeepCB.setToolTipText("On structure change");
	980	+ autokeepCB.addItemListener(this);
	981	+
	982	+ panel.Return();
	983	+ if (Globals.ADVANCED)
	984	+ {
	985	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	986	+ lookAtCB.setToolTipText("Look-at target");
	987	+ lookAtCB.addItemListener(this);
	988	+ }
	989	+
	990	+ }
	991	+
	992	+ cGridBag fill = new cGridBag();
	993	+ fill.preferredHeight = 200;
	994	+ cGridBag fill2 = new cGridBag();
	995	+ fill2.preferredHeight = 200;
	996	+ cGridBag fill3 = new cGridBag();
	997	+ fill3.preferredHeight = 200;
	998	+
	999	+ panel.add(fill);
	1000	+ panel.add(fill2);
	1001	+ panel.add(fill3);
	1002	+
	1003	+ }
638	1004
639	1005	void EditObject(Object3D obj)
640	1006	{
641		- cRadio dummyButton = new cRadio(obj.name);
642		- dummyButton.SetObject(obj);
643		- dummyButton.layout = sevenButton;
644		- dummyButton.SetCamera(cameraView.renderCamera, false);
645		- dummyButton.addActionListener(this);
646		- radioPanel.add(dummyButton);
647		- buttonGroup.add(dummyButton);
648		- dummyButton.doClick();
	1007	+ cRadio radioButton = new cRadio(obj.name);
	1008	+
	1009	+ // June 2019. Patch to avoid bug with transparency.
	1010	+ radioButton.hadMaterial = obj.material != null;
	1011	+ if (!radioButton.hadMaterial)
	1012	+ {
	1013	+ obj.material = new cMaterial();
	1014	+ }
	1015	+
	1016	+ radioButton.SetObject(obj);
	1017	+ radioButton.layout = sixButton; // sevenButton;
	1018	+ radioButton.SetCamera(cameraView.renderCamera, false);
	1019	+ radioButton.addActionListener(this);
	1020	+ radioPanel.add(radioButton);
	1021	+ buttonGroup.add(radioButton);
	1022	+ radioButton.doClick();
649	1023	}
	1024	+
650	1025	void SetupViews(ObjEditor oe)
651	1026	{
	1027	+ theFrame = this;
	1028	+
652	1029	oe.SetupViews();
653	1030
654	1031	System.out.println("SetupViews");
..	..	@@ -657,22 +1034,28 @@
657	1034	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
658	1035	}
659	1036
660		- JCheckBox liveCB;
661		- JCheckBox supportCB;
662		- JCheckBox localCB;
663		- JCheckBox crowdCB;
664		- JCheckBox smoothCB;
665		- JCheckBox fastCB;
666		- JCheckBox slowCB;
667		- JCheckBox boxCB;
668		- JCheckBox trackCB;
669		- JCheckBox smoothfocusCB;
	1037	+ cToggleButton liveCB;
	1038	+ cCheckBox supportCB;
	1039	+ cCheckBox localCB;
	1040	+ cCheckBox crowdCB;
	1041	+ cCheckBox smoothCB;
	1042	+ cToggleButton fastCB;
	1043	+ cCheckBox slowCB;
	1044	+ cCheckBox boxCB;
	1045	+ cCheckBox zoomBoxCB;
	1046	+ cCheckBox freezeCB;
	1047	+ //cToggleButton trackCB;
	1048	+ cCheckBox trackCB;
	1049	+ cCheckBox smoothfocusCB;
670	1050	// JCheckBox speakerMocapCB;
671		- JCheckBox speakerCameraCB;
672		- JCheckBox speakerFocusCB;
673		- JCheckBox debugCB;
674		- JCheckBox oeilCB;
675		- JCheckBox lookAtCB;
	1051	+ cCheckBox speakerCameraCB;
	1052	+ cCheckBox speakerFocusCB;
	1053	+ cCheckBox debugCB;
	1054	+
	1055	+ cCheckBox oeilCB;
	1056	+ cCheckBox shadowCB;
	1057	+ cCheckBox autokeepCB;
	1058	+ cCheckBox lookAtCB;
676	1059
677	1060	// static int COLOR = 1;
678	1061	// static int MATERIAL = 2;
..	..	@@ -680,9 +1063,9 @@
680	1063
681	1064	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
682	1065
683		- JCheckBox colorCB;
684		- JCheckBox materialCB;
685		- JCheckBox textureCB;
	1066	+ cCheckBox colorCB;
	1067	+ cCheckBox materialCB;
	1068	+ cCheckBox textureCB;
686	1069
687	1070	public void itemStateChanged(ItemEvent e)
688	1071	{
..	..	@@ -707,10 +1090,10 @@
707	1090	dropAttributes \|= Object3D.TEXTURE;
708	1091	else
709	1092	dropAttributes &= ~Object3D.TEXTURE;
710		- }
711		- else if(e.getSource() == liveCB)
	1093	+ } else if(e.getSource() == liveCB)
712	1094	{
713	1095	cameraView.ToggleLive();
	1096	+ refreshContents(false);
714	1097	}
715	1098	else if(e.getSource() == supportCB)
716	1099	{
..	..	@@ -746,6 +1129,10 @@
746	1129	cameraView.repaint();
747	1130	// refreshContents();
748	1131	}
	1132	+ else if(e.getSource() == zoomBoxCB)
	1133	+ {
	1134	+ cameraView.ToggleZoomBoxMode();
	1135	+ }
749	1136	else if(e.getSource() == smoothfocusCB)
750	1137	{
751	1138	cameraView.ToggleSmoothFocus();
..	..	@@ -771,6 +1158,18 @@
771	1158	{
772	1159	cameraView.ToggleOeil();
773	1160	}
	1161	+ else if(e.getSource() == shadowCB)
	1162	+ {
	1163	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1164	+ }
	1165	+ else if(e.getSource() == freezeCB)
	1166	+ {
	1167	+ Globals.FREEZEONMOVE ^= true;
	1168	+ }
	1169	+ else if(e.getSource() == autokeepCB)
	1170	+ {
	1171	+ Globals.REPLACEONMAKE ^= true;
	1172	+ }
774	1173	else if(e.getSource() == lookAtCB)
775	1174	{
776	1175	cameraView.ToggleLookAt();
..	..	@@ -787,7 +1186,8 @@
787	1186
788	1187	/**/
789	1188	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
790		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1189	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1190	+ TreePath path = objEditor.jTree.getSelectionPath();
791	1191	if ((path == null) \|\| (path.getPathCount() <= 1)) {
792	1192	// We can't move the root node or an empty selection
793	1193	return;
..	..	@@ -850,8 +1250,6 @@
850	1250	}
851	1251	}
852	1252
853		- String string = (String) object;
854		-
855	1253	System.out.println("Transfer = " + object + "; drop : " + target);
856	1254	// if( object instanceof java.io.File[])
857	1255	// {
..	..	@@ -859,7 +1257,11 @@
859	1257	// objEditor.DropFile((java.io.File[]) object, true);
860	1258	// return;
861	1259	// }
862		- if (string.charAt(0) == '/')
	1260	+
	1261	+ String string = object.toString();
	1262	+
	1263	+ // File path for Mac and Windows
	1264	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
863	1265	{
864	1266	// file(s)
865	1267	String[] names = string.split("\n");
..	..	@@ -886,7 +1288,7 @@
886	1288
887	1289	flashIt = false;
888	1290	CameraPane pane = (CameraPane) target;
889		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1291	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
890	1292	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
891	1293
892	1294	if (group.selection.size() == 1)
..	..	@@ -902,23 +1304,33 @@
902	1304
903	1305	assert target == objEditor.jTree;
904	1306	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1307	+ Object3D destinationLeaf;
905	1308	try {
906		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1309	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
907	1310	} catch (Exception e) {
908	1311	System.out.println("destinationPath : " + destinationPath);
909	1312	return;
910	1313	}
911	1314
912		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1315	+ for (int i=group.selection.size(); --i>=0;)
913	1316	{
	1317	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1318	+
	1319	+ // Cannot move into itself
	1320	+ if (child == destinationLeaf)
	1321	+ return;
	1322	+ }
	1323	+
	1324	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1325	+// {
914	1326	loadClipboard(true);
915	1327	objEditor.jTree.setSelectionPath(destinationPath);
916		- pasteInto(false);
917		- } else {
918		- loadClipboard(false);
919		- objEditor.jTree.setSelectionPath(destinationPath);
920		- pasteInto(false); // true); // ???
921		- }
	1328	+ pasteInto(false, false);
	1329	+// } else {
	1330	+// loadClipboard(false);
	1331	+// objEditor.jTree.setSelectionPath(destinationPath);
	1332	+// pasteInto(false, false); // true); // ???
	1333	+// }
922	1334	}
923	1335	public void dropActionChanged(DropTargetDragEvent dtde)
924	1336	// Called if the user has modified the current drop gesture
..	..	@@ -1023,83 +1435,107 @@
1023	1435	{
1024	1436	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1025	1437	//heightFieldItem.addActionListener(this);
1026		- gridItem = menu.add(new MenuItem("Grid"));
1027		- gridItem.addActionListener(this);
1028		- rectoidItem = menu.add(new MenuItem("Box"));
1029		- rectoidItem.addActionListener(this);
1030		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1031		- ellipsoidItem.addActionListener(this);
1032		- coneItem = menu.add(new MenuItem("Cone"));
1033		- coneItem.addActionListener(this);
1034		- torusItem = menu.add(new MenuItem("Torus"));
1035		- torusItem.addActionListener(this);
1036		- superItem = menu.add(new MenuItem("Superellipsoid"));
1037		- superItem.addActionListener(this);
1038		- particleItem = menu.add(new MenuItem("Particle system"));
1039		- particleItem.addActionListener(this);
	1438	+// gridItem = menu.add(new MenuItem("Grid"));
	1439	+// gridItem.addActionListener(this);
	1440	+// rectoidItem = menu.add(new MenuItem("Box"));
	1441	+// rectoidItem.addActionListener(this);
	1442	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1443	+// ellipsoidItem.addActionListener(this);
	1444	+// coneItem = menu.add(new MenuItem("Cone"));
	1445	+// coneItem.addActionListener(this);
	1446	+// torusItem = menu.add(new MenuItem("Torus"));
	1447	+// torusItem.addActionListener(this);
	1448	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1449	+// superItem.addActionListener(this);
	1450	+
	1451	+ cameraItem = menu.add(new MenuItem("Camera"));
	1452	+ cameraItem.addActionListener(this);
	1453	+
	1454	+ if (!Globals.ADVANCED)
	1455	+ {
	1456	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1457	+ kleinItem.addActionListener(this);
	1458	+ }
	1459	+
	1460	+// particleItem = menu.add(new MenuItem("Particle system"));
	1461	+// particleItem.addActionListener(this);
	1462	+ if (Globals.ADVANCED)
	1463	+ {
1040	1464	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1041	1465	ragdollItem.addActionListener(this);
1042	1466	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1043	1467	ragdoll2Item.addActionListener(this);
	1468	+ }
1044	1469	menu.add("-");
1045		- meshItem = menu.add(new MenuItem("Mesh"));
	1470	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1046	1471	meshItem.addActionListener(this);
1047	1472	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1048	1473	// meshGroupItem.addActionListener(this);
	1474	+ if (Globals.ADVANCED)
	1475	+ {
1049	1476	springItem = menu.add(new MenuItem("Spring"));
1050	1477	springItem.addActionListener(this);
1051	1478	flagItem = menu.add(new MenuItem("Flag"));
1052	1479	flagItem.addActionListener(this);
1053		- bezierItem = menu.add(new MenuItem("Patch"));
1054		- bezierItem.addActionListener(this);
1055		- checkerItem = menu.add(new MenuItem("Checker"));
1056		- checkerItem.addActionListener(this);
1057	1480	blobItem = menu.add(new MenuItem("Blob"));
1058	1481	blobItem.addActionListener(this);
1059	1482	latheItem = menu.add(new MenuItem("Lathe"));
1060	1483	latheItem.addActionListener(this);
1061		- lightItem = menu.add(new MenuItem("Light"));
1062		- lightItem.addActionListener(this);
	1484	+ }
	1485	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1486	+ bezierItem.addActionListener(this);
	1487	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1488	+// overlayItem.addActionListener(this);
	1489	+// lightItem = menu.add(new MenuItem("Light"));
	1490	+// lightItem.addActionListener(this);
1063	1491	menu.add("-");
1064	1492	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1065	1493	//superLoopItem.addActionListener(this);
1066		- loopItem = menu.add(new MenuItem("Loop"));
1067		- loopItem.addActionListener(this);
	1494	+// loopItem = menu.add(new MenuItem("Loop"));
	1495	+// loopItem.addActionListener(this);
1068	1496	doubleItem = menu.add(new MenuItem("Fork"));
1069	1497	doubleItem.addActionListener(this);
	1498	+ if (Globals.ADVANCED)
	1499	+ {
1070	1500	tripleItem = menu.add(new MenuItem("Trident"));
1071	1501	tripleItem.addActionListener(this);
	1502	+ }
1072	1503	}
1073	1504
1074	1505	void buildToolsMenu(Menu menu)
1075	1506	{
1076	1507	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1077	1508	animationItem.addItemListener(this);
1078		- animationItem.setState(CameraPane.ANIMATION);
	1509	+ animationItem.setState(Globals.ANIMATION);
	1510	+
	1511	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1512	+ archiveItem.addActionListener(this);
1079	1513
1080	1514	menu.add("-");
1081	1515	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1082	1516	parseverticesItem.addActionListener(this);
1083	1517	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1084	1518	textureFieldItem.addActionListener(this);
1085		- alignItem = menu.add(new MenuItem("Align"));
	1519	+ alignItem = menu.add(new MenuItem("Align Objects"));
1086	1520	alignItem.addActionListener(this);
1087		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1088		- mirrorItem.addActionListener(this);
1089	1521	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1090	1522	reduceMorphItem.addActionListener(this);
1091	1523	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1092	1524	reduce34MorphItem.addActionListener(this);
1093		-
1094		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1095		- computeAOItem.addActionListener(this);
1096	1525	menu.add("-");
1097		-
1098	1526	menu.add(memoryItem = new MenuItem("Memory Usage"));
1099	1527	memoryItem.addActionListener(this);
	1528	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	1529	+ computeAOItem.addActionListener(this);
	1530	+
	1531	+ if (Globals.ADVANCED)
	1532	+ {
	1533	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1534	+ mirrorItem.addActionListener(this);
	1535	+ menu.add("-");
1100	1536	menu.add(analyzeItem = new MenuItem("Analyze"));
1101	1537	analyzeItem.addActionListener(this);
1102		- menu.add(dumpItem = new MenuItem("Dump"));
	1538	+ menu.add(dumpItem = new MenuItem("Print"));
1103	1539	dumpItem.addActionListener(this);
1104	1540	// menu.add(pathItem = new MenuItem("From-to path"));
1105	1541	// pathItem.addActionListener(this);
..	..	@@ -1108,6 +1544,8 @@
1108	1544	resetParentItem.addActionListener(this);
1109	1545	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1110	1546	repairParentItem.addActionListener(this);
	1547	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1548	+ repairShadowItem.addActionListener(this);
1111	1549	menu.add(invariantsItem = new MenuItem("Invariants"));
1112	1550	invariantsItem.addActionListener(this);
1113	1551	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1115,6 +1553,7 @@
1115	1553	menu.add("-");
1116	1554	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1117	1555	editScriptItem.addActionListener(this);
	1556	+ }
1118	1557	}
1119	1558
1120	1559	void ScreenFit()
..	..	@@ -1237,9 +1676,34 @@
1237	1676	shadow.material = new cMaterial(obj.material);
1238	1677	shadow.material.diffuse = 0.0001f;
1239	1678	shadow.material.specular = 0.0001f;
	1679	+ //shadow.projectedVertices[1].x = 300;
1240	1680
1241	1681	makeSomething(shadow);
1242	1682	}
	1683	+
	1684	+ private void ClearUnpinned()
	1685	+ {
	1686	+ //for (Object3D obj : listUI)
	1687	+ for (int i=listUI.size(); --i>=0;)
	1688	+ {
	1689	+ Object3D obj = listUI.elementAt(i);
	1690	+ if (!obj.pinned)
	1691	+ {
	1692	+ obj.CloseUI();
	1693	+ listUI.remove(i);
	1694	+ }
	1695	+ }
	1696	+ }
	1697	+
	1698	+ private void EditElement(Object3D elem, boolean newWindow)
	1699	+ {
	1700	+ // if (!(elem instanceof Composite))
	1701	+ // newWindow = false;
	1702	+ listUI.add(elem);
	1703	+ elem.openEditWindow(this, newWindow); //, false);
	1704	+ System.out.println("edit : " + elem);
	1705	+ elem.editWindow.refreshContents(true); // ? new
	1706	+ }
1243	1707
1244	1708	/**
1245	1709	* applyExample
..	..	@@ -1443,9 +1907,9 @@
1443	1907
1444	1908	void Overwrite(int mask)
1445	1909	{
1446		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1910	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1447	1911	{
1448		- Object3D content = GrafreeD.clipboard.get(0);
	1912	+ Object3D content = Grafreed.clipboard.get(0);
1449	1913
1450	1914	if (content instanceof cGroup && ((cGroup)content).transientlink )
1451	1915	content = ((cGroup)content).get(0);
..	..	@@ -1468,6 +1932,7 @@
1468	1932	//
1469	1933	public void actionPerformed(ActionEvent event) // , Object arg)
1470	1934	{
	1935	+ Object source = event.getSource();
1471	1936	/*
1472	1937	if (event.getSource() == nameField)
1473	1938	{
..	..	@@ -1479,11 +1944,11 @@
1479	1944	}
1480	1945	else
1481	1946	*/
1482		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1947	+ if (source == lookAtItem \|\| source == lookFromItem)
1483	1948	{
1484	1949	ScreenFit();
1485	1950	} else
1486		- if (event.getSource() == switchItem)
	1951	+ if (source == switchViewItem)
1487	1952	{
1488	1953	cVector v1 = new cVector();
1489	1954	cVector v2 = new cVector();
..	..	@@ -1492,11 +1957,11 @@
1492	1957	objEditor.cameraView.renderCamera.setAim(v2, v1);
1493	1958	objEditor.cameraView.repaint();
1494	1959	} else
1495		- if (event.getSource() == rectoidItem)
	1960	+ if (source == rectoidItem \|\| source == boxButton)
1496	1961	{
1497	1962	makeSomething(new Box());
1498	1963	} else
1499		- if (event.getSource() == particleItem)
	1964	+ if (source == particleItem \|\| source == particlesButton)
1500	1965	{
1501	1966	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1502	1967	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1517,9 +1982,9 @@
1517	1982	applyExample(particleGeom, "SMOKE");
1518	1983	makeSomething(particleGeom);
1519	1984	} else
1520		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1985	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1521	1986	{
1522		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1987	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1523	1988
1524	1989	ragdoll.toParent = LA.newMatrix();
1525	1990	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1537,7 +2002,7 @@
1537	2002	} else
1538	2003	/*
1539	2004	*/
1540		- if (event.getSource() == heightFieldItem)
	2005	+ if (source == heightFieldItem)
1541	2006	{
1542	2007	Object3D obj = new Object3D();
1543	2008
..	..	@@ -1575,27 +2040,31 @@
1575	2040
1576	2041	makeSomething(obj);
1577	2042	} else
1578		- if (event.getSource() == gridItem)
	2043	+ if (source == gridItem \|\| source == gridButton)
1579	2044	{
1580	2045	makeSomething(new Grid());
1581	2046	} else
1582		- if (event.getSource() == ellipsoidItem)
	2047	+ if (source == ellipsoidItem \|\| source == sphereButton)
1583	2048	{
1584	2049	makeSomething(new Sphere());
1585	2050	} else
1586		- if (event.getSource() == coneItem)
	2051	+ if (source == coneItem \|\| source == coneButton)
1587	2052	{
1588	2053	makeSomething(new Cone());
1589	2054	} else
1590		- if (event.getSource() == torusItem)
	2055	+ if (source == torusItem \|\| source == torusButton)
1591	2056	{
1592	2057	makeSomething(new Torus());
1593	2058	} else
1594		- if (event.getSource() == superItem)
	2059	+ if (source == superItem \|\| source == superButton)
1595	2060	{
1596	2061	makeSomething(new Superellipsoid());
1597	2062	} else
1598		- if (event.getSource() == blobItem)
	2063	+ if (source == kleinItem \|\| source == kleinButton)
	2064	+ {
	2065	+ makeSomething(new Klein());
	2066	+ } else
	2067	+ if (source == blobItem)
1599	2068	{
1600	2069	Blob blob = new Blob();
1601	2070	BlobComponent comp = new BlobComponent();
..	..	@@ -1603,15 +2072,15 @@
1603	2072	//blob.retile();
1604	2073	makeSomething(blob);
1605	2074	} else
1606		- if (event.getSource() == latheItem)
	2075	+ if (source == latheItem)
1607	2076	{
1608	2077	makeSomething(new Lathe());
1609	2078	} else
1610		- if (event.getSource() == bezierItem)
	2079	+ if (source == bezierItem)
1611	2080	{
1612	2081	makeSomething(new BezierSurface());
1613	2082	} else
1614		- if (event.getSource() == checkerItem)
	2083	+ if (source == overlayItem \|\| source == overlayButton)
1615	2084	{
1616	2085	/*
1617	2086	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1626,7 +2095,7 @@
1626	2095	*/
1627	2096	makeSomething(new Checker());
1628	2097	} else
1629		- if (event.getSource() == meshItem)
	2098	+ if (source == meshItem)
1630	2099	{
1631	2100	Object3D itemtomake = new Object3D();
1632	2101	Object3D child;
..	..	@@ -1647,35 +2116,35 @@
1647	2116	makeSomething(child);
1648	2117	}
1649	2118	} else
1650		- if (event.getSource() == springItem)
	2119	+ if (source == springItem)
1651	2120	{
1652	2121	cSpring s = new cSpring();
1653	2122	s.setup();
1654	2123	makeSomething(s);
1655	2124	} else
1656		- if (event.getSource() == flagItem)
	2125	+ if (source == flagItem)
1657	2126	{
1658	2127	cSpring s = new cFlag();
1659	2128	s.setup();
1660	2129	makeSomething(s);
1661	2130	} else
1662		- if (event.getSource() == lightItem)
	2131	+ if (source == lightItem \|\| source == lightButton)
1663	2132	{
1664	2133	makeSomething(new Light());
1665	2134	} else
1666		- if (event.getSource() == csgItem)
	2135	+ if (source == csgItem)
1667	2136	{
1668	2137	group(new CSG());
1669	2138	} else
1670		- if (event.getSource() == templateItem)
	2139	+ if (source == templateItem)
1671	2140	{
1672	2141	group(new cTemplate());
1673	2142	} else
1674		- if (event.getSource() == attributeItem)
	2143	+ if (source == attributeItem)
1675	2144	{
1676	2145	makeSomething(new Attribute());
1677	2146	} else
1678		- if (event.getSource() == pointflowItem)
	2147	+ if (source == pointflowItem)
1679	2148	{
1680	2149	makeSomething(new PointFlow());
1681	2150	} else
..	..	@@ -1687,7 +2156,7 @@
1687	2156	} else
1688	2157	*/
1689	2158
1690		- if (event.getSource() == superLoopItem)
	2159	+ if (source == superLoopItem)
1691	2160	{
1692	2161	Composite g = new cGroup();
1693	2162	for (int i=0; i<15; i++)
..	..	@@ -1709,30 +2178,30 @@
1709	2178
1710	2179	group(g);
1711	2180	} else
1712		- if (event.getSource() == loopItem)
	2181	+ if (source == loopItem \|\| source == loopButton)
1713	2182	{
1714	2183	Composite csg = new GroupLeaf();
1715	2184	csg.count = 5;
1716	2185	group(csg);
1717		- Composite child = new cGroup();
	2186	+ Composite child = new cGroup("Branch");
1718	2187	csg.addChild(child);
1719	2188	child.addChild(csg);
1720	2189	} else
1721		- if (event.getSource() == doubleItem)
	2190	+ if (source == doubleItem)
1722	2191	{
1723		- Composite csg = new GroupLeaf();
	2192	+ Composite csg = new GroupLeaf("Fork");
1724	2193	csg.count = 5;
1725	2194	group(csg);
1726		- Composite child = new cGroup();
	2195	+ Composite child = new cGroup("Branch A");
1727	2196	csg.addChild(child);
1728	2197	child.addChild(csg);
1729		- child = new cGroup();
	2198	+ child = new cGroup("Branch B");
1730	2199	csg.addChild(child);
1731	2200	child.addChild(csg);
1732	2201	} else
1733		- if (event.getSource() == tripleItem)
	2202	+ if (source == tripleItem)
1734	2203	{
1735		- Composite csg = new GroupLeaf();
	2204	+ Composite csg = new GroupLeaf("Trident");
1736	2205	csg.count = 4;
1737	2206	group(csg);
1738	2207	Composite child = new cGroup();
..	..	@@ -1745,73 +2214,98 @@
1745	2214	csg.addChild(child);
1746	2215	child.addChild(csg);
1747	2216	} else
1748		-
1749		- if (event.getSource() == importGFDItem)
	2217	+ if (source == computeAOItem)
1750	2218	{
1751		- ImportGFD();
	2219	+ Globals.drawMode = CameraPane.OCCLUSION;
	2220	+ Globals.theRenderer.repaint();
1752	2221	} else
1753		- if (event.getSource() == importVRMLX3DItem)
1754		- {
1755		- ImportVRMLX3D();
1756		- } else
1757		- if (event.getSource() == import3DSItem)
1758		- {
1759		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1760		- } else
1761		- if (event.getSource() == importOBJItem)
1762		- {
1763		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1764		- } else
1765		- if (event.getSource() == computeAOItem)
1766		- {
1767		- CameraPane.drawMode = CameraPane.OCCLUSION;
1768		- CameraPane.theRenderer.repaint();
1769		- } else
1770		- if (event.getSource() == recompileItem)
	2222	+ if (source == recompileItem)
1771	2223	{
1772	2224	Recompile();
1773	2225	refreshContents();
1774	2226	} else
1775		- if (event.getSource() == editScriptItem)
	2227	+ if (source == editScriptItem)
1776	2228	{
1777	2229	OpenDialog();
1778	2230	refreshContents();
1779	2231	} else
1780		- if (event.getSource() == invariantsItem)
	2232	+ if (source == invariantsItem)
1781	2233	{
1782	2234	System.out.println("Invariants:");
1783		- GrafreeD.theApplet3D.universe.invariants();
	2235	+ Grafreed.grafreeD.universe.invariants();
1784	2236	} else
1785		- if (event.getSource() == memoryItem)
	2237	+ if (source == memoryItem)
1786	2238	{
1787	2239	//System.out.println("Invariants:");
1788	2240	PrintMemory();
1789	2241	} else
1790		- if (event.getSource() == pathItem)
	2242	+ if (source == pathItem)
1791	2243	{
1792	2244	PrintPath();
1793	2245	} else
1794		- if (event.getSource() == analyzeItem)
	2246	+ if (source == analyzeItem)
1795	2247	{
1796	2248	AnalyzeObject();
1797	2249	} else
1798		- if (event.getSource() == dumpItem)
	2250	+ if (source == dumpItem)
1799	2251	{
1800	2252	DumpObject();
1801	2253	} else
1802		- if (event.getSource() == screenfitButton)
	2254	+ if (source == minButton)
1803	2255	{
1804		- //Reload(lastConverter, lastFilename, true);
	2256	+ Minimize();
	2257	+ } else
	2258	+ if (source == maxButton)
	2259	+ {
	2260	+ Maximize();
	2261	+ } else
	2262	+ if (source == fullButton)
	2263	+ {
	2264	+ ToggleFullScreen();
	2265	+ } else
	2266	+ if (source == undoButton)
	2267	+ {
	2268	+ // Go to previous version
	2269	+ //if (!Undo())
	2270	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2271	+ Undo();
	2272	+ } else
	2273	+ if (source == restoreButton)
	2274	+ {
	2275	+ // Restore current version
	2276	+ Restore();
	2277	+ } else
	2278	+ if (source == replaceButton)
	2279	+ {
	2280	+ // Overwrite current version
	2281	+ Replace();
	2282	+ } else
	2283	+ if (source == redoButton)
	2284	+ {
	2285	+ // Go to next version
	2286	+ Redo();
	2287	+ } else
	2288	+ if (source == saveButton)
	2289	+ {
	2290	+ // Save a new version
	2291	+ if (!Save(true))
	2292	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2293	+ } else
	2294	+ if (source == oneStepButton)
	2295	+ {
	2296	+ Globals.ONESTEP = true;
	2297	+ cameraView.repaint();
	2298	+ } else
	2299	+ if (source == screenfitButton)
	2300	+ {
1805	2301	ScreenFit();
1806	2302	} else
1807		- if (event.getSource() == screenfitpointButton)
	2303	+ if (source == screenfitpointButton)
1808	2304	{
1809		- //Reload(lastConverter, lastFilename, true);
1810	2305	ScreenFitPoint();
1811	2306	} else
1812		- if (event.getSource() == snapobjectButton)
	2307	+ if (source == snapobjectButton)
1813	2308	{
1814		- //Reload(lastConverter, lastFilename, true);
1815	2309	SnapObject();
1816	2310	} else
1817	2311	// if (event.getSource() == recompileButton)
..	..	@@ -1820,13 +2314,13 @@
1820	2314	// Recompile();
1821	2315	// refreshContents();
1822	2316	// } else
1823		- if (event.getSource() == gcButton)
	2317	+ if (source == gcButton)
1824	2318	{
1825	2319	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	2320	System.gc();
1827	2321	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1828	2322	} else
1829		- if (event.getSource() == editLeafItem)
	2323	+ if (source == editLeafItem)
1830	2324	{
1831	2325	Object3D obj;
1832	2326	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1840,62 +2334,74 @@
1840	2334	}
1841	2335	refreshContents(true);
1842	2336	} else
1843		- if (event.getSource() == openWindowItem)
	2337	+ if (source == openWindowItem)
1844	2338	{
1845	2339	EditSelection(true);
1846	2340	} else
1847		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2341	+ if (source == cutItem \|\| source == clearButton)
1848	2342	{
1849	2343	loadClipboard(true);
1850	2344	} else
1851		- if (event.getSource() == duplicateItem)
	2345	+ if (source == undoItem)
1852	2346	{
1853		- Object3D keep = GrafreeD.clipboard;
	2347	+ Undo();
	2348	+ } else
	2349	+ if (source == redoItem)
	2350	+ {
	2351	+ Redo();
	2352	+ } else
	2353	+ if (source == duplicateItem)
	2354	+ {
	2355	+ Object3D keep = Grafreed.clipboard;
1854	2356	loadClipboard(false);
1855	2357	paste(false);
1856		- GrafreeD.clipboard = keep;
	2358	+ Grafreed.clipboard = keep;
1857	2359	} else
1858		- if (event.getSource() == cloneItem)
	2360	+ if (source == cloneItem)
1859	2361	{
1860	2362	CloneSelection(false);
1861	2363	} else
1862		- if (event.getSource() == cloneSupportItem)
	2364	+ if (source == cloneSupportItem)
1863	2365	{
1864	2366	CloneSelection(true);
1865	2367	} else
1866		- if (event.getSource() == copyItem)
	2368	+ if (source == copyItem)
1867	2369	{
1868	2370	loadClipboard(false);
1869	2371	} else
1870		- if (event.getSource() == pasteItem)
	2372	+ if (source == pasteItem)
1871	2373	{
1872	2374	paste(false);
1873	2375	} else
1874		- if (event.getSource() == pasteLinkItem)
	2376	+ if (source == pasteIntoItem)
1875	2377	{
1876		- pasteInto(false);
	2378	+ pasteInto(true, false);
1877	2379	} else
1878		- if (event.getSource() == pasteCloneItem)
	2380	+ if (source == pasteLinkItem)
1879	2381	{
1880		- pasteInto(true);
	2382	+ pasteInto(false, false);
1881	2383	} else
1882		- if (event.getSource() == pasteExpandItem)
	2384	+ if (source == pasteCloneItem)
	2385	+ {
	2386	+ pasteInto(true, true);
	2387	+ } else
	2388	+ if (source == pasteExpandItem)
1883	2389	{
1884	2390	paste(true);
1885	2391	} else
1886		- if (event.getSource() == synchronizeItem)
	2392	+ if (source == synchronizeItem)
1887	2393	{
1888	2394	Overwrite(Object3D.TRANSFORM);
1889	2395	} else
1890		- if (event.getSource() == overwriteNameItem)
	2396	+ if (source == overwriteNameItem)
1891	2397	{
1892	2398	Overwrite(Object3D.NAME);
1893	2399	} else
1894		- if (event.getSource() == overwriteUVItem)
	2400	+ if (source == overwriteUVItem)
1895	2401	{
1896	2402	Overwrite(Object3D.UV);
1897	2403	} else
1898		- if (event.getSource() == overwriteMatItem)
	2404	+ if (source == overwriteMatItem)
1899	2405	{
1900	2406	/* july 2015
1901	2407	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1915,7 +2421,7 @@
1915	2421
1916	2422	Overwrite(dropAttributes);
1917	2423	}
1918		- if (event.getSource() == overwriteGeoItem)
	2424	+ if (source == overwriteGeoItem)
1919	2425	{
1920	2426	Overwrite(Object3D.GEOMETRY);
1921	2427	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1932,7 +2438,7 @@
1932	2438	// refreshContents();
1933	2439	// }
1934	2440	} else
1935		- if (event.getSource() == generateMeshItem)
	2441	+ if (source == generateMeshItem)
1936	2442	{
1937	2443	//if (group.selection.size() == 1)
1938	2444	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1943,7 +2449,7 @@
1943	2449	ResetModel();
1944	2450	refreshContents();
1945	2451	} else
1946		- if (event.getSource() == extractGeometriesItem)
	2452	+ if (source == extractGeometriesItem)
1947	2453	{
1948	2454	boolean one = false;
1949	2455
..	..	@@ -1970,7 +2476,7 @@
1970	2476	ResetModel();
1971	2477	refreshContents();
1972	2478	} else
1973		- if (event.getSource() == cloneGeometriesItem)
	2479	+ if (source == cloneGeometriesItem)
1974	2480	{
1975	2481	boolean one = false;
1976	2482
..	..	@@ -1996,32 +2502,37 @@
1996	2502	ResetModel();
1997	2503	refreshContents();
1998	2504	} else
1999		- if (event.getSource() == shareGeometriesItem)
	2505	+ if (source == shareGeometriesItem)
2000	2506	{
2001	2507	boolean one = false;
2002	2508
2003	2509	if (group.selection.size() == 1)
2004	2510	one = true;
2005	2511
	2512	+ Object3D merge = null;
	2513	+
2006	2514	Object3D content = new cGroup();
2007	2515
2008	2516	for (int i=0; i<group.selection.size(); i++)
2009	2517	{
2010		- Object3D sel = new Merge(group.selection.get(i));
	2518	+ merge = new Merge(group.selection.get(i));
2011	2519
2012	2520	if (one)
2013		- makeSomething(sel, false);
	2521	+ makeSomething(merge, false);
2014	2522	else
2015		- content.addChild(sel);
	2523	+ content.addChild(merge);
2016	2524	}
2017	2525
2018	2526	if (!one)
2019		- makeSomething(content, false);
2020		-
2021		- ResetModel();
2022		- refreshContents();
	2527	+ makeSomething(content, true);
	2528	+ else
	2529	+ {
	2530	+ ResetModel();
	2531	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2532	+ refreshContents();
	2533	+ }
2023	2534	} else
2024		- if (event.getSource() == mergeGeometriesItem)
	2535	+ if (source == mergeGeometriesItem)
2025	2536	{
2026	2537	boolean one = false;
2027	2538
..	..	@@ -2051,7 +2562,7 @@
2051	2562	ResetModel();
2052	2563	refreshContents();
2053	2564	} else
2054		- if (event.getSource() == linkverticesItem)
	2565	+ if (source == linkverticesItem)
2055	2566	{
2056	2567	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2057	2568	// {
..	..	@@ -2064,39 +2575,48 @@
2064	2575	// group.selection.get(0).setMasterThis(content); // should be identity
2065	2576	// refreshContents();
2066	2577	// }
2067		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2578	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2068	2579	{
2069		- Object3D content = GrafreeD.clipboard.get(0);
	2580	+ Object3D content = Grafreed.clipboard.get(0);
2070	2581
2071	2582	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	2583	content = ((cGroup)content).get(0);
2073	2584
2074		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2585	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2075	2586	for (int i=0; i<group.selection.size(); i++)
2076	2587	{
2077		- boolean random = CameraPane.RANDOM;
2078		- CameraPane.RANDOM = false; // parse all random nodes
	2588	+ boolean random = CameraPane.SWITCH;
	2589	+ CameraPane.SWITCH = false; // parse all random nodes
2079	2590	group.selection.get(i).linkVerticesThis(content);
2080	2591	// group.selection.get(i).setMasterThis(content); // should be identity
2081		- CameraPane.RANDOM = random;
	2592	+ CameraPane.SWITCH = random;
2082	2593	}
2083		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2594	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2084	2595	refreshContents();
2085	2596	}
2086	2597	} else
2087		- if (event.getSource() == resetsupportItem)
	2598	+ if (source == resetsupportItem)
2088	2599	{
2089	2600	for (int i=0; i<group.selection.size(); i++)
2090	2601	{
2091		- boolean random = CameraPane.RANDOM;
2092		- CameraPane.RANDOM = false; // parse all random nodes
	2602	+ boolean random = CameraPane.SWITCH;
	2603	+ CameraPane.SWITCH = false; // parse all random nodes
2093	2604	group.selection.get(i).linkVerticesThis(null);
2094		- CameraPane.RANDOM = random;
	2605	+ CameraPane.SWITCH = random;
2095	2606	}
2096	2607
2097	2608	refreshContents();
2098	2609	} else
2099		- if (event.getSource() == resetreferencesItem)
	2610	+ if (source == relinkverticesItem)
	2611	+ {
	2612	+ boolean random = CameraPane.SWITCH;
	2613	+ CameraPane.SWITCH = false; // parse all random nodes
	2614	+ group.selection.RelinkToSupport();
	2615	+ CameraPane.SWITCH = random;
	2616	+
	2617	+ refreshContents();
	2618	+ } else
	2619	+ if (source == resetreferencesItem)
2100	2620	{
2101	2621	for (int i=0; i<group.selection.size(); i++)
2102	2622	{
..	..	@@ -2105,11 +2625,11 @@
2105	2625
2106	2626	refreshContents();
2107	2627	} else
2108		- if (event.getSource() == setMasterItem)
	2628	+ if (source == setMasterItem)
2109	2629	{
2110		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2630	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2111	2631	{
2112		- Object3D content = GrafreeD.clipboard.get(0);
	2632	+ Object3D content = Grafreed.clipboard.get(0);
2113	2633
2114	2634	if (content instanceof cGroup && ((cGroup)content).transientlink )
2115	2635	content = ((cGroup)content).get(0);
..	..	@@ -2118,13 +2638,13 @@
2118	2638	refreshContents();
2119	2639	}
2120	2640	} else
2121		- if (event.getSource() == poseMeshItem)
	2641	+ if (source == poseMeshItem)
2122	2642	{
2123	2643	if (group.selection.size() == 1)
2124	2644	{
2125		- if (GrafreeD.clipboard.size() == 1)
	2645	+ if (Grafreed.clipboard.size() == 1)
2126	2646	{
2127		- Object3D content = GrafreeD.clipboard.get(0);
	2647	+ Object3D content = Grafreed.clipboard.get(0);
2128	2648
2129	2649	if (content instanceof cGroup && ((cGroup)content).transientlink )
2130	2650	content = ((cGroup)content).get(0);
..	..	@@ -2137,19 +2657,19 @@
2137	2657	}
2138	2658
2139	2659	} else
2140		- if (event.getSource() == revertMeshItem)
	2660	+ if (source == revertMeshItem)
2141	2661	{
2142	2662	RevertMeshes();
2143	2663	} else
2144		- if (event.getSource() == resetMeshItem)
	2664	+ if (source == resetAllItem)
2145	2665	{
2146	2666	ResetAll();
2147	2667	} else
2148		- if (event.getSource() == stepAllItem)
	2668	+ if (source == stepAllItem)
2149	2669	{
2150	2670	StepAll();
2151	2671	} else
2152		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2672	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2153	2673	{
2154	2674	//int indices[] = jList.getSelectedIndices();
2155	2675	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2157,42 +2677,46 @@
2157	2677
2158	2678	ClearSelection(false);
2159	2679	} else
2160		- if (event.getSource() == clearAllItem)
	2680	+ if (source == clearAllItem)
2161	2681	{
2162	2682	ClearSelection(true);
2163	2683	} else
2164		- if (event.getSource() == grabItem)
	2684	+ if (source == grabItem \|\| source == groupButton)
2165	2685	{
2166		- group(new cGroup(), true);
	2686	+ group(new cGroup(), false); // true);
2167	2687	} else
2168		- if (event.getSource() == frontItem)
	2688	+ if (source == hideItem)
	2689	+ {
	2690	+ group(new HiddenObject());
	2691	+ } else
	2692	+ if (source == frontItem)
2169	2693	{
2170	2694	front();
2171	2695	} else
2172		- if (event.getSource() == backItem)
	2696	+ if (source == backItem)
2173	2697	{
2174	2698	back();
2175	2699	} else
2176		- if (event.getSource() == cameraItem)
	2700	+ if (source == cameraItem)
2177	2701	{
2178	2702	makeSomething(new Camera());
2179	2703	} else
2180		- if (event.getSource() == compositeItem)
	2704	+ if (source == compositeItem \|\| source == compositeButton)
2181	2705	{
2182	2706	group(new Composite());
2183	2707	} else
2184		- if (event.getSource() == randomItem)
	2708	+ if (source == switchItem \|\| source == switchButton)
2185	2709	{
2186	2710	RandomNode random = new RandomNode();
2187	2711	group(random);
2188	2712	if (random.size() > 0)
2189		- random.name = random.get(0).name + "Rnd";
	2713	+ random.name = random.get(0).name + "Switch";
2190	2714	} else
2191		- if (event.getSource() == physicsItem)
	2715	+ if (source == physicsItem)
2192	2716	{
2193	2717	group(new PhysicsNode());
2194	2718	} else
2195		- if (event.getSource() == frameselectorItem)
	2719	+ if (source == frameselectorItem)
2196	2720	{
2197	2721	for (int i=0; i<group.selection.size(); i++)
2198	2722	{
..	..	@@ -2204,7 +2728,7 @@
2204	2728	ResetModel();
2205	2729	refreshContents();
2206	2730	} else
2207		- if (event.getSource() == switchGeoItem)
	2731	+ if (source == switchGeoItem)
2208	2732	{
2209	2733	for (int i=0; i<group.selection.size(); i++)
2210	2734	{
..	..	@@ -2216,7 +2740,7 @@
2216	2740	ResetModel();
2217	2741	refreshContents();
2218	2742	} else
2219		- if (event.getSource() == switchTransfoItem)
	2743	+ if (source == switchTransfoItem)
2220	2744	{
2221	2745	for (int i=0; i<group.selection.size(); i++)
2222	2746	{
..	..	@@ -2228,7 +2752,7 @@
2228	2752	ResetModel();
2229	2753	refreshContents();
2230	2754	} else
2231		- if (event.getSource() == morphItem)
	2755	+ if (source == morphItem)
2232	2756	{
2233	2757	for (int i=0; i<group.selection.size(); i++)
2234	2758	{
..	..	@@ -2240,7 +2764,7 @@
2240	2764	ResetModel();
2241	2765	refreshContents();
2242	2766	} else
2243		- if (event.getSource() == scriptNodeItem)
	2767	+ if (source == scriptNodeItem)
2244	2768	{
2245	2769	boolean atleastone = false;
2246	2770
..	..	@@ -2279,199 +2803,252 @@
2279	2803	}
2280	2804	}
2281	2805	} else
2282		- if (event.getSource() == linkerItem)
	2806	+ if (source == linkerItem)
2283	2807	{
2284	2808	group(new cLinker());
2285	2809	} else
2286		- if (event.getSource() == textureItem)
	2810	+ if (source == textureItem \|\| source == textureButton)
2287	2811	{
2288	2812	group(new TextureNode());
2289	2813	} else
2290		- if (event.getSource() == shadowXItem)
	2814	+ if (source == billboardItem)
	2815	+ {
	2816	+ group(new BillboardNode());
	2817	+ } else
	2818	+ if (source == shadowXItem)
2291	2819	{
2292	2820	CastShadow(0);
2293	2821	} else
2294		- if (event.getSource() == shadowYItem)
	2822	+ if (source == shadowYItem)
2295	2823	{
2296	2824	CastShadow(1);
2297	2825	} else
2298		- if (event.getSource() == shadowZItem)
	2826	+ if (source == shadowZItem)
2299	2827	{
2300	2828	CastShadow(2);
2301	2829	} else
2302		- if (event.getSource() == ungroupItem)
	2830	+ if (source == ungroupItem \|\| source == ungroupButton)
2303	2831	{
2304		- ungroup();
	2832	+ boolean hasRoot = false;
	2833	+
	2834	+ for (int i=0; i<group.selection.size(); i++)
	2835	+ {
	2836	+ if (group.selection.get(i) == group)
	2837	+ {
	2838	+ hasRoot = true;
	2839	+ break;
	2840	+ }
	2841	+ }
	2842	+
	2843	+ if (!hasRoot)
	2844	+ {
	2845	+ for (int i=0; i<group.selection.size(); i++)
	2846	+ {
	2847	+ Ungroup(group.selection.get(i));
	2848	+ }
	2849	+
	2850	+ ClearSelection(false);
	2851	+
	2852	+ refreshContents();
	2853	+ }
2305	2854	} else
2306		- if (event.getSource() == genUVItem)
	2855	+ if (source == genUVItem)
2307	2856	{
2308	2857	GenUV();
2309	2858	} else
2310		- if (event.getSource() == genNormalsCADItem)
	2859	+ if (source == genNormalsCADItem)
2311	2860	{
2312	2861	GenNormals(true);
2313	2862	} else
2314		- if (event.getSource() == genNormalsMESHItem)
	2863	+ if (source == genNormalsMESHItem)
2315	2864	{
2316		- GenNormals(true); // TODO
	2865	+ GenNormalsMESH();
2317	2866	} else
2318		- if (event.getSource() == genNormalsORGANItem)
	2867	+ if (source == genNormalsORGANItem)
2319	2868	{
2320	2869	GenNormals(false);
2321	2870	} else
2322		- if (event.getSource() == stripifyItem)
	2871	+ if (source == genNormalsMINEItem)
	2872	+ {
	2873	+ GenNormalsMINE();
	2874	+ } else
	2875	+ if (source == stripifyItem)
2323	2876	{
2324	2877	Stripify();
2325	2878	} else
2326		- if (event.getSource() == unstripifyItem)
	2879	+ if (source == unstripifyItem)
2327	2880	{
2328	2881	Unstripify();
2329	2882	} else
2330		- if (event.getSource() == trimItem)
	2883	+ if (source == trimItem)
2331	2884	{
2332	2885	Trim();
2333	2886	} else
2334		- if (event.getSource() == untrimItem)
	2887	+ if (source == untrimItem)
2335	2888	{
2336	2889	Untrim();
2337	2890	} else
2338		- if (event.getSource() == clearColorsItem)
	2891	+ if (source == clearColorsItem)
2339	2892	{
2340	2893	ClearColors();
2341	2894	} else
2342		- if (event.getSource() == clearMaterialsItem)
	2895	+ if (source == clearMaterialsItem)
2343	2896	{
2344	2897	ClearMaterials();
2345	2898	} else
2346		- if (event.getSource() == liveleavesItem)
	2899	+ if (source == liveleavesItem)
2347	2900	{
2348	2901	LiveLeaves(true);
2349	2902	} else
2350		- if (event.getSource() == unliveleavesItem)
	2903	+ if (source == unliveleavesItem)
2351	2904	{
2352	2905	LiveLeaves(false);
2353	2906	} else
2354		- if (event.getSource() == supportleavesItem)
	2907	+ if (source == supportleavesItem)
2355	2908	{
2356	2909	SupportLeaves(true);
2357	2910	} else
2358		- if (event.getSource() == unsupportleavesItem)
	2911	+ if (source == unsupportleavesItem)
2359	2912	{
2360	2913	SupportLeaves(false);
2361	2914	} else
2362		- if (event.getSource() == hideleavesItem)
	2915	+ if (source == hideleavesItem)
2363	2916	{
2364	2917	HideLeaves(true);
2365	2918	} else
2366		- if (event.getSource() == showleavesItem)
	2919	+ if (source == showleavesItem)
2367	2920	{
2368	2921	HideLeaves(false);
2369	2922	} else
2370		- if (event.getSource() == markleavesItem)
	2923	+ if (source == markleavesItem)
2371	2924	{
2372	2925	MarkLeaves(true);
2373	2926	} else
2374		- if (event.getSource() == unmarkleavesItem)
	2927	+ if (source == unmarkleavesItem)
2375	2928	{
2376	2929	MarkLeaves(false);
2377	2930	} else
2378		- if (event.getSource() == flipVItem)
	2931	+ if (source == rewindleavesItem)
	2932	+ {
	2933	+ RewindLeaves(true);
	2934	+ } else
	2935	+ if (source == unrewindleavesItem)
	2936	+ {
	2937	+ RewindLeaves(false);
	2938	+ } else
	2939	+ if (source == randomleavesItem)
	2940	+ {
	2941	+ RandomLeaves(true);
	2942	+ } else
	2943	+ if (source == unrandomleavesItem)
	2944	+ {
	2945	+ RandomLeaves(false);
	2946	+ } else
	2947	+ if (source == flipVItem)
2379	2948	{
2380	2949	FlipV(true);
2381	2950	} else
2382		- if (event.getSource() == unflipVItem)
	2951	+ if (source == unflipVItem)
2383	2952	{
2384	2953	FlipV(false);
2385	2954	} else
2386		- if (event.getSource() == lowTexturesItem)
	2955	+ if (source == lowTexturesItem)
2387	2956	{
2388	2957	SetTexRes(0);
2389	2958	} else
2390		- if (event.getSource() == normalTexturesItem)
	2959	+ if (source == normalTexturesItem)
2391	2960	{
2392	2961	SetTexRes(1);
2393	2962	} else
2394		- if (event.getSource() == highTexturesItem)
	2963	+ if (source == highTexturesItem)
2395	2964	{
2396	2965	SetTexRes(2);
2397	2966	} else
2398		- if (event.getSource() == veryhighTexturesItem)
	2967	+ if (source == veryhighTexturesItem)
2399	2968	{
2400	2969	SetTexRes(3);
2401	2970	} else
2402		- if (event.getSource() == maxTexturesItem)
	2971	+ if (source == maxTexturesItem)
2403	2972	{
2404	2973	SetTexRes(4);
2405	2974	} else
2406		- if (event.getSource() == panoTexturesItem)
	2975	+ if (source == panoTexturesItem)
2407	2976	{
2408	2977	SetTexRes(5);
2409	2978	} else
2410		- if (event.getSource() == reverseNormalsItem)
	2979	+ if (source == reverseNormalsItem)
2411	2980	{
2412	2981	ReverseNormals();
2413	2982	} else
2414		- if (event.getSource() == parseverticesItem)
	2983	+ if (source == parseverticesItem)
2415	2984	{
2416	2985	ParseVertices();
2417	2986	} else
2418		- if (event.getSource() == textureFieldItem)
	2987	+ if (source == textureFieldItem)
2419	2988	{
2420	2989	TextureVertices();
2421	2990	} else
2422		- if (event.getSource() == alignItem)
	2991	+ if (source == alignItem)
2423	2992	{
2424	2993	Align();
2425	2994	} else
2426		- if (event.getSource() == mirrorItem)
	2995	+ if (source == mirrorItem)
2427	2996	{
2428	2997	MirrorPoses();
2429	2998	} else
2430		- if (event.getSource() == reduceMorphItem)
	2999	+ if (source == reduceMorphItem)
2431	3000	{
2432	3001	MeshReduction(false);
2433	3002	} else
2434		- if (event.getSource() == reduce34MorphItem)
	3003	+ if (source == reduce34MorphItem)
2435	3004	{
2436	3005	MeshReduction(true);
2437	3006	} else
2438		- if (event.getSource() == reverseTrianglesItem)
	3007	+ if (source == reverseTrianglesItem)
2439	3008	{
2440	3009	ReverseTriangles();
2441	3010	} else
2442		- if (event.getSource() == reduceMeshItem)
	3011	+ if (source == reduceMeshItem)
2443	3012	{
2444	3013	ReduceMesh(false);
2445	3014	} else
2446		- if (event.getSource() == reduce34MeshItem)
	3015	+ if (source == reduce34MeshItem)
2447	3016	{
2448	3017	ReduceMesh(true);
2449	3018	} else
2450		- if (event.getSource() == increaseMeshItem)
	3019	+ if (source == increaseMeshItem)
2451	3020	{
2452	3021	IncreaseMesh();
2453	3022	} else
2454		- if (event.getSource() == clipMeshItem)
	3023	+ if (source == clipMeshItem)
2455	3024	{
2456	3025	ClipMesh();
2457	3026	} else
2458		- if (event.getSource() == smoothMeshItem)
	3027	+ if (source == smoothMeshItem)
2459	3028	{
2460	3029	SmoothMesh();
2461	3030	} else
2462		- if (event.getSource() == transformgeometryItem)
	3031	+ if (source == transformGeometryItem)
2463	3032	{
2464	3033	TransformGeometry();
2465	3034	} else
2466		- if (event.getSource() == resetTransformItem)
	3035	+ if (source == transformChildrenItem)
	3036	+ {
	3037	+ TransformChildren();
	3038	+ } else
	3039	+ if (source == resetTransformItem)
2467	3040	{
2468	3041	ResetTransform();
2469	3042	} else
2470		- if (event.getSource() == resetCentroidItem)
	3043	+ if (source == resetCentroidItem)
2471	3044	{
2472		- ResetCentroid();
	3045	+ ResetCentroid(true);
2473	3046	} else
2474		- if (event.getSource() == resetParentItem)
	3047	+ if (source == resetCentroidXZItem)
	3048	+ {
	3049	+ ResetCentroid(false);
	3050	+ } else
	3051	+ if (source == resetParentItem)
2475	3052	{
2476	3053	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	3054	{
..	..	@@ -2481,7 +3058,7 @@
2481	3058
2482	3059	refreshContents();
2483	3060	} else
2484		- if (event.getSource() == repairParentItem)
	3061	+ if (source == repairParentItem)
2485	3062	{
2486	3063	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2487	3064	{
..	..	@@ -2495,7 +3072,21 @@
2495	3072
2496	3073	refreshContents();
2497	3074	} else
2498		- if (event.getSource() == sortbysizeItem)
	3075	+ if (source == repairShadowItem)
	3076	+ {
	3077	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3078	+ {
	3079	+ Object3D obj = (Object3D)e.nextElement();
	3080	+ obj.RepairShadow();
	3081	+// for (int i=0; i<obj.size(); i++)
	3082	+// {
	3083	+// obj.get(i).parent = obj;
	3084	+// }
	3085	+ }
	3086	+
	3087	+ refreshContents();
	3088	+ } else
	3089	+ if (source == sortbysizeItem)
2499	3090	{
2500	3091	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2501	3092	{
..	..	@@ -2507,7 +3098,7 @@
2507	3098	ResetModel();
2508	3099	refreshContents();
2509	3100	} else
2510		- if (event.getSource() == sortbynameItem)
	3101	+ if (source == sortbynameItem)
2511	3102	{
2512	3103	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2513	3104	{
..	..	@@ -2519,7 +3110,7 @@
2519	3110	ResetModel();
2520	3111	refreshContents();
2521	3112	} else
2522		- if (event.getSource() == attachPigmentItem)
	3113	+ if (source == attachPigmentItem)
2523	3114	{
2524	3115	String texture = GetFile("Attach pigment");
2525	3116	Object3D obj;
..	..	@@ -2531,7 +3122,7 @@
2531	3122
2532	3123	refreshContents();
2533	3124	} else
2534		- if (event.getSource() == detachPigmentItem)
	3125	+ if (source == detachPigmentItem)
2535	3126	{
2536	3127	Object3D obj;
2537	3128	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2542,7 +3133,7 @@
2542	3133
2543	3134	refreshContents();
2544	3135	} else
2545		- if (event.getSource() == attachBumpItem)
	3136	+ if (source == attachBumpItem)
2546	3137	{
2547	3138	String texture = GetFile("Attach bump");
2548	3139	Object3D obj;
..	..	@@ -2554,7 +3145,7 @@
2554	3145
2555	3146	refreshContents();
2556	3147	} else
2557		- if (event.getSource() == detachBumpItem)
	3148	+ if (source == detachBumpItem)
2558	3149	{
2559	3150	Object3D obj;
2560	3151	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2565,7 +3156,7 @@
2565	3156
2566	3157	refreshContents();
2567	3158	} else
2568		- if (event.getSource() == pigmentBumpItem)
	3159	+ if (source == pigmentBumpItem)
2569	3160	{
2570	3161	Object3D obj;
2571	3162	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2576,158 +3167,237 @@
2576	3167
2577	3168	refreshContents();
2578	3169	} else
2579		- if (event.getSource() == flashSelectionButton)
	3170	+ if (source == flashSelectionButton)
2580	3171	{
2581	3172	CameraPane.flash = true;
2582	3173	refreshContents();
2583	3174	} else
2584		- if (event.getSource() == oneButton)
	3175	+ if (source == oneButton)
2585	3176	{
2586	3177	} else
2587		- if (event.getSource() == twoButton)
	3178	+ if (source == twoButton)
2588	3179	{
2589	3180	radio.layout = twoButton;
	3181	+
	3182	+ if (CameraPane.FULLSCREEN)
	3183	+ fullscreenLayout = radio.layout;
	3184	+
2590	3185	// bug
2591	3186	//gridPanel.setDividerLocation(1.0);
2592	3187	//bigPanel.setDividerLocation(0.0);
2593		- bigThree.remove(jtp);
2594		- bigThree.remove(cameraPanel);
2595		- bigThree.remove(XYZPanel);
2596		- aWindowConstraints.gridx = 0;
2597		- aWindowConstraints.gridy = 0;
2598		- aWindowConstraints.gridwidth = 1;
2599		- // aConstraints.gridheight = 3;
2600		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2601		- aWindowConstraints.weightx = 0;
2602		- aWindowConstraints.weighty = 1;
2603		- //bigThree.add(jtp, aWindowConstraints);
2604		- aWindowConstraints.weightx = 1;
2605		- aWindowConstraints.gridwidth = 3;
2606		- // aConstraints.gridheight = 3;
2607		- aWindowConstraints.gridx = 1;
2608		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2609		- bigThree.add(cameraPanel, aWindowConstraints);
2610		- aWindowConstraints.weightx = 0;
2611		- aWindowConstraints.gridx = 4;
2612		- aWindowConstraints.gridwidth = 1;
2613		- // aConstraints.gridheight = 3;
2614		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2615		- //bigThree.add(XYZPanel, aWindowConstraints);
2616		- bigThree.revalidate();
	3188	+// bigThree.remove(scenePanel);
	3189	+// bigThree.remove(centralPanel);
	3190	+// bigThree.remove(XYZPanel);
	3191	+// aWindowConstraints.gridx = 0;
	3192	+// aWindowConstraints.gridy = 0;
	3193	+// aWindowConstraints.gridwidth = 1;
	3194	+// // aConstraints.gridheight = 3;
	3195	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3196	+// aWindowConstraints.weightx = 0;
	3197	+// aWindowConstraints.weighty = 1;
	3198	+// //bigThree.add(jtp, aWindowConstraints);
	3199	+// aWindowConstraints.weightx = 1;
	3200	+// aWindowConstraints.gridwidth = 3;
	3201	+// // aConstraints.gridheight = 3;
	3202	+// aWindowConstraints.gridx = 1;
	3203	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3204	+// bigThree.add(centralPanel, aWindowConstraints);
	3205	+// aWindowConstraints.weightx = 0;
	3206	+// aWindowConstraints.gridx = 4;
	3207	+// aWindowConstraints.gridwidth = 1;
	3208	+// // aConstraints.gridheight = 3;
	3209	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3210	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3211	+// scenePanel.setVisible(false);
	3212	+// centralPanel.setVisible(true);
	3213	+// XYZPanel.setVisible(false);
	3214	+ bigThree.ClearUI();
	3215	+ bigThree.add(centralPanel);
	3216	+ bigThree.FlushUI();
	3217	+
	3218	+ cameraView.requestFocusInWindow();
	3219	+
	3220	+// refreshContents(true);
	3221	+//
	3222	+// try
	3223	+// {
	3224	+// java.awt.Robot bot = new java.awt.Robot();
	3225	+// int mask = InputEvent.BUTTON1_MASK;
	3226	+// bot.mouseMove(100, 100);
	3227	+// bot.mousePress(mask);
	3228	+// bot.mouseRelease(mask);
	3229	+// }
	3230	+// catch (Exception e)
	3231	+// {
	3232	+//
	3233	+// }
	3234	+
2617	3235	} else
2618		- if (event.getSource() == threeButton)
	3236	+ if (source == threeButton)
2619	3237	{
2620	3238	radio.layout = threeButton;
2621		- bigThree.remove(jtp);
2622		- bigThree.remove(cameraPanel);
2623		- bigThree.remove(XYZPanel);
2624		- aWindowConstraints.gridx = 0;
2625		- aWindowConstraints.gridy = 0;
2626		- aWindowConstraints.gridwidth = 1;
2627		- // aConstraints.gridheight = 3;
2628		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2629		- aWindowConstraints.weightx = 0;
2630		- aWindowConstraints.weighty = 1;
2631		- //bigThree.add(jtp, aWindowConstraints);
2632		- aWindowConstraints.weightx = 1;
2633		- aWindowConstraints.gridwidth = 3;
2634		- // aConstraints.gridheight = 3;
2635		- aWindowConstraints.gridx = 1;
2636		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2637		- bigThree.add(cameraPanel, aWindowConstraints);
2638		- aWindowConstraints.weightx = 0;
2639		- aWindowConstraints.gridx = 4;
2640		- aWindowConstraints.gridwidth = 1;
2641		- // aConstraints.gridheight = 3;
2642		- aConstraints.fill = GridBagConstraints.VERTICAL;
2643		- bigThree.add(XYZPanel, aWindowConstraints);
2644		- bigThree.revalidate();
	3239	+
	3240	+ if (CameraPane.FULLSCREEN)
	3241	+ fullscreenLayout = radio.layout;
	3242	+
	3243	+// bigThree.remove(scenePanel);
	3244	+// bigThree.remove(centralPanel);
	3245	+// bigThree.remove(XYZPanel);
	3246	+// aWindowConstraints.gridx = 0;
	3247	+// aWindowConstraints.gridy = 0;
	3248	+// aWindowConstraints.gridwidth = 1;
	3249	+// // aConstraints.gridheight = 3;
	3250	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3251	+// aWindowConstraints.weightx = 0;
	3252	+// aWindowConstraints.weighty = 1;
	3253	+// //bigThree.add(jtp, aWindowConstraints);
	3254	+// aWindowConstraints.weightx = 1;
	3255	+// aWindowConstraints.gridwidth = 3;
	3256	+// // aConstraints.gridheight = 3;
	3257	+// aWindowConstraints.gridx = 1;
	3258	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3259	+// bigThree.add(centralPanel, aWindowConstraints);
	3260	+// aWindowConstraints.weightx = 0;
	3261	+// aWindowConstraints.gridx = 4;
	3262	+// aWindowConstraints.gridwidth = 1;
	3263	+// // aConstraints.gridheight = 3;
	3264	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3265	+// bigThree.add(XYZPanel, aWindowConstraints);
	3266	+// bigThree.validate();
	3267	+// scenePanel.setVisible(false);
	3268	+// centralPanel.setVisible(true);
	3269	+// XYZPanel.setVisible(true);
	3270	+ bigThree.ClearUI();
	3271	+ bigThree.add(centralPanel);
	3272	+ bigThree.add(XYZPanel);
	3273	+ bigThree.FlushUI();
	3274	+
	3275	+ cameraView.requestFocusInWindow();
2645	3276	} else
2646		- if (event.getSource() == fourButton)
	3277	+ if (source == fourButton)
2647	3278	{
2648	3279	radio.layout = fourButton;
2649		- bigThree.remove(jtp);
2650		- bigThree.remove(cameraPanel);
2651		- bigThree.remove(XYZPanel);
2652		- aWindowConstraints.gridx = 0;
2653		- aWindowConstraints.gridy = 0;
2654		- aWindowConstraints.gridwidth = 1;
2655		- // aWindowConstraints.gridheight = 3;
2656		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2657		- aWindowConstraints.weightx = 1;
2658		- aWindowConstraints.weighty = 1;
2659		- bigThree.add(jtp, aWindowConstraints);
2660		- aWindowConstraints.weightx = 1;
2661		- aWindowConstraints.gridwidth = 3;
2662		- // aConstraints.gridheight = 3;
2663		- aWindowConstraints.gridx = 1;
2664		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2665		- //bigThree.add(cameraPanel, aWindowConstraints);
2666		- aWindowConstraints.weightx = 0;
2667		- aWindowConstraints.gridx = 4;
2668		- aWindowConstraints.gridwidth = 1;
2669		- // aWindowConstraints.gridheight = 3;
2670		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2671		- //bigThree.add(XYZPanel, aWindowConstraints);
2672		- bigThree.revalidate();
	3280	+
	3281	+ if (CameraPane.FULLSCREEN)
	3282	+ fullscreenLayout = radio.layout;
	3283	+
	3284	+// bigThree.remove(scenePanel);
	3285	+// bigThree.remove(centralPanel);
	3286	+// bigThree.remove(XYZPanel);
	3287	+// aWindowConstraints.gridx = 0;
	3288	+// aWindowConstraints.gridy = 0;
	3289	+// aWindowConstraints.gridwidth = 1;
	3290	+// // aWindowConstraints.gridheight = 3;
	3291	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3292	+// aWindowConstraints.weightx = 1;
	3293	+// aWindowConstraints.weighty = 1;
	3294	+// bigThree.add(scenePanel, aWindowConstraints);
	3295	+// aWindowConstraints.weightx = 1;
	3296	+// aWindowConstraints.gridwidth = 3;
	3297	+// // aConstraints.gridheight = 3;
	3298	+// aWindowConstraints.gridx = 1;
	3299	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3300	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3301	+// aWindowConstraints.weightx = 0;
	3302	+// aWindowConstraints.gridx = 4;
	3303	+// aWindowConstraints.gridwidth = 1;
	3304	+// // aWindowConstraints.gridheight = 3;
	3305	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3306	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3307	+// bigThree.validate();
	3308	+// scenePanel.setVisible(true);
	3309	+// centralPanel.setVisible(false);
	3310	+// XYZPanel.setVisible(false);
	3311	+ bigThree.ClearUI();
	3312	+ bigThree.add(scenePanel);
	3313	+ bigThree.FlushUI();
	3314	+
	3315	+ cameraView.requestFocusInWindow();
2673	3316	} else
2674		- if (event.getSource() == sixButton)
	3317	+ if (source == sixButton)
2675	3318	{
2676	3319	radio.layout = sixButton;
2677		- bigThree.remove(jtp);
2678		- bigThree.remove(cameraPanel);
2679		- bigThree.remove(XYZPanel);
2680		- aWindowConstraints.gridx = 0;
2681		- aWindowConstraints.gridy = 0;
2682		- aWindowConstraints.gridwidth = 1;
2683		- // aConstraints.gridheight = 3;
2684		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2685		- aWindowConstraints.weightx = 0;
2686		- aWindowConstraints.weighty = 1;
2687		- bigThree.add(jtp, aWindowConstraints);
2688		- aWindowConstraints.weightx = 1;
2689		- aWindowConstraints.gridwidth = 3;
2690		- // aWindowConstraints.gridheight = 3;
2691		- aWindowConstraints.gridx = 1;
2692		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2693		- bigThree.add(cameraPanel, aWindowConstraints);
2694		- aWindowConstraints.weightx = 0;
2695		- aWindowConstraints.gridx = 4;
2696		- aWindowConstraints.gridwidth = 1;
2697		- // aWindowConstraints.gridheight = 3;
2698		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2699		- //bigThree.add(XYZPanel, aConstraints);
2700		- bigThree.revalidate();
	3320	+
	3321	+ if (CameraPane.FULLSCREEN)
	3322	+ fullscreenLayout = radio.layout;
	3323	+
	3324	+// bigThree.remove(scenePanel);
	3325	+// bigThree.remove(centralPanel);
	3326	+// bigThree.remove(XYZPanel);
	3327	+// aWindowConstraints.gridx = 0;
	3328	+// aWindowConstraints.gridy = 0;
	3329	+// aWindowConstraints.gridwidth = 1;
	3330	+// // aConstraints.gridheight = 3;
	3331	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3332	+// aWindowConstraints.weightx = 0;
	3333	+// aWindowConstraints.weighty = 1;
	3334	+// bigThree.add(scenePanel, aWindowConstraints);
	3335	+// aWindowConstraints.weightx = 1;
	3336	+// aWindowConstraints.gridwidth = 3;
	3337	+// // aWindowConstraints.gridheight = 3;
	3338	+// aWindowConstraints.gridx = 1;
	3339	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3340	+// bigThree.add(centralPanel, aWindowConstraints);
	3341	+// aWindowConstraints.weightx = 0;
	3342	+// aWindowConstraints.gridx = 4;
	3343	+// aWindowConstraints.gridwidth = 1;
	3344	+// // aWindowConstraints.gridheight = 3;
	3345	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3346	+// //bigThree.add(XYZPanel, aConstraints);
	3347	+// bigThree.validate();
	3348	+// scenePanel.setVisible(true);
	3349	+// centralPanel.setVisible(true);
	3350	+// XYZPanel.setVisible(false);
	3351	+ bigThree.ClearUI();
	3352	+ bigThree.add(scenePanel);
	3353	+ bigThree.add(centralPanel);
	3354	+ bigThree.FlushUI();
	3355	+
	3356	+ cameraView.requestFocusInWindow();
2701	3357	} else
2702		- if (event.getSource() == sevenButton)
	3358	+ if (source == sevenButton)
2703	3359	{
2704	3360	radio.layout = sevenButton;
2705		- bigThree.remove(jtp);
2706		- bigThree.remove(cameraPanel);
2707		- bigThree.remove(XYZPanel);
2708		- aWindowConstraints.gridx = 0;
2709		- aWindowConstraints.gridy = 0;
2710		- aWindowConstraints.gridwidth = 1;
2711		- // aWindowConstraints.gridheight = 3;
2712		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2713		- aWindowConstraints.weightx = 0;
2714		- aWindowConstraints.weighty = 1;
2715		- bigThree.add(jtp, aWindowConstraints);
2716		- aWindowConstraints.weightx = 1;
2717		- aWindowConstraints.gridwidth = 3;
2718		- // aWindowConstraints.gridheight = 3;
2719		- aWindowConstraints.gridx = 1;
2720		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2721		- bigThree.add(cameraPanel, aWindowConstraints);
2722		- aWindowConstraints.weightx = 0;
2723		- aWindowConstraints.gridx = 4;
2724		- aWindowConstraints.gridwidth = 1;
2725		- // aConstraints.gridheight = 3;
2726		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2727		- bigThree.add(XYZPanel, aWindowConstraints);
2728		- bigThree.revalidate();
	3361	+
	3362	+ if (CameraPane.FULLSCREEN)
	3363	+ fullscreenLayout = radio.layout;
	3364	+
	3365	+// bigThree.remove(scenePanel);
	3366	+// bigThree.remove(centralPanel);
	3367	+// bigThree.remove(XYZPanel);
	3368	+// aWindowConstraints.gridx = 0;
	3369	+// aWindowConstraints.gridy = 0;
	3370	+// aWindowConstraints.gridwidth = 1;
	3371	+// // aWindowConstraints.gridheight = 3;
	3372	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3373	+// aWindowConstraints.weightx = 0;
	3374	+// aWindowConstraints.weighty = 1;
	3375	+// bigThree.add(scenePanel, aWindowConstraints);
	3376	+// aWindowConstraints.weightx = 1;
	3377	+// aWindowConstraints.gridwidth = 3;
	3378	+// // aWindowConstraints.gridheight = 3;
	3379	+// aWindowConstraints.gridx = 1;
	3380	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3381	+// bigThree.add(centralPanel, aWindowConstraints);
	3382	+// aWindowConstraints.weightx = 0;
	3383	+// aWindowConstraints.gridx = 4;
	3384	+// aWindowConstraints.gridwidth = 1;
	3385	+// // aConstraints.gridheight = 3;
	3386	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3387	+// bigThree.add(XYZPanel, aWindowConstraints);
	3388	+// bigThree.validate();
	3389	+// scenePanel.setVisible(true);
	3390	+// centralPanel.setVisible(true);
	3391	+// XYZPanel.setVisible(true);
	3392	+ bigThree.ClearUI();
	3393	+ bigThree.add(scenePanel);
	3394	+ bigThree.add(centralPanel);
	3395	+ bigThree.add(XYZPanel);
	3396	+ bigThree.FlushUI();
	3397	+
	3398	+ cameraView.requestFocusInWindow();
2729	3399	} else
2730		- if (event.getSource() == rootButton)
	3400	+ if (source == rootButton)
2731	3401	{
2732	3402	Object3D obj;
2733	3403	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2737,66 +3407,84 @@
2737	3407	EditObject(obj);
2738	3408	}
2739	3409
	3410	+ cameraView.requestFocusInWindow();
2740	3411	refreshContents(true);
2741	3412	} else
2742		- if (event.getSource() == closeButton)
	3413	+ if (source == closeButton)
2743	3414	{
2744	3415	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2745	3416	cRadio ab;
2746	3417	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2747	3418	{
2748	3419	ab = (cRadio)e.nextElement();
2749		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3420	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2750	3421	{
	3422	+ // Patch to avoid bug with transparency.
	3423	+ if (!ab.hadMaterial)
	3424	+ {
	3425	+ ab.object.material = null;
	3426	+ }
	3427	+
2751	3428	buttonGroup.remove(ab);
2752	3429	radioPanel.remove(ab);
2753	3430
2754		- ab.GetObject().editWindow = null;
	3431	+ //ab.GetObject().editWindow = null;
	3432	+ ab.GetObject().manipWindow = null;
2755	3433	// ab.GetObject().objectUI = null; // ?????????
2756	3434
2757	3435	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2758	3436	break;
2759	3437	}
2760	3438	}
	3439	+
	3440	+ cameraView.requestFocusInWindow();
2761	3441	refreshContents(true);
2762	3442	} else
2763		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3443	+ if (source == editItem \|\| source == editButton)
2764	3444	{
	3445	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3446	+ {
	3447	+ Object3D child = (Object3D)e.nextElement();
	3448	+ child.pinned = true;
	3449	+ }
	3450	+
2765	3451	EditSelection(false);
2766	3452	} else
2767		- if (event.getSource() == uneditButton)
	3453	+ if (source == uneditButton)
2768	3454	{
2769	3455	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2770	3456	{
2771	3457	Object3D child = (Object3D)e.nextElement();
2772	3458	if(child.editWindow != null)
2773	3459	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3460	+ child.pinned = false;
2774	3461	child.CloseUI();
2775	3462	listUI.remove(child);
2776	3463
2777		- child.editWindow = null; // ???????????
	3464	+ //child.editWindow = null; // ???????????
2778	3465	}
2779		- objEditor.ctrlPanel.revalidate();
	3466	+ objEditor.ctrlPanel.FlushUI();
2780	3467	//objEditor.jTree.clearSelection();
2781	3468	//objEditor.ResetSliders();
2782	3469	refreshContents(true);
2783	3470	} else
2784		- if (event.getSource() == clearPanelButton)
	3471	+ if (source == clearPanelButton)
2785	3472	{
2786	3473	assert(copy == group);
2787	3474	//copy.ClearUI();
2788	3475	for (Object3D obj : listUI)
2789	3476	{
	3477	+ obj.pinned = false;
2790	3478	obj.CloseUI();
2791	3479	}
2792	3480	listUI.clear();
2793	3481	refreshContents(true);
2794	3482	} else
2795		- if (event.getSource() == allParamsButton)
	3483	+ if (source == allParamsButton)
2796	3484	{
2797	3485	assert(copy == group);
2798	3486
2799		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3487	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2800	3488
2801	3489	for (Object3D obj : listUI)
2802	3490	{
..	..	@@ -2813,19 +3501,19 @@
2813	3501
2814	3502	refreshContents(true);
2815	3503	} else
2816		- if (event.getSource() == unselectButton)
	3504	+ if (source == unselectButton)
2817	3505	{
2818	3506	objEditor.jTree.clearSelection();
2819	3507	// ?? oct 2012 GrafreeD.clipboard.clear();
2820	3508	objEditor.ResetSliders();
2821	3509	refreshContents(true);
2822	3510	} else
2823		- if(event.getSource() instanceof cRadio)
	3511	+ if(source instanceof cRadio)
2824	3512	{
2825	3513	group.parent = keepparent;
2826	3514	group.attributes = 0;
2827	3515	//group.editWindow = null;
2828		- /cRadio/ radio = (cRadio)event.getSource();
	3516	+ /cRadio/ radio = (cRadio)source;
2829	3517	Object3D obj = radio.GetObject();
2830	3518	System.out.println("Edit " + obj);
2831	3519	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2845,7 +3533,10 @@
2845	3533	}
2846	3534
2847	3535	copy = group;
2848		- //CameraPane.theRenderer.object = group;
	3536	+
	3537	+ SetUndoStates();
	3538	+
	3539	+ //Globals.theRenderer.object = group;
2849	3540	if(!useclient)
2850	3541	{
2851	3542	cameraView.renderCamera = radio.camera;
..	..	@@ -2854,25 +3545,52 @@
2854	3545	cameraView.cameras[cameraView.cameracount] = radio.camera;
2855	3546	cameraView.targetLookAt.set(radio.camera.lookAt);
2856	3547	cameraView.object = group;
2857		- cameraView.lighttouched = true;
	3548	+ //cameraView.lighttouched = true;
	3549	+ Globals.lighttouched = true;
2858	3550	topView.object = group;
2859	3551	frontView.object = group;
2860	3552	sideView.object = group;
2861	3553	}
2862		- group.editWindow = this;
	3554	+
	3555	+// fix "+" issue
	3556	+ //group.editWindow = this;
	3557	+ group.manipWindow = this;
	3558	+
2863	3559	/*
2864	3560	currentLayout = radio.layout;
2865	3561	if (currentLayout == null)
2866	3562	currentLayout = sevenButton;
2867	3563	*/
2868	3564	radio.layout.doClick();
	3565	+
	3566	+ ClearUnpinned();
	3567	+ //Grafreed.Assert(group != null);
	3568	+ //Grafreed.Assert(group.selection != null);
	3569	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3570	+ if (group.selection == null \|\| group.selection.size() == 1)
	3571	+ EditSelection(false);
2869	3572	keepparent = group.parent;
2870	3573	// PARENT = NULL or not???
2871	3574	//group.parent = null; // ROOT
2872	3575	//group.attributes = -1;
2873	3576	ResetModel();
	3577	+
	3578	+ cameraView.requestFocusInWindow();
2874	3579	refreshContents(true);
2875		- }
	3580	+ } else if (event.getSource() == editCameraItem)
	3581	+ {
	3582	+ cameraView.ProtectCamera();
	3583	+ cameraView.repaint();
	3584	+ return;
	3585	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3586	+ {
	3587	+ cameraView.RevertCamera();
	3588	+ cameraView.repaint();
	3589	+ return;
	3590	+ // } else if (event.getSource() == textureButton)
	3591	+ // {
	3592	+ // return; // true;
	3593	+ }
2876	3594	else
2877	3595	{
2878	3596	//return super.action(event, arg);
..	..	@@ -2881,7 +3599,6 @@
2881	3599	}
2882	3600
2883	3601	boolean useclient = false;
2884		- cRadio radio;
2885	3602
2886	3603	void ToggleRoot()
2887	3604	{
..	..	@@ -2890,7 +3607,7 @@
2890	3607	if (useclient)
2891	3608	{
2892	3609	cameraView.object = client;
2893		- cameraView.lighttouched = true;
	3610	+ Globals.lighttouched = true;
2894	3611	//topView.object = client;
2895	3612	//frontView.object = client;
2896	3613	//sideView.object = client;
..	..	@@ -2898,7 +3615,7 @@
2898	3615	else
2899	3616	{
2900	3617	cameraView.object = group;
2901		- cameraView.lighttouched = true;
	3618	+ Globals.lighttouched = true;
2902	3619	//topView.object = group;
2903	3620	//frontView.object = group;
2904	3621	//sideView.object = group;
..	..	@@ -2933,6 +3650,28 @@
2933	3650	refreshContents();
2934	3651	}
2935	3652
	3653	+ void TransformChildren()
	3654	+ {
	3655	+ Object3D obj;
	3656	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3657	+ {
	3658	+ obj = (Object3D)e.nextElement();
	3659	+ obj.KeepTextureMatrices();
	3660	+ obj.TransformChildren();
	3661	+ obj.RestoreTextureMatrices();
	3662	+
	3663	+// if (obj.parent == null)
	3664	+// {
	3665	+// System.out.println("NULL PARENT!");
	3666	+// new Exception().printStackTrace();
	3667	+// }
	3668	+// else
	3669	+// TouchTransform(obj);
	3670	+// //obj.parent.Touch();
	3671	+ }
	3672	+
	3673	+ refreshContents();
	3674	+ }
2936	3675
2937	3676	void ResetTransform()
2938	3677	{
..	..	@@ -3045,7 +3784,7 @@
3045	3784	refreshContents();
3046	3785	}
3047	3786
3048		- void ResetCentroid()
	3787	+ void ResetCentroid(boolean full)
3049	3788	{
3050	3789	Object3D obj;
3051	3790	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3060,12 +3799,16 @@
3060	3799	LA.matIdentity(Object3D.mat);
3061	3800	obj.getBounds(minima, maxima, false);
3062	3801	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3063		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3802	+ if (full)
	3803	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3064	3804	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3065	3805	obj.TransformMesh(Object3D.mat);
	3806	+
3066	3807	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3067		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3808	+ if (full)
	3809	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3068	3810	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3811	+
3069	3812	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3070	3813	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3071	3814	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3094,7 +3837,8 @@
3094	3837
3095	3838	int size = obj.MemorySize();
3096	3839
3097		- System.err.println((size/1024) + " KB is the size of " + obj);
	3840	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3841	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3098	3842	}
3099	3843	}
3100	3844	catch (Exception e)
..	..	@@ -3131,9 +3875,9 @@
3131	3875	obj = (Object3D)e.nextElement();
3132	3876
3133	3877	System.out.println("Object is: " + obj);
3134		- GrafreeD.AnalyzeObject(obj);
	3878	+ Grafreed.AnalyzeObject(obj);
3135	3879	System.out.println("Boundary rep: " + obj.bRep);
3136		- GrafreeD.AnalyzeObject(obj.bRep);
	3880	+ Grafreed.AnalyzeObject(obj.bRep);
3137	3881
3138	3882	// System.err.println((size/1024) + " KB is the size of " + obj);
3139	3883	}
..	..	@@ -3175,6 +3919,20 @@
3175	3919	void GenNormals(boolean crease)
3176	3920	{
3177	3921	group.GenNormalsS(crease);
	3922	+
	3923	+ refreshContents();
	3924	+ }
	3925	+
	3926	+ void GenNormalsMESH()
	3927	+ {
	3928	+ group.GenNormalsMeshS();
	3929	+
	3930	+ refreshContents();
	3931	+ }
	3932	+
	3933	+ void GenNormalsMINE()
	3934	+ {
	3935	+ group.selection.GenNormalsMINE();
3178	3936
3179	3937	refreshContents();
3180	3938	}
..	..	@@ -3340,8 +4098,8 @@
3340	4098
3341	4099	void ParseVertices()
3342	4100	{
3343		- boolean epsequal = GrafreeD.epsequal;
3344		- GrafreeD.epsequal = true;
	4101	+ boolean epsequal = Grafreed.epsequal;
	4102	+ Grafreed.epsequal = true;
3345	4103
3346	4104	for (int i=0; i<group.selection.size(); i++)
3347	4105	{
..	..	@@ -3366,7 +4124,7 @@
3366	4124	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3367	4125	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3368	4126
3369		- g.add(GrafreeD.clipboard);
	4127	+ g.add(Grafreed.clipboard);
3370	4128
3371	4129	buffer.add(g);
3372	4130	}
..	..	@@ -3381,7 +4139,7 @@
3381	4139	makeSomething(buffer, i==group.selection.size()-1);
3382	4140	}
3383	4141
3384		- GrafreeD.epsequal = epsequal;
	4142	+ Grafreed.epsequal = epsequal;
3385	4143
3386	4144	refreshContents();
3387	4145	}
..	..	@@ -3399,7 +4157,16 @@
3399	4157	String pigment = Object3D.GetPigment(tex);
3400	4158	//String bump = Object3D.GetBump(tex);
3401	4159
3402		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	4160	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4161	+
	4162	+ try
	4163	+ {
	4164	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4165	+ }
	4166	+ catch (Exception e)
	4167	+ {
	4168	+ System.err.println("FAIL: " + node);
	4169	+ }
3403	4170
3404	4171	double s = v.s;
3405	4172
..	..	@@ -3447,12 +4214,26 @@
3447	4214
3448	4215	void Align()
3449	4216	{
	4217	+ if (group.selection.size() == 0)
	4218	+ return;
	4219	+
	4220	+ cVector bbmin = new cVector();
	4221	+ cVector bbmax = new cVector();
	4222	+
	4223	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	4224	+
	4225	+ double dx = bbmax.x - bbmin.x;
	4226	+ double dy = bbmax.y - bbmin.y;
	4227	+ double dz = bbmax.z - bbmin.z;
	4228	+
	4229	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	4230	+
3450	4231	for (int i=0; i<group.selection.size(); i++)
3451	4232	{
3452	4233	Object3D obj = group.selection.get(i);
3453	4234
3454		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3455		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	4235	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	4236	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3456	4237	}
3457	4238
3458	4239	refreshContents();
..	..	@@ -3473,11 +4254,11 @@
3473	4254
3474	4255	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3475	4256
3476		- boolean random = CameraPane.RANDOM;
3477		- CameraPane.RANDOM = false; // parse all random nodes
	4257	+ boolean random = CameraPane.SWITCH;
	4258	+ CameraPane.SWITCH = false; // parse all random nodes
3478	4259	lowres.linkVerticesThis(null);
3479	4260	lowres.linkVerticesThis(sn);
3480		- CameraPane.RANDOM = random;
	4261	+ CameraPane.SWITCH = random;
3481	4262
3482	4263	System.err.flush();
3483	4264
..	..	@@ -3517,7 +4298,7 @@
3517	4298	return;
3518	4299
3519	4300	Object3D poses = group.selection.get(0);
3520		- Object3D ref = GrafreeD.clipboard.get(0);
	4301	+ Object3D ref = Grafreed.clipboard.get(0);
3521	4302
3522	4303	Object3D newgroup = new Object3D("Po:" + poses.name);
3523	4304
..	..	@@ -3686,7 +4467,7 @@
3686	4467	group.selection.RelinkToSupport(); // july 2014
3687	4468	System.out.println("DONE.");
3688	4469	refreshContents();
3689		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4470	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3690	4471	}
3691	4472
3692	4473	void ReduceMesh(boolean reduction34)
..	..	@@ -3711,9 +4492,9 @@
3711	4492
3712	4493	void ClipMesh()
3713	4494	{
3714		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4495	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3715	4496	{
3716		- Object3D content = GrafreeD.clipboard.get(0);
	4497	+ Object3D content = Grafreed.clipboard.get(0);
3717	4498
3718	4499	if (content instanceof cGroup && ((cGroup)content).transientlink )
3719	4500	content = ((cGroup)content).get(0);
..	..	@@ -3722,7 +4503,7 @@
3722	4503	// {
3723	4504	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3724	4505	// }
3725		- group.selection.ClipMesh(GrafreeD.clipboard);
	4506	+ group.selection.ClipMesh(Grafreed.clipboard);
3726	4507	}
3727	4508	// group.selection.ClipMesh(GrafreeD.clipboard);
3728	4509	System.out.println("DONE.");
..	..	@@ -3769,6 +4550,18 @@
3769	4550	void MarkLeaves(boolean hide)
3770	4551	{
3771	4552	group.selection.MarkLeaves(hide);
	4553	+ refreshContents();
	4554	+ }
	4555	+
	4556	+ void RewindLeaves(boolean hide)
	4557	+ {
	4558	+ group.selection.RewindLeaves(hide);
	4559	+ refreshContents();
	4560	+ }
	4561	+
	4562	+ void RandomLeaves(boolean hide)
	4563	+ {
	4564	+ group.selection.RandomLeaves(hide);
3772	4565	refreshContents();
3773	4566	}
3774	4567
..	..	@@ -3843,28 +4636,25 @@
3843	4636	// }
3844	4637	// }
3845	4638
3846		- static boolean allparams = true;
3847		-
3848		- static Vector<Object3D> listUI = new Vector<Object3D>();
3849		-
3850	4639	void EditSelection(boolean newWindow)
3851	4640	{
	4641	+ if (group.selection == null)
	4642	+ {
	4643	+ EditElement(group, newWindow); // ? new
	4644	+ return;
	4645	+ }
	4646	+
3852	4647	// aConstraints.gridy = 0;
3853	4648	for (int i=0; i<group.selection.size(); i++)
3854	4649	{
3855	4650	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3856	4651	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3857		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4652	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3858	4653
3859	4654	Object3D elem = (Object3D)group.selection.elementAt(i);
3860		- if(elem != group)
	4655	+ if(elem != group \|\| !newWindow)
3861	4656	{
3862		- // if (!(elem instanceof Composite))
3863		- // newWindow = false;
3864		- listUI.add(elem);
3865		- elem.openEditWindow(this, newWindow); //, false);
3866		- System.out.println("edit : " + elem);
3867		- elem.editWindow.refreshContents(true); // ? new
	4657	+ EditElement(elem, newWindow); // ? new
3868	4658	}
3869	4659	}
3870	4660	}
..	..	@@ -3939,7 +4729,8 @@
3939	4729	//new Exception().printStackTrace();
3940	4730
3941	4731	freezemodel = true;
3942		-
	4732	+ ClearUnpinned();
	4733	+
3943	4734	/**/
3944	4735	//switch (event.id)
3945	4736	{
..	..	@@ -3947,7 +4738,6 @@
3947	4738	//case 702: // Event.LIST_DESELECT
3948	4739	group.deselectAll();
3949	4740	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3950		- objEditor.ClearInfo(); // .GetMaterial());
3951	4741	if (tps != null)
3952	4742	{
3953	4743	for (int i=0; i < tps.length; i++)
..	..	@@ -3956,33 +4746,39 @@
3956	4746
3957	4747	//if (child.parent != null)
3958	4748	//child.parent.addSelectee(child);
	4749	+ objEditor.SetMaterial(child);
3959	4750	group.addSelectee(child);
3960		- objEditor.SetMaterial(child); // .GetMaterial());
3961		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3962		- System.err.println("info : " + child.GetPath());
3963	4751	}
3964	4752	}
3965		- else
3966		- {
3967		- objEditor.SetMaterial(group); // .GetMaterial());
3968		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3969		- System.err.println("info : " + group.GetPath());
3970		- }
	4753	+// else
	4754	+// {
	4755	+// objEditor.SetMaterial(group); // .GetMaterial());
	4756	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4757	+// System.err.println("info : " + group.GetPath());
	4758	+// }
3971	4759
3972		- objEditor.SetText(); // jan 2014
3973		-
3974		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4760	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
3975	4761	CameraPane.flash = true;
3976	4762
3977		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4763	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3978	4764	// a camera
3979	4765	{
3980		- CameraPane.camerachangeframe = 0; // don't refuse it
3981		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3982		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3983		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4766	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4767	+ {
	4768	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4769	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4770	+ }
	4771	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4772	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3984	4773	}
3985	4774
	4775	+ if (tps != null && tps.length == 1)
	4776	+ {
	4777	+ EditSelection(false);
	4778	+ }
	4779	+
	4780	+ SetPinStates(tps != null && tps.length > 0);
	4781	+
3986	4782	refreshContents();
3987	4783	//return true;
3988	4784	}
..	..	@@ -3991,6 +4787,35 @@
3991	4787
3992	4788	freezemodel = false;
3993	4789	}
	4790	+
	4791	+ void SetPinStates(boolean enabled)
	4792	+ {
	4793	+ editButton.setEnabled(enabled);
	4794	+ uneditButton.setEnabled(enabled);
	4795	+ unselectButton.setEnabled(enabled);
	4796	+ flashSelectionButton.setEnabled(enabled);
	4797	+ }
	4798	+
	4799	+ void refreshContents(boolean cp)
	4800	+ {
	4801	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4802	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4803	+ {
	4804	+ objEditor.ClearInfo(); // .GetMaterial());
	4805	+
	4806	+ for (int i=0; i < group.selection.Size(); i++)
	4807	+ {
	4808	+ Object3D child = (Object3D) group.selection.get(i);
	4809	+
	4810	+ objEditor.AddInfo(child, this, true);
	4811	+ System.err.println("info : " + child.GetPath());
	4812	+ }
	4813	+
	4814	+ objEditor.SetText(); // jan 2014
	4815	+ }
	4816	+
	4817	+ super.refreshContents(cp);
	4818	+ }
3994	4819
3995	4820	void linkSomething(Object3D thing)
3996	4821	{
..	..	@@ -4062,16 +4887,19 @@
4062	4887	{
4063	4888	if (group.selection.isEmpty())
4064	4889	return;
4065		- GrafreeD.clipboardIsTempGroup = false;
	4890	+
	4891	+ Grafreed.clipboardIsTempGroup = false;
4066	4892	Composite tGroup = null;
4067	4893	if (group.selection.size() > 0) // 1)
4068	4894	{
4069	4895	tGroup = new cGroup();
4070		- GrafreeD.clipboardIsTempGroup = true;
	4896	+ Grafreed.clipboardIsTempGroup = true;
4071	4897	}
4072	4898
4073	4899	if (cut)
4074	4900	{
	4901	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4902	+// Save();
4075	4903	//int indices[] = jList.getSelectedIndices();
4076	4904	//for (int i = indices.length - 1; i >= 0; i--)
4077	4905	//jList.remove(indices[i]);
..	..	@@ -4107,16 +4935,16 @@
4107	4935	//System.out.println("cut " + child);
4108	4936	//System.out.println("parent = " + child.parent);
4109	4937	// tmp.addChild(child);
4110		- if (GrafreeD.clipboardIsTempGroup)
	4938	+ if (Grafreed.clipboardIsTempGroup)
4111	4939	tGroup.add/Child/(tmp);
4112	4940	else
4113		- GrafreeD.clipboard = tmp;
	4941	+ Grafreed.clipboard = tmp;
4114	4942	}
4115	4943	else
4116		- if (GrafreeD.clipboardIsTempGroup)
	4944	+ if (Grafreed.clipboardIsTempGroup)
4117	4945	tGroup.add/Child/(child);
4118	4946	else
4119		- GrafreeD.clipboard = child;
	4947	+ Grafreed.clipboard = child;
4120	4948	}
4121	4949
4122	4950	//ResetModel();
..	..	@@ -4148,21 +4976,23 @@
4148	4976	//System.out.println("cut " + elem);
4149	4977	//System.out.println("parent = " + elem.parent);
4150	4978	// tmp.addChild(elem);
4151		- if (GrafreeD.clipboardIsTempGroup)
	4979	+ if (Grafreed.clipboardIsTempGroup)
4152	4980	tGroup.add/Child/(tmp);
4153	4981	else
4154		- GrafreeD.clipboard = tmp;
	4982	+ Grafreed.clipboard = tmp;
4155	4983	}
4156	4984	else
4157		- if (GrafreeD.clipboardIsTempGroup)
	4985	+ if (Grafreed.clipboardIsTempGroup)
4158	4986	tGroup.add/Child/(child);
4159	4987	else
4160		- GrafreeD.clipboard = child;
	4988	+ Grafreed.clipboard = child;
4161	4989	}
4162	4990
4163	4991	}
4164		- if (GrafreeD.clipboardIsTempGroup)
4165		- GrafreeD.clipboard = tGroup;
	4992	+
	4993	+ if (Grafreed.clipboardIsTempGroup)
	4994	+ Grafreed.clipboard = tGroup;
	4995	+
4166	4996	if (cut)
4167	4997	{
4168	4998	ResetModel();
..	..	@@ -4172,11 +5002,15 @@
4172	5002
4173	5003	void paste(boolean expand)
4174	5004	{
	5005	+ if (Globals.REPLACEONMAKE)
	5006	+ Save();
	5007	+ boolean keep = Globals.REPLACEONMAKE;
	5008	+ Globals.REPLACEONMAKE = false;
4175	5009	// if (GrafreeD.clipboard == null)
4176	5010	// return;
4177	5011	boolean first = true;
4178	5012
4179		- if (GrafreeD.clipboardIsTempGroup)
	5013	+ if (Grafreed.clipboardIsTempGroup)
4180	5014	{
4181	5015	Composite temp;
4182	5016
..	..	@@ -4187,7 +5021,7 @@
4187	5021	temp = (Composite)Applet3D.clipboard.deepCopy();
4188	5022	*/
4189	5023	Object3D elem;
4190		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5024	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4191	5025	{
4192	5026	Object3D child = (Object3D)e.nextElement();
4193	5027
..	..	@@ -4221,21 +5055,22 @@
4221	5055	//Object3D cb = Applet3D.clipboard;
4222	5056	//temp.addChild(cb);
4223	5057	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4224		- assert(GrafreeD.clipboard.parent == null);
4225		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4226		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4227		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4228		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5058	+ assert(Grafreed.clipboard.parent == null);
	5059	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5060	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5061	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5062	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4229	5063	else
4230		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4231		- GrafreeD.clipboard.get(0).parent = keepparent;
	5064	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5065	+ Grafreed.clipboard.get(0).parent = keepparent;
4232	5066	}
4233	5067
	5068	+ Globals.REPLACEONMAKE = keep;
4234	5069	ResetModel();
4235	5070	refreshContents();
4236	5071	}
4237	5072
4238		- void pasteInto(boolean copyit)
	5073	+ void pasteInto(boolean copyit, boolean clone)
4239	5074	{
4240	5075	// if (GrafreeD.clipboard == null)
4241	5076	// return;
..	..	@@ -4264,15 +5099,22 @@
4264	5099	if (copyit)
4265	5100	{
4266	5101	// paste(false);
4267		- CloneClipboard(false); // sept 2014
	5102	+ if (clone)
	5103	+ {
	5104	+ CloneClipboard(false); // sept 2014
	5105	+ }
	5106	+ else
	5107	+ {
	5108	+ paste(false);
	5109	+ }
4268	5110	}
4269	5111	else
4270	5112	{
4271	5113	boolean first = true;
4272	5114
4273		- if (GrafreeD.clipboardIsTempGroup)
	5115	+ if (Grafreed.clipboardIsTempGroup)
4274	5116	{
4275		- Composite temp = (Composite)GrafreeD.clipboard;
	5117	+ Composite temp = (Composite)Grafreed.clipboard;
4276	5118	Object3D copy;
4277	5119	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4278	5120	{
..	..	@@ -4282,7 +5124,7 @@
4282	5124	}
4283	5125	} else
4284	5126	{
4285		- linkSomething(GrafreeD.clipboard); //.get(0));
	5127	+ linkSomething(Grafreed.clipboard); //.get(0));
4286	5128	}
4287	5129	}
4288	5130	}
..	..	@@ -4359,6 +5201,10 @@
4359	5201
4360	5202	void group(Object3D csg, boolean grab)
4361	5203	{
	5204	+ if (Globals.REPLACEONMAKE)
	5205	+ Save();
	5206	+ boolean keep = Globals.REPLACEONMAKE;
	5207	+ Globals.REPLACEONMAKE = false;
4362	5208	if (//false) // why??
4363	5209	!group.selection.isEmpty())
4364	5210	{
..	..	@@ -4472,8 +5318,34 @@
4472	5318	//node.add(csg);
4473	5319	//makeSomething(node);
4474	5320	makeSomething(csg);
	5321	+ Globals.REPLACEONMAKE = keep;
4475	5322	}
4476	5323
	5324	+ void Ungroup(Object3D g)
	5325	+ {
	5326	+ if (Globals.REPLACEONMAKE)
	5327	+ Save();
	5328	+ boolean keep = Globals.REPLACEONMAKE;
	5329	+ Globals.REPLACEONMAKE = false;
	5330	+ if (g instanceof HiddenObject)
	5331	+ {
	5332	+ HiddenObject h = (HiddenObject) g;
	5333	+
	5334	+ for (int i=0; i<h.ActualSize(); i++)
	5335	+ {
	5336	+ objEditor.makeSomething(h.get(i), false);
	5337	+ }
	5338	+ }
	5339	+ else
	5340	+ {
	5341	+ for (int i=0; i<g.Size(); i++)
	5342	+ {
	5343	+ objEditor.makeSomething(g.get(i), false);
	5344	+ }
	5345	+ }
	5346	+ Globals.REPLACEONMAKE = keep;
	5347	+ }
	5348	+
4477	5349	void ungroup()
4478	5350	{
4479	5351	/*
..	..	@@ -4667,21 +5539,6 @@
4667	5539	}
4668	5540	*/
4669	5541
4670		- void ImportGFD()
4671		- {
4672		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4673		- browser.show();
4674		- String filename = browser.getFile();
4675		- if (filename != null && filename.length() > 0)
4676		- {
4677		- String fullname = browser.getDirectory() + filename;
4678		-
4679		- //Object3D readobj =
4680		- objEditor.ReadGFD(fullname, objEditor);
4681		- //makeSomething(readobj);
4682		- }
4683		- }
4684		-
4685	5542	/*
4686	5543	public void Callback(Object obj)
4687	5544	{
..	..	@@ -4705,26 +5562,9 @@
4705	5562	}
4706	5563	*/
4707	5564
4708		- void ImportVRMLX3D()
4709		- {
4710		- if (GrafreeD.standAlone)
4711		- {
4712		- /**/
4713		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4714		- browser.show();
4715		- String filename = browser.getFile();
4716		- if (filename != null && filename.length() > 0)
4717		- {
4718		- String fullname = browser.getDirectory() + filename;
4719		- LoadVRMLX3D(fullname);
4720		- }
4721		- /**/
4722		- }
4723		- }
4724		-
4725	5565	String GetFile(String dialogName)
4726	5566	{
4727		- if (GrafreeD.standAlone)
	5567	+ if (Grafreed.standAlone)
4728	5568	{
4729	5569	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4730	5570	browser.show();
..	..	@@ -4788,10 +5628,33 @@
4788	5628	cButton flashSelectionButton;
4789	5629	cButton editButton;
4790	5630	cButton uneditButton;
	5631	+ JCheckBox allParamsButton;
4791	5632	cButton clearpanelButton;
4792		- cButton allParamsButton;
4793	5633	cButton unselectButton;
4794	5634
	5635	+ cButton restoreCameraButton;
	5636	+
	5637	+ cButton saveButton;
	5638	+ cButton oneStepButton;
	5639	+
	5640	+ cButton groupButton;
	5641	+ cButton ungroupButton;
	5642	+ cButton compositeButton;
	5643	+ cButton switchButton;
	5644	+ cButton loopButton;
	5645	+ cButton textureButton;
	5646	+
	5647	+ cButton gridButton;
	5648	+ cButton boxButton;
	5649	+ cButton sphereButton;
	5650	+ cButton coneButton;
	5651	+ cButton torusButton;
	5652	+ cButton superButton;
	5653	+ cButton kleinButton;
	5654	+ cButton particlesButton;
	5655	+ cButton overlayButton;
	5656	+ cButton lightButton;
	5657	+
4795	5658	cButton screenfitButton;
4796	5659	cButton screenfitpointButton;
4797	5660	cButton snapobjectButton;
..	..	@@ -4803,14 +5666,6 @@
4803	5666
4804	5667	cButton setsupportButton;
4805	5668
4806		- cButton twoButton;
4807		- cButton sixButton;
4808		- cButton threeButton;
4809		- cButton sevenButton;
4810		- cButton fourButton; // full panel
4811		- cButton oneButton; // full XYZ
4812		- //cButton currentLayout;
4813		-
4814	5669	//
4815	5670	//Composite
4816	5671	Object3D // to do !!
..	..	@@ -4820,9 +5675,11 @@
4820	5675	//JTree jTree;
4821	5676	private MenuItem lookAtItem;
4822	5677	private MenuItem lookFromItem;
4823		- private MenuItem switchItem;
	5678	+ private MenuItem switchViewItem;
4824	5679	private MenuItem cutItem;
4825		- private MenuItem duplicateItem;
	5680	+ private MenuItem undoItem;
	5681	+ private MenuItem redoItem;
	5682	+ private JMenuItem duplicateItem;
4826	5683	private MenuItem cloneItem;
4827	5684	private MenuItem cloneSupportItem;
4828	5685	private MenuItem overwriteGeoItem;
..	..	@@ -4833,8 +5690,9 @@
4833	5690	private MenuItem resetsupportItem;
4834	5691	private MenuItem resetreferencesItem;
4835	5692	private MenuItem linkverticesItem;
	5693	+ private MenuItem relinkverticesItem;
4836	5694	private MenuItem setMasterItem;
4837		- private MenuItem resetMeshItem;
	5695	+ private MenuItem resetAllItem;
4838	5696	private MenuItem stepAllItem;
4839	5697	private MenuItem revertMeshItem;
4840	5698	private MenuItem poseMeshItem;
..	..	@@ -4845,15 +5703,17 @@
4845	5703	private MenuItem mergeGeometriesItem;
4846	5704	private MenuItem copyItem;
4847	5705	private MenuItem pasteItem;
	5706	+ private MenuItem pasteIntoItem;
4848	5707	private MenuItem pasteLinkItem;
4849	5708	private MenuItem pasteCloneItem;
4850	5709	private MenuItem pasteExpandItem;
4851		- private MenuItem clearItem;
	5710	+ private MenuItem deleteItem;
4852	5711	private MenuItem clearAllItem;
4853	5712	private MenuItem genUVItem;
4854	5713	private MenuItem genNormalsMESHItem;
4855	5714	private MenuItem genNormalsCADItem;
4856	5715	private MenuItem genNormalsORGANItem;
	5716	+ private MenuItem genNormalsMINEItem;
4857	5717	private MenuItem stripifyItem;
4858	5718	private MenuItem unstripifyItem;
4859	5719	private MenuItem trimItem;
..	..	@@ -4882,6 +5742,10 @@
4882	5742	private MenuItem showleavesItem;
4883	5743	private MenuItem markleavesItem;
4884	5744	private MenuItem unmarkleavesItem;
	5745	+ private MenuItem rewindleavesItem;
	5746	+ private MenuItem unrewindleavesItem;
	5747	+ private MenuItem randomleavesItem;
	5748	+ private MenuItem unrandomleavesItem;
4885	5749
4886	5750	private MenuItem flipVItem;
4887	5751	private MenuItem unflipVItem;
..	..	@@ -4893,14 +5757,17 @@
4893	5757	private MenuItem panoTexturesItem;
4894	5758
4895	5759	private MenuItem resetCentroidItem;
4896		- private MenuItem transformgeometryItem;
	5760	+ private MenuItem resetCentroidXZItem;
4897	5761	private MenuItem resetTransformItem;
	5762	+ private MenuItem transformGeometryItem;
	5763	+ private MenuItem transformChildrenItem;
	5764	+ private MenuItem hideItem;
4898	5765	private MenuItem grabItem;
4899	5766	private MenuItem backItem;
4900	5767	private MenuItem frontItem;
4901	5768	private MenuItem cameraItem;
4902	5769	private MenuItem compositeItem;
4903		- private MenuItem randomItem;
	5770	+ private MenuItem switchItem;
4904	5771	private MenuItem physicsItem;
4905	5772	private MenuItem frameselectorItem;
4906	5773	private MenuItem scriptNodeItem;
..	..	@@ -4915,6 +5782,7 @@
4915	5782
4916	5783	private MenuItem resetParentItem;
4917	5784	private MenuItem repairParentItem;
	5785	+ private MenuItem repairShadowItem;
4918	5786	private MenuItem sortbysizeItem;
4919	5787	private MenuItem sortbynameItem;
4920	5788
..	..	@@ -4935,10 +5803,11 @@
4935	5803	private MenuItem coneItem;
4936	5804	private MenuItem torusItem;
4937	5805	private MenuItem superItem;
	5806	+ private MenuItem kleinItem;
4938	5807	private MenuItem blobItem;
4939	5808	private MenuItem latheItem;
4940	5809	private MenuItem bezierItem;
4941		- private MenuItem checkerItem;
	5810	+ private MenuItem overlayItem;
4942	5811	private MenuItem meshItem;
4943	5812	// private MenuItem meshGroupItem;
4944	5813	private MenuItem springItem;
..	..	@@ -4947,6 +5816,7 @@
4947	5816	private MenuItem csgItem;
4948	5817	private MenuItem templateItem;
4949	5818	private MenuItem textureItem;
	5819	+ private MenuItem billboardItem;
4950	5820	private MenuItem shadowXItem;
4951	5821	private MenuItem shadowYItem;
4952	5822	private MenuItem shadowZItem;
..	..	@@ -4959,11 +5829,6 @@
4959	5829	private MenuItem doubleItem;
4960	5830	private MenuItem tripleItem;
4961	5831
4962		- private MenuItem importGFDItem;
4963		- private MenuItem importVRMLX3DItem;
4964		- private MenuItem import3DSItem;
4965		- private MenuItem importOBJItem;
4966		-
4967	5832	private MenuItem computeAOItem;
4968	5833	private MenuItem recompileItem;
4969	5834	private MenuItem editScriptItem;
..	..	@@ -4973,4 +5838,8 @@
4973	5838	private MenuItem analyzeItem;
4974	5839	private MenuItem dumpItem;
4975	5840	//boolean freezemodel = false;
	5841	+
	5842	+ Menu cameraMenu;
	5843	+ MenuItem editCameraItem;
	5844	+ MenuItem restoreCameraItem;
4976	5845	}