~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,7 +96,11 @@
83	96
84	97	void CloneSelection(boolean supports)
85	98	{
86		- // Object3D keep = GraphreeD.clipboard;
	99	+ if (Globals.REPLACEONMAKE)
	100	+ Save();
	101	+ boolean keep = Globals.REPLACEONMAKE;
	102	+ Globals.REPLACEONMAKE = false;
	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();)
89	106	{
..	..	@@ -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(GraphreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
102		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GraphreeD.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(GraphreeD.clipboard, false));
107		- GraphreeD.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)GraphreeD.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);
228		- frontItem = menu.add(new MenuItem("Front"));
229		- frontItem.addActionListener(this);
	348	+// grabItem = menu.add(new MenuItem("Grab"));
	349	+// grabItem.addActionListener(this);
230	350	backItem = menu.add(new MenuItem("Back"));
231	351	backItem.addActionListener(this);
232		- 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);
	352	+ frontItem = menu.add(new MenuItem("Front"));
	353	+ frontItem.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"));
..	..	@@ -285,6 +429,13 @@
285	429	genNormalsORGANItem.addActionListener(this);
286	430	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
287	431	genNormalsCADItem.addActionListener(this);
	432	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	433	+ genNormalsMESHItem.addActionListener(this);
	434	+ if (Globals.ADVANCED)
	435	+ {
	436	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
	437	+ genNormalsMINEItem.addActionListener(this);
	438	+ }
288	439	stripifyItem = menu.add(new MenuItem("Stripify"));
289	440	stripifyItem.addActionListener(this);
290	441	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -306,23 +457,34 @@
306	457	reduce34MeshItem.addActionListener(this);
307	458	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	459	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	460	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	461	clipMeshItem.addActionListener(this);
	462	+
	463	+ if (Globals.ADVANCED)
	464	+ {
	465	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	466	+ smoothMeshItem.addActionListener(this);
	467	+ }
313	468
314	469	oe.menuBar.add(menu = new Menu("Attributes"));
315	470	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
316	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);
317	476	menu.add("-");
318	477	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
319	478	liveleavesItem.addActionListener(this);
320	479	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
321	480	unliveleavesItem.addActionListener(this);
	481	+ if (Globals.ADVANCED)
	482	+ {
322	483	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
323	484	supportleavesItem.addActionListener(this);
324	485	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
325	486	unsupportleavesItem.addActionListener(this);
	487	+ }
326	488	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
327	489	hideleavesItem.addActionListener(this);
328	490	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -331,6 +493,14 @@
331	493	markleavesItem.addActionListener(this);
332	494	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
333	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);
334	504	menu.add("-");
335	505	flipVItem = menu.add(new MenuItem("Flip V"));
336	506	flipVItem.addActionListener(this);
..	..	@@ -366,35 +536,41 @@
366	536	sortbynameItem = menu.add(new MenuItem("Sort by name"));
367	537	sortbynameItem.addActionListener(this);
368	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.
369	546	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
370	547	extractGeometriesItem.addActionListener(this);
371	548	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
372	549	cloneGeometriesItem.addActionListener(this);
373		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
374		- shareGeometriesItem.addActionListener(this);
375		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
376		- mergeGeometriesItem.addActionListener(this);
	550	+ }
377	551
378	552	oe.menuBar.add(menu = new Menu("Insert"));
379	553	buildCreateMenu(menu);
380	554
381		-
382		- oe.menuBar.add(menu = new Menu("Include"));
383		- importGFDItem = menu.add(new MenuItem("GraphreeD Object..."));
384		- importGFDItem.addActionListener(this);
385		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
386		- importVRMLX3DItem.addActionListener(this);
387		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
388		- importOBJItem.addActionListener(this);
389		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
390		- import3DSItem.addActionListener(this);
391		-
392	555	oe.menuBar.add(menu = new Menu("Tools"));
393	556	buildToolsMenu(menu);
394	557	}
395	558
	559	+
396	560	void SetupUI2(ObjEditor oe)
397	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	+
398	574	//new Exception().printStackTrace();
399	575
400	576	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -423,150 +599,231 @@
423	599	oe.radioPanel.add(dummyButton);
424	600	oe.buttonGroup.add(dummyButton);
425	601	*/
426		- aConstraints.gridy += 1;
427		- oe.aConstraints.gridwidth = 1;
428		- oe.aConstraints.gridx = 0;
	602	+ cGridBag copyOptionsPanel = new cGridBag();
	603	+
	604	+ copyOptionsPanel.preferredHeight = 1;
429	605
430		- 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");
431	660	liveCB.addItemListener(this);
432	661
433		- oe.aConstraints.gridx += 1;
434		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
435		- supportCB.addItemListener(this);
436		-
437		- // oe.aConstraints.gridx += 1;
438		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
439		- // localCB.addItemListener(this);
440		-
441		- oe.aConstraints.gridx += 1;
442		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
443		- crowdCB.addItemListener(this);
444		-
445		- oe.aConstraints.gridx += 1;
446		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
447		- smoothCB.addItemListener(this);
448		-
449		- oe.aConstraints.gridx += 1;
450		- 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");
451	668	fastCB.addItemListener(this);
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
454		- slowCB.addItemListener(this);
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
457		- 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);
458	675
459		-// oe.aConstraints.gridx += 1;
460		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
461		-// speakerMocapCB.addItemListener(this);
462		-
463		- if (false)
464		- {
465		- // handled in scripts
466		- oe.aConstraints.gridx += 1;
467		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
468		- speakerCameraCB.addItemListener(this);
469		-
470		- oe.aConstraints.gridx += 1;
471		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
472		- speakerFocusCB.addItemListener(this);
473		-
474		- oe.aConstraints.gridx += 1;
475		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
476		- smoothfocusCB.addItemListener(this);
477		- }
478		-
479		-//oe.aConstraints.gridx += 1;
480		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
481		-// debugCB.addItemListener(this);
482		-
483		- oe.aConstraints.gridx += 1;
484		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
485		- oeilCB.addItemListener(this);
486		-
487		- oe.aConstraints.gridx += 1;
488		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
489		- lookAtCB.addItemListener(this);
490		-
491		- oe.aConstraints.gridx += 1;
492		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
493		- trackCB.addItemListener(this);
494		-
495		- oe.aConstraints.gridx += 1;
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
497		- screenfitButton.addActionListener(this);
498		- oe.aConstraints.gridx += 1;
499	676	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
500	677	// screenfitpointButton.addActionListener(this);
501		-// oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
503		- snapobjectButton.addActionListener(this);
504		- oe.aConstraints.gridx += 1;
505	678
506		- //aConstraints.gridx = 0;
507		- //aConstraints.gridy += 1;
508		- oe.aConstraints.weighty = 0;
509		- oe.aConstraints.gridwidth = 1;
510		-
511		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
512		- flashSelectionButton.addActionListener(this);
513		- oe.aConstraints.gridx += 1;
514		- oe.aConstraints.weighty = 0;
515		- 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));
516	687
517		- //
518		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
519		- twoButton.addActionListener(this);
520		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	688	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521	689	fourButton.addActionListener(this);
522		- 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");
523	699	sixButton.addActionListener(this);
524		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
525		- threeButton.addActionListener(this);
526		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
527		- 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);
528	706	//
529	707
530		- 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");
531	710	rootButton.addActionListener(this);
532		- oe.aConstraints.gridx += 1;
533		- 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");
534	714	closeButton.addActionListener(this);
535	715	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
536	716	//clearButton.addActionListener(this);
537		- oe.aConstraints.gridx += 1;
538		-
539		- oe.aConstraints.gridx = 1; //
540		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
541		- editButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- oe.aConstraints.weighty = 0;
544		- oe.aConstraints.gridwidth = 1;
545	717
546		- 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");
547	803	uneditButton.addActionListener(this);
548	804
549		- oe.aConstraints.gridx += 1;
550		- oe.aConstraints.weighty = 0;
551		- oe.aConstraints.gridwidth = 1;
552		-
553		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
554		- clearPanelButton.addActionListener(this);
555		-
556		- oe.aConstraints.gridx += 1;
557		- oe.aConstraints.weighty = 0;
558		- oe.aConstraints.gridwidth = 1;
559		-
560		- 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");
561	807	allParamsButton.addActionListener(this);
562	808
563		- oe.aConstraints.gridx += 1;
564		- oe.aConstraints.weighty = 0;
565		- oe.aConstraints.gridwidth = 1;
566		-
567		- 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");
568	815	unselectButton.addActionListener(this);
569	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	+
570	827	// oe.aConstraints.gridx += 1;
571	828	// oe.aConstraints.weighty = 0;
572	829	// oe.aConstraints.gridwidth = 1;
..	..	@@ -578,40 +835,25 @@
578	835	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
579	836	// gcButton.addActionListener(this);
580	837
581		- oe.aConstraints.gridx = 0;
582		- oe.aConstraints.gridy += 1;
583		-
584		- //ctrlPanel.add(objList = new List(5, true));
585		- oe.aConstraints.gridwidth = 100;
586		- // oe.aConstraints.gridheight = 100;
587		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
588		- oe.aConstraints.gridheight = 1;
589		- oe.aConstraints.weighty = 0.5;
590		- oe.aConstraints.gridx = 0;
591		- JScrollPane jSP;
	838	+ cGridBag jSPPanel = new cGridBag();
	839	+
	840	+ JScrollPane jSP;
592	841	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
593		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	842	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
594	843	ResetModel();
595		- oe.aConstraints.weighty = 0.5;
596		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
597		- oe.aConstraints.gridy += 1;
598		- oe.aConstraints.gridwidth = 1;
599		-
600		- oe.aConstraints.weighty = 0;
601		- oe.aConstraints.gridwidth = 2;
602		-
603		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
604		- colorCB.addItemListener(this);
605		- oe.aConstraints.gridx += 2;
606		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
607		- materialCB.addItemListener(this);
608		- oe.aConstraints.gridx += 2;
609		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
610		- textureCB.addItemListener(this);
611		-
612		- oe.aConstraints.gridx = 0;
613		- oe.aConstraints.gridy += 1;
614	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	+
615	857	//jList.addListSelectionListener(this);
616	858	oe.jTree.addTreeSelectionListener(this);
617	859	//jTree.setRootVisible(false);
..	..	@@ -630,23 +872,160 @@
630	872	dgr.addDragGestureListener(this);
631	873	}catch(Exception e) {}
632	874	*/
633		- radio.layout = sevenButton;
	875	+ radio.layout = sixButton; // sevenButton;
634	876	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
635	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	+ }
636	1004
637	1005	void EditObject(Object3D obj)
638	1006	{
639		- cRadio dummyButton = new cRadio(obj.name);
640		- dummyButton.SetObject(obj);
641		- dummyButton.layout = sevenButton;
642		- dummyButton.SetCamera(cameraView.renderCamera, false);
643		- dummyButton.addActionListener(this);
644		- radioPanel.add(dummyButton);
645		- buttonGroup.add(dummyButton);
646		- 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();
647	1023	}
	1024	+
648	1025	void SetupViews(ObjEditor oe)
649	1026	{
	1027	+ theFrame = this;
	1028	+
650	1029	oe.SetupViews();
651	1030
652	1031	System.out.println("SetupViews");
..	..	@@ -655,22 +1034,28 @@
655	1034	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
656	1035	}
657	1036
658		- JCheckBox liveCB;
659		- JCheckBox supportCB;
660		- JCheckBox localCB;
661		- JCheckBox crowdCB;
662		- JCheckBox smoothCB;
663		- JCheckBox fastCB;
664		- JCheckBox slowCB;
665		- JCheckBox boxCB;
666		- JCheckBox trackCB;
667		- 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;
668	1050	// JCheckBox speakerMocapCB;
669		- JCheckBox speakerCameraCB;
670		- JCheckBox speakerFocusCB;
671		- JCheckBox debugCB;
672		- JCheckBox oeilCB;
673		- JCheckBox lookAtCB;
	1051	+ cCheckBox speakerCameraCB;
	1052	+ cCheckBox speakerFocusCB;
	1053	+ cCheckBox debugCB;
	1054	+
	1055	+ cCheckBox oeilCB;
	1056	+ cCheckBox shadowCB;
	1057	+ cCheckBox autokeepCB;
	1058	+ cCheckBox lookAtCB;
674	1059
675	1060	// static int COLOR = 1;
676	1061	// static int MATERIAL = 2;
..	..	@@ -678,9 +1063,9 @@
678	1063
679	1064	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
680	1065
681		- JCheckBox colorCB;
682		- JCheckBox materialCB;
683		- JCheckBox textureCB;
	1066	+ cCheckBox colorCB;
	1067	+ cCheckBox materialCB;
	1068	+ cCheckBox textureCB;
684	1069
685	1070	public void itemStateChanged(ItemEvent e)
686	1071	{
..	..	@@ -705,10 +1090,10 @@
705	1090	dropAttributes \|= Object3D.TEXTURE;
706	1091	else
707	1092	dropAttributes &= ~Object3D.TEXTURE;
708		- }
709		- else if(e.getSource() == liveCB)
	1093	+ } else if(e.getSource() == liveCB)
710	1094	{
711	1095	cameraView.ToggleLive();
	1096	+ refreshContents(false);
712	1097	}
713	1098	else if(e.getSource() == supportCB)
714	1099	{
..	..	@@ -744,6 +1129,10 @@
744	1129	cameraView.repaint();
745	1130	// refreshContents();
746	1131	}
	1132	+ else if(e.getSource() == zoomBoxCB)
	1133	+ {
	1134	+ cameraView.ToggleZoomBoxMode();
	1135	+ }
747	1136	else if(e.getSource() == smoothfocusCB)
748	1137	{
749	1138	cameraView.ToggleSmoothFocus();
..	..	@@ -769,6 +1158,18 @@
769	1158	{
770	1159	cameraView.ToggleOeil();
771	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	+ }
772	1173	else if(e.getSource() == lookAtCB)
773	1174	{
774	1175	cameraView.ToggleLookAt();
..	..	@@ -785,7 +1186,8 @@
785	1186
786	1187	/**/
787	1188	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
788		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1189	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1190	+ TreePath path = objEditor.jTree.getSelectionPath();
789	1191	if ((path == null) \|\| (path.getPathCount() <= 1)) {
790	1192	// We can't move the root node or an empty selection
791	1193	return;
..	..	@@ -848,8 +1250,6 @@
848	1250	}
849	1251	}
850	1252
851		- String string = (String) object;
852		-
853	1253	System.out.println("Transfer = " + object + "; drop : " + target);
854	1254	// if( object instanceof java.io.File[])
855	1255	// {
..	..	@@ -857,7 +1257,11 @@
857	1257	// objEditor.DropFile((java.io.File[]) object, true);
858	1258	// return;
859	1259	// }
860		- 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) == ':')
861	1265	{
862	1266	// file(s)
863	1267	String[] names = string.split("\n");
..	..	@@ -884,7 +1288,7 @@
884	1288
885	1289	flashIt = false;
886	1290	CameraPane pane = (CameraPane) target;
887		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1291	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
888	1292	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
889	1293
890	1294	if (group.selection.size() == 1)
..	..	@@ -900,23 +1304,33 @@
900	1304
901	1305	assert target == objEditor.jTree;
902	1306	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1307	+ Object3D destinationLeaf;
903	1308	try {
904		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1309	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
905	1310	} catch (Exception e) {
906	1311	System.out.println("destinationPath : " + destinationPath);
907	1312	return;
908	1313	}
909	1314
910		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1315	+ for (int i=group.selection.size(); --i>=0;)
911	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	+// {
912	1326	loadClipboard(true);
913	1327	objEditor.jTree.setSelectionPath(destinationPath);
914		- pasteInto(false);
915		- } else {
916		- loadClipboard(false);
917		- objEditor.jTree.setSelectionPath(destinationPath);
918		- pasteInto(false); // true); // ???
919		- }
	1328	+ pasteInto(false, false);
	1329	+// } else {
	1330	+// loadClipboard(false);
	1331	+// objEditor.jTree.setSelectionPath(destinationPath);
	1332	+// pasteInto(false, false); // true); // ???
	1333	+// }
920	1334	}
921	1335	public void dropActionChanged(DropTargetDragEvent dtde)
922	1336	// Called if the user has modified the current drop gesture
..	..	@@ -1021,83 +1435,107 @@
1021	1435	{
1022	1436	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1023	1437	//heightFieldItem.addActionListener(this);
1024		- gridItem = menu.add(new MenuItem("Grid"));
1025		- gridItem.addActionListener(this);
1026		- rectoidItem = menu.add(new MenuItem("Box"));
1027		- rectoidItem.addActionListener(this);
1028		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1029		- ellipsoidItem.addActionListener(this);
1030		- coneItem = menu.add(new MenuItem("Cone"));
1031		- coneItem.addActionListener(this);
1032		- torusItem = menu.add(new MenuItem("Torus"));
1033		- torusItem.addActionListener(this);
1034		- superItem = menu.add(new MenuItem("Superellipsoid"));
1035		- superItem.addActionListener(this);
1036		- particleItem = menu.add(new MenuItem("Particle system"));
1037		- 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	+ {
1038	1464	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1039	1465	ragdollItem.addActionListener(this);
1040	1466	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1041	1467	ragdoll2Item.addActionListener(this);
	1468	+ }
1042	1469	menu.add("-");
1043		- meshItem = menu.add(new MenuItem("Mesh"));
	1470	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1044	1471	meshItem.addActionListener(this);
1045	1472	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1046	1473	// meshGroupItem.addActionListener(this);
	1474	+ if (Globals.ADVANCED)
	1475	+ {
1047	1476	springItem = menu.add(new MenuItem("Spring"));
1048	1477	springItem.addActionListener(this);
1049	1478	flagItem = menu.add(new MenuItem("Flag"));
1050	1479	flagItem.addActionListener(this);
1051		- bezierItem = menu.add(new MenuItem("Patch"));
1052		- bezierItem.addActionListener(this);
1053		- checkerItem = menu.add(new MenuItem("Checker"));
1054		- checkerItem.addActionListener(this);
1055	1480	blobItem = menu.add(new MenuItem("Blob"));
1056	1481	blobItem.addActionListener(this);
1057	1482	latheItem = menu.add(new MenuItem("Lathe"));
1058	1483	latheItem.addActionListener(this);
1059		- lightItem = menu.add(new MenuItem("Light"));
1060		- 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);
1061	1491	menu.add("-");
1062	1492	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1063	1493	//superLoopItem.addActionListener(this);
1064		- loopItem = menu.add(new MenuItem("Loop"));
1065		- loopItem.addActionListener(this);
	1494	+// loopItem = menu.add(new MenuItem("Loop"));
	1495	+// loopItem.addActionListener(this);
1066	1496	doubleItem = menu.add(new MenuItem("Fork"));
1067	1497	doubleItem.addActionListener(this);
	1498	+ if (Globals.ADVANCED)
	1499	+ {
1068	1500	tripleItem = menu.add(new MenuItem("Trident"));
1069	1501	tripleItem.addActionListener(this);
	1502	+ }
1070	1503	}
1071	1504
1072	1505	void buildToolsMenu(Menu menu)
1073	1506	{
1074	1507	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1075	1508	animationItem.addItemListener(this);
1076		- animationItem.setState(CameraPane.ANIMATION);
	1509	+ animationItem.setState(Globals.ANIMATION);
	1510	+
	1511	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1512	+ archiveItem.addActionListener(this);
1077	1513
1078	1514	menu.add("-");
1079	1515	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1080	1516	parseverticesItem.addActionListener(this);
1081	1517	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1082	1518	textureFieldItem.addActionListener(this);
1083		- alignItem = menu.add(new MenuItem("Align"));
	1519	+ alignItem = menu.add(new MenuItem("Align Objects"));
1084	1520	alignItem.addActionListener(this);
1085		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1086		- mirrorItem.addActionListener(this);
1087	1521	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1088	1522	reduceMorphItem.addActionListener(this);
1089	1523	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1090	1524	reduce34MorphItem.addActionListener(this);
1091		-
1092		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1093		- computeAOItem.addActionListener(this);
1094	1525	menu.add("-");
1095		-
1096	1526	menu.add(memoryItem = new MenuItem("Memory Usage"));
1097	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("-");
1098	1536	menu.add(analyzeItem = new MenuItem("Analyze"));
1099	1537	analyzeItem.addActionListener(this);
1100		- menu.add(dumpItem = new MenuItem("Dump"));
	1538	+ menu.add(dumpItem = new MenuItem("Print"));
1101	1539	dumpItem.addActionListener(this);
1102	1540	// menu.add(pathItem = new MenuItem("From-to path"));
1103	1541	// pathItem.addActionListener(this);
..	..	@@ -1106,6 +1544,8 @@
1106	1544	resetParentItem.addActionListener(this);
1107	1545	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1108	1546	repairParentItem.addActionListener(this);
	1547	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1548	+ repairShadowItem.addActionListener(this);
1109	1549	menu.add(invariantsItem = new MenuItem("Invariants"));
1110	1550	invariantsItem.addActionListener(this);
1111	1551	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1113,6 +1553,7 @@
1113	1553	menu.add("-");
1114	1554	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1115	1555	editScriptItem.addActionListener(this);
	1556	+ }
1116	1557	}
1117	1558
1118	1559	void ScreenFit()
..	..	@@ -1235,9 +1676,34 @@
1235	1676	shadow.material = new cMaterial(obj.material);
1236	1677	shadow.material.diffuse = 0.0001f;
1237	1678	shadow.material.specular = 0.0001f;
	1679	+ //shadow.projectedVertices[1].x = 300;
1238	1680
1239	1681	makeSomething(shadow);
1240	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	+ }
1241	1707
1242	1708	/**
1243	1709	* applyExample
..	..	@@ -1441,9 +1907,9 @@
1441	1907
1442	1908	void Overwrite(int mask)
1443	1909	{
1444		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1910	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1445	1911	{
1446		- Object3D content = GraphreeD.clipboard.get(0);
	1912	+ Object3D content = Grafreed.clipboard.get(0);
1447	1913
1448	1914	if (content instanceof cGroup && ((cGroup)content).transientlink )
1449	1915	content = ((cGroup)content).get(0);
..	..	@@ -1466,6 +1932,7 @@
1466	1932	//
1467	1933	public void actionPerformed(ActionEvent event) // , Object arg)
1468	1934	{
	1935	+ Object source = event.getSource();
1469	1936	/*
1470	1937	if (event.getSource() == nameField)
1471	1938	{
..	..	@@ -1477,11 +1944,11 @@
1477	1944	}
1478	1945	else
1479	1946	*/
1480		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1947	+ if (source == lookAtItem \|\| source == lookFromItem)
1481	1948	{
1482	1949	ScreenFit();
1483	1950	} else
1484		- if (event.getSource() == switchItem)
	1951	+ if (source == switchViewItem)
1485	1952	{
1486	1953	cVector v1 = new cVector();
1487	1954	cVector v2 = new cVector();
..	..	@@ -1490,11 +1957,11 @@
1490	1957	objEditor.cameraView.renderCamera.setAim(v2, v1);
1491	1958	objEditor.cameraView.repaint();
1492	1959	} else
1493		- if (event.getSource() == rectoidItem)
	1960	+ if (source == rectoidItem \|\| source == boxButton)
1494	1961	{
1495	1962	makeSomething(new Box());
1496	1963	} else
1497		- if (event.getSource() == particleItem)
	1964	+ if (source == particleItem \|\| source == particlesButton)
1498	1965	{
1499	1966	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1500	1967	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1515,9 +1982,9 @@
1515	1982	applyExample(particleGeom, "SMOKE");
1516	1983	makeSomething(particleGeom);
1517	1984	} else
1518		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1985	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1519	1986	{
1520		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1987	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1521	1988
1522	1989	ragdoll.toParent = LA.newMatrix();
1523	1990	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1535,7 +2002,7 @@
1535	2002	} else
1536	2003	/*
1537	2004	*/
1538		- if (event.getSource() == heightFieldItem)
	2005	+ if (source == heightFieldItem)
1539	2006	{
1540	2007	Object3D obj = new Object3D();
1541	2008
..	..	@@ -1573,27 +2040,31 @@
1573	2040
1574	2041	makeSomething(obj);
1575	2042	} else
1576		- if (event.getSource() == gridItem)
	2043	+ if (source == gridItem \|\| source == gridButton)
1577	2044	{
1578	2045	makeSomething(new Grid());
1579	2046	} else
1580		- if (event.getSource() == ellipsoidItem)
	2047	+ if (source == ellipsoidItem \|\| source == sphereButton)
1581	2048	{
1582	2049	makeSomething(new Sphere());
1583	2050	} else
1584		- if (event.getSource() == coneItem)
	2051	+ if (source == coneItem \|\| source == coneButton)
1585	2052	{
1586	2053	makeSomething(new Cone());
1587	2054	} else
1588		- if (event.getSource() == torusItem)
	2055	+ if (source == torusItem \|\| source == torusButton)
1589	2056	{
1590	2057	makeSomething(new Torus());
1591	2058	} else
1592		- if (event.getSource() == superItem)
	2059	+ if (source == superItem \|\| source == superButton)
1593	2060	{
1594	2061	makeSomething(new Superellipsoid());
1595	2062	} else
1596		- if (event.getSource() == blobItem)
	2063	+ if (source == kleinItem \|\| source == kleinButton)
	2064	+ {
	2065	+ makeSomething(new Klein());
	2066	+ } else
	2067	+ if (source == blobItem)
1597	2068	{
1598	2069	Blob blob = new Blob();
1599	2070	BlobComponent comp = new BlobComponent();
..	..	@@ -1601,15 +2072,15 @@
1601	2072	//blob.retile();
1602	2073	makeSomething(blob);
1603	2074	} else
1604		- if (event.getSource() == latheItem)
	2075	+ if (source == latheItem)
1605	2076	{
1606	2077	makeSomething(new Lathe());
1607	2078	} else
1608		- if (event.getSource() == bezierItem)
	2079	+ if (source == bezierItem)
1609	2080	{
1610	2081	makeSomething(new BezierSurface());
1611	2082	} else
1612		- if (event.getSource() == checkerItem)
	2083	+ if (source == overlayItem \|\| source == overlayButton)
1613	2084	{
1614	2085	/*
1615	2086	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1624,7 +2095,7 @@
1624	2095	*/
1625	2096	makeSomething(new Checker());
1626	2097	} else
1627		- if (event.getSource() == meshItem)
	2098	+ if (source == meshItem)
1628	2099	{
1629	2100	Object3D itemtomake = new Object3D();
1630	2101	Object3D child;
..	..	@@ -1645,35 +2116,35 @@
1645	2116	makeSomething(child);
1646	2117	}
1647	2118	} else
1648		- if (event.getSource() == springItem)
	2119	+ if (source == springItem)
1649	2120	{
1650	2121	cSpring s = new cSpring();
1651	2122	s.setup();
1652	2123	makeSomething(s);
1653	2124	} else
1654		- if (event.getSource() == flagItem)
	2125	+ if (source == flagItem)
1655	2126	{
1656	2127	cSpring s = new cFlag();
1657	2128	s.setup();
1658	2129	makeSomething(s);
1659	2130	} else
1660		- if (event.getSource() == lightItem)
	2131	+ if (source == lightItem \|\| source == lightButton)
1661	2132	{
1662	2133	makeSomething(new Light());
1663	2134	} else
1664		- if (event.getSource() == csgItem)
	2135	+ if (source == csgItem)
1665	2136	{
1666	2137	group(new CSG());
1667	2138	} else
1668		- if (event.getSource() == templateItem)
	2139	+ if (source == templateItem)
1669	2140	{
1670	2141	group(new cTemplate());
1671	2142	} else
1672		- if (event.getSource() == attributeItem)
	2143	+ if (source == attributeItem)
1673	2144	{
1674	2145	makeSomething(new Attribute());
1675	2146	} else
1676		- if (event.getSource() == pointflowItem)
	2147	+ if (source == pointflowItem)
1677	2148	{
1678	2149	makeSomething(new PointFlow());
1679	2150	} else
..	..	@@ -1685,7 +2156,7 @@
1685	2156	} else
1686	2157	*/
1687	2158
1688		- if (event.getSource() == superLoopItem)
	2159	+ if (source == superLoopItem)
1689	2160	{
1690	2161	Composite g = new cGroup();
1691	2162	for (int i=0; i<15; i++)
..	..	@@ -1707,30 +2178,30 @@
1707	2178
1708	2179	group(g);
1709	2180	} else
1710		- if (event.getSource() == loopItem)
	2181	+ if (source == loopItem \|\| source == loopButton)
1711	2182	{
1712	2183	Composite csg = new GroupLeaf();
1713	2184	csg.count = 5;
1714	2185	group(csg);
1715		- Composite child = new cGroup();
	2186	+ Composite child = new cGroup("Branch");
1716	2187	csg.addChild(child);
1717	2188	child.addChild(csg);
1718	2189	} else
1719		- if (event.getSource() == doubleItem)
	2190	+ if (source == doubleItem)
1720	2191	{
1721		- Composite csg = new GroupLeaf();
	2192	+ Composite csg = new GroupLeaf("Fork");
1722	2193	csg.count = 5;
1723	2194	group(csg);
1724		- Composite child = new cGroup();
	2195	+ Composite child = new cGroup("Branch A");
1725	2196	csg.addChild(child);
1726	2197	child.addChild(csg);
1727		- child = new cGroup();
	2198	+ child = new cGroup("Branch B");
1728	2199	csg.addChild(child);
1729	2200	child.addChild(csg);
1730	2201	} else
1731		- if (event.getSource() == tripleItem)
	2202	+ if (source == tripleItem)
1732	2203	{
1733		- Composite csg = new GroupLeaf();
	2204	+ Composite csg = new GroupLeaf("Trident");
1734	2205	csg.count = 4;
1735	2206	group(csg);
1736	2207	Composite child = new cGroup();
..	..	@@ -1743,73 +2214,98 @@
1743	2214	csg.addChild(child);
1744	2215	child.addChild(csg);
1745	2216	} else
1746		-
1747		- if (event.getSource() == importGFDItem)
	2217	+ if (source == computeAOItem)
1748	2218	{
1749		- ImportGFD();
	2219	+ Globals.drawMode = CameraPane.OCCLUSION;
	2220	+ Globals.theRenderer.repaint();
1750	2221	} else
1751		- if (event.getSource() == importVRMLX3DItem)
1752		- {
1753		- ImportVRMLX3D();
1754		- } else
1755		- if (event.getSource() == import3DSItem)
1756		- {
1757		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1758		- } else
1759		- if (event.getSource() == importOBJItem)
1760		- {
1761		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1762		- } else
1763		- if (event.getSource() == computeAOItem)
1764		- {
1765		- CameraPane.drawMode = CameraPane.OCCLUSION;
1766		- CameraPane.theRenderer.repaint();
1767		- } else
1768		- if (event.getSource() == recompileItem)
	2222	+ if (source == recompileItem)
1769	2223	{
1770	2224	Recompile();
1771	2225	refreshContents();
1772	2226	} else
1773		- if (event.getSource() == editScriptItem)
	2227	+ if (source == editScriptItem)
1774	2228	{
1775	2229	OpenDialog();
1776	2230	refreshContents();
1777	2231	} else
1778		- if (event.getSource() == invariantsItem)
	2232	+ if (source == invariantsItem)
1779	2233	{
1780	2234	System.out.println("Invariants:");
1781		- GraphreeD.theApplet3D.universe.invariants();
	2235	+ Grafreed.grafreeD.universe.invariants();
1782	2236	} else
1783		- if (event.getSource() == memoryItem)
	2237	+ if (source == memoryItem)
1784	2238	{
1785	2239	//System.out.println("Invariants:");
1786	2240	PrintMemory();
1787	2241	} else
1788		- if (event.getSource() == pathItem)
	2242	+ if (source == pathItem)
1789	2243	{
1790	2244	PrintPath();
1791	2245	} else
1792		- if (event.getSource() == analyzeItem)
	2246	+ if (source == analyzeItem)
1793	2247	{
1794	2248	AnalyzeObject();
1795	2249	} else
1796		- if (event.getSource() == dumpItem)
	2250	+ if (source == dumpItem)
1797	2251	{
1798	2252	DumpObject();
1799	2253	} else
1800		- if (event.getSource() == screenfitButton)
	2254	+ if (source == minButton)
1801	2255	{
1802		- //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	+ {
1803	2301	ScreenFit();
1804	2302	} else
1805		- if (event.getSource() == screenfitpointButton)
	2303	+ if (source == screenfitpointButton)
1806	2304	{
1807		- //Reload(lastConverter, lastFilename, true);
1808	2305	ScreenFitPoint();
1809	2306	} else
1810		- if (event.getSource() == snapobjectButton)
	2307	+ if (source == snapobjectButton)
1811	2308	{
1812		- //Reload(lastConverter, lastFilename, true);
1813	2309	SnapObject();
1814	2310	} else
1815	2311	// if (event.getSource() == recompileButton)
..	..	@@ -1818,13 +2314,13 @@
1818	2314	// Recompile();
1819	2315	// refreshContents();
1820	2316	// } else
1821		- if (event.getSource() == gcButton)
	2317	+ if (source == gcButton)
1822	2318	{
1823	2319	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1824	2320	System.gc();
1825	2321	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	2322	} else
1827		- if (event.getSource() == editLeafItem)
	2323	+ if (source == editLeafItem)
1828	2324	{
1829	2325	Object3D obj;
1830	2326	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1838,65 +2334,78 @@
1838	2334	}
1839	2335	refreshContents(true);
1840	2336	} else
1841		- if (event.getSource() == openWindowItem)
	2337	+ if (source == openWindowItem)
1842	2338	{
1843	2339	EditSelection(true);
1844	2340	} else
1845		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2341	+ if (source == cutItem \|\| source == clearButton)
1846	2342	{
1847	2343	loadClipboard(true);
1848	2344	} else
1849		- if (event.getSource() == duplicateItem)
	2345	+ if (source == undoItem)
1850	2346	{
1851		- Object3D keep = GraphreeD.clipboard;
	2347	+ Undo();
	2348	+ } else
	2349	+ if (source == redoItem)
	2350	+ {
	2351	+ Redo();
	2352	+ } else
	2353	+ if (source == duplicateItem)
	2354	+ {
	2355	+ Object3D keep = Grafreed.clipboard;
1852	2356	loadClipboard(false);
1853	2357	paste(false);
1854		- GraphreeD.clipboard = keep;
	2358	+ Grafreed.clipboard = keep;
1855	2359	} else
1856		- if (event.getSource() == cloneItem)
	2360	+ if (source == cloneItem)
1857	2361	{
1858	2362	CloneSelection(false);
1859	2363	} else
1860		- if (event.getSource() == cloneSupportItem)
	2364	+ if (source == cloneSupportItem)
1861	2365	{
1862	2366	CloneSelection(true);
1863	2367	} else
1864		- if (event.getSource() == copyItem)
	2368	+ if (source == copyItem)
1865	2369	{
1866	2370	loadClipboard(false);
1867	2371	} else
1868		- if (event.getSource() == pasteItem)
	2372	+ if (source == pasteItem)
1869	2373	{
1870	2374	paste(false);
1871	2375	} else
1872		- if (event.getSource() == pasteLinkItem)
	2376	+ if (source == pasteIntoItem)
1873	2377	{
1874		- pasteInto(false);
	2378	+ pasteInto(true, false);
1875	2379	} else
1876		- if (event.getSource() == pasteCloneItem)
	2380	+ if (source == pasteLinkItem)
1877	2381	{
1878		- pasteInto(true);
	2382	+ pasteInto(false, false);
1879	2383	} else
1880		- if (event.getSource() == pasteExpandItem)
	2384	+ if (source == pasteCloneItem)
	2385	+ {
	2386	+ pasteInto(true, true);
	2387	+ } else
	2388	+ if (source == pasteExpandItem)
1881	2389	{
1882	2390	paste(true);
1883	2391	} else
1884		- if (event.getSource() == synchronizeItem)
	2392	+ if (source == synchronizeItem)
1885	2393	{
1886	2394	Overwrite(Object3D.TRANSFORM);
1887	2395	} else
1888		- if (event.getSource() == overwriteNameItem)
	2396	+ if (source == overwriteNameItem)
1889	2397	{
1890	2398	Overwrite(Object3D.NAME);
1891	2399	} else
1892		- if (event.getSource() == overwriteUVItem)
	2400	+ if (source == overwriteUVItem)
1893	2401	{
1894	2402	Overwrite(Object3D.UV);
1895	2403	} else
1896		- if (event.getSource() == overwriteMatItem)
	2404	+ if (source == overwriteMatItem)
1897	2405	{
	2406	+ /* july 2015
1898	2407	if ((dropAttributes & Object3D.TEXTURE) == 0)
1899		- Overwrite(Object3D.MATERIAL);
	2408	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1900	2409	else
1901	2410	{
1902	2411	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1908,13 +2417,16 @@
1908	2417	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1909	2418	}
1910	2419	}
	2420	+ */
	2421	+
	2422	+ Overwrite(dropAttributes);
1911	2423	}
1912		- if (event.getSource() == overwriteGeoItem)
	2424	+ if (source == overwriteGeoItem)
1913	2425	{
1914	2426	Overwrite(Object3D.GEOMETRY);
1915		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2427	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1916	2428	// {
1917		-// Object3D content = GraphreeD.clipboard.get(0);
	2429	+// Object3D content = GrafreeD.clipboard.get(0);
1918	2430	//
1919	2431	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1920	2432	// content = ((cGroup)content).get(0);
..	..	@@ -1926,7 +2438,7 @@
1926	2438	// refreshContents();
1927	2439	// }
1928	2440	} else
1929		- if (event.getSource() == generateMeshItem)
	2441	+ if (source == generateMeshItem)
1930	2442	{
1931	2443	//if (group.selection.size() == 1)
1932	2444	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1937,7 +2449,7 @@
1937	2449	ResetModel();
1938	2450	refreshContents();
1939	2451	} else
1940		- if (event.getSource() == extractGeometriesItem)
	2452	+ if (source == extractGeometriesItem)
1941	2453	{
1942	2454	boolean one = false;
1943	2455
..	..	@@ -1964,7 +2476,7 @@
1964	2476	ResetModel();
1965	2477	refreshContents();
1966	2478	} else
1967		- if (event.getSource() == cloneGeometriesItem)
	2479	+ if (source == cloneGeometriesItem)
1968	2480	{
1969	2481	boolean one = false;
1970	2482
..	..	@@ -1990,32 +2502,37 @@
1990	2502	ResetModel();
1991	2503	refreshContents();
1992	2504	} else
1993		- if (event.getSource() == shareGeometriesItem)
	2505	+ if (source == shareGeometriesItem)
1994	2506	{
1995	2507	boolean one = false;
1996	2508
1997	2509	if (group.selection.size() == 1)
1998	2510	one = true;
1999	2511
	2512	+ Object3D merge = null;
	2513	+
2000	2514	Object3D content = new cGroup();
2001	2515
2002	2516	for (int i=0; i<group.selection.size(); i++)
2003	2517	{
2004		- Object3D sel = new Merge(group.selection.get(i));
	2518	+ merge = new Merge(group.selection.get(i));
2005	2519
2006	2520	if (one)
2007		- makeSomething(sel, false);
	2521	+ makeSomething(merge, false);
2008	2522	else
2009		- content.addChild(sel);
	2523	+ content.addChild(merge);
2010	2524	}
2011	2525
2012	2526	if (!one)
2013		- makeSomething(content, false);
2014		-
2015		- ResetModel();
2016		- refreshContents();
	2527	+ makeSomething(content, true);
	2528	+ else
	2529	+ {
	2530	+ ResetModel();
	2531	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2532	+ refreshContents();
	2533	+ }
2017	2534	} else
2018		- if (event.getSource() == mergeGeometriesItem)
	2535	+ if (source == mergeGeometriesItem)
2019	2536	{
2020	2537	boolean one = false;
2021	2538
..	..	@@ -2045,11 +2562,11 @@
2045	2562	ResetModel();
2046	2563	refreshContents();
2047	2564	} else
2048		- if (event.getSource() == linkverticesItem)
	2565	+ if (source == linkverticesItem)
2049	2566	{
2050		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2567	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2051	2568	// {
2052		-// Object3D content = GraphreeD.clipboard.get(0);
	2569	+// Object3D content = GrafreeD.clipboard.get(0);
2053	2570	//
2054	2571	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2055	2572	// content = ((cGroup)content).get(0);
..	..	@@ -2058,39 +2575,48 @@
2058	2575	// group.selection.get(0).setMasterThis(content); // should be identity
2059	2576	// refreshContents();
2060	2577	// }
2061		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2578	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2062	2579	{
2063		- Object3D content = GraphreeD.clipboard.get(0);
	2580	+ Object3D content = Grafreed.clipboard.get(0);
2064	2581
2065	2582	if (content instanceof cGroup && ((cGroup)content).transientlink )
2066	2583	content = ((cGroup)content).get(0);
2067	2584
2068		- 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));
2069	2586	for (int i=0; i<group.selection.size(); i++)
2070	2587	{
2071		- boolean random = CameraPane.RANDOM;
2072		- CameraPane.RANDOM = false; // parse all random nodes
	2588	+ boolean random = CameraPane.SWITCH;
	2589	+ CameraPane.SWITCH = false; // parse all random nodes
2073	2590	group.selection.get(i).linkVerticesThis(content);
2074	2591	// group.selection.get(i).setMasterThis(content); // should be identity
2075		- CameraPane.RANDOM = random;
	2592	+ CameraPane.SWITCH = random;
2076	2593	}
2077		- 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));
2078	2595	refreshContents();
2079	2596	}
2080	2597	} else
2081		- if (event.getSource() == resetsupportItem)
	2598	+ if (source == resetsupportItem)
2082	2599	{
2083	2600	for (int i=0; i<group.selection.size(); i++)
2084	2601	{
2085		- boolean random = CameraPane.RANDOM;
2086		- CameraPane.RANDOM = false; // parse all random nodes
	2602	+ boolean random = CameraPane.SWITCH;
	2603	+ CameraPane.SWITCH = false; // parse all random nodes
2087	2604	group.selection.get(i).linkVerticesThis(null);
2088		- CameraPane.RANDOM = random;
	2605	+ CameraPane.SWITCH = random;
2089	2606	}
2090	2607
2091	2608	refreshContents();
2092	2609	} else
2093		- 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)
2094	2620	{
2095	2621	for (int i=0; i<group.selection.size(); i++)
2096	2622	{
..	..	@@ -2099,11 +2625,11 @@
2099	2625
2100	2626	refreshContents();
2101	2627	} else
2102		- if (event.getSource() == setMasterItem)
	2628	+ if (source == setMasterItem)
2103	2629	{
2104		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2630	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2105	2631	{
2106		- Object3D content = GraphreeD.clipboard.get(0);
	2632	+ Object3D content = Grafreed.clipboard.get(0);
2107	2633
2108	2634	if (content instanceof cGroup && ((cGroup)content).transientlink )
2109	2635	content = ((cGroup)content).get(0);
..	..	@@ -2112,13 +2638,13 @@
2112	2638	refreshContents();
2113	2639	}
2114	2640	} else
2115		- if (event.getSource() == poseMeshItem)
	2641	+ if (source == poseMeshItem)
2116	2642	{
2117	2643	if (group.selection.size() == 1)
2118	2644	{
2119		- if (GraphreeD.clipboard.size() == 1)
	2645	+ if (Grafreed.clipboard.size() == 1)
2120	2646	{
2121		- Object3D content = GraphreeD.clipboard.get(0);
	2647	+ Object3D content = Grafreed.clipboard.get(0);
2122	2648
2123	2649	if (content instanceof cGroup && ((cGroup)content).transientlink )
2124	2650	content = ((cGroup)content).get(0);
..	..	@@ -2131,19 +2657,19 @@
2131	2657	}
2132	2658
2133	2659	} else
2134		- if (event.getSource() == revertMeshItem)
	2660	+ if (source == revertMeshItem)
2135	2661	{
2136	2662	RevertMeshes();
2137	2663	} else
2138		- if (event.getSource() == resetMeshItem)
	2664	+ if (source == resetAllItem)
2139	2665	{
2140	2666	ResetAll();
2141	2667	} else
2142		- if (event.getSource() == stepAllItem)
	2668	+ if (source == stepAllItem)
2143	2669	{
2144	2670	StepAll();
2145	2671	} else
2146		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2672	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2147	2673	{
2148	2674	//int indices[] = jList.getSelectedIndices();
2149	2675	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2151,42 +2677,46 @@
2151	2677
2152	2678	ClearSelection(false);
2153	2679	} else
2154		- if (event.getSource() == clearAllItem)
	2680	+ if (source == clearAllItem)
2155	2681	{
2156	2682	ClearSelection(true);
2157	2683	} else
2158		- if (event.getSource() == grabItem)
	2684	+ if (source == grabItem \|\| source == groupButton)
2159	2685	{
2160		- group(new cGroup(), true);
	2686	+ group(new cGroup(), false); // true);
2161	2687	} else
2162		- if (event.getSource() == frontItem)
	2688	+ if (source == hideItem)
	2689	+ {
	2690	+ group(new HiddenObject());
	2691	+ } else
	2692	+ if (source == frontItem)
2163	2693	{
2164	2694	front();
2165	2695	} else
2166		- if (event.getSource() == backItem)
	2696	+ if (source == backItem)
2167	2697	{
2168	2698	back();
2169	2699	} else
2170		- if (event.getSource() == cameraItem)
	2700	+ if (source == cameraItem)
2171	2701	{
2172	2702	makeSomething(new Camera());
2173	2703	} else
2174		- if (event.getSource() == compositeItem)
	2704	+ if (source == compositeItem \|\| source == compositeButton)
2175	2705	{
2176	2706	group(new Composite());
2177	2707	} else
2178		- if (event.getSource() == randomItem)
	2708	+ if (source == switchItem \|\| source == switchButton)
2179	2709	{
2180	2710	RandomNode random = new RandomNode();
2181	2711	group(random);
2182	2712	if (random.size() > 0)
2183		- random.name = random.get(0).name + "Rnd";
	2713	+ random.name = random.get(0).name + "Switch";
2184	2714	} else
2185		- if (event.getSource() == physicsItem)
	2715	+ if (source == physicsItem)
2186	2716	{
2187	2717	group(new PhysicsNode());
2188	2718	} else
2189		- if (event.getSource() == frameselectorItem)
	2719	+ if (source == frameselectorItem)
2190	2720	{
2191	2721	for (int i=0; i<group.selection.size(); i++)
2192	2722	{
..	..	@@ -2198,7 +2728,7 @@
2198	2728	ResetModel();
2199	2729	refreshContents();
2200	2730	} else
2201		- if (event.getSource() == switchGeoItem)
	2731	+ if (source == switchGeoItem)
2202	2732	{
2203	2733	for (int i=0; i<group.selection.size(); i++)
2204	2734	{
..	..	@@ -2210,7 +2740,7 @@
2210	2740	ResetModel();
2211	2741	refreshContents();
2212	2742	} else
2213		- if (event.getSource() == switchTransfoItem)
	2743	+ if (source == switchTransfoItem)
2214	2744	{
2215	2745	for (int i=0; i<group.selection.size(); i++)
2216	2746	{
..	..	@@ -2222,7 +2752,7 @@
2222	2752	ResetModel();
2223	2753	refreshContents();
2224	2754	} else
2225		- if (event.getSource() == morphItem)
	2755	+ if (source == morphItem)
2226	2756	{
2227	2757	for (int i=0; i<group.selection.size(); i++)
2228	2758	{
..	..	@@ -2234,7 +2764,7 @@
2234	2764	ResetModel();
2235	2765	refreshContents();
2236	2766	} else
2237		- if (event.getSource() == scriptNodeItem)
	2767	+ if (source == scriptNodeItem)
2238	2768	{
2239	2769	boolean atleastone = false;
2240	2770
..	..	@@ -2273,195 +2803,252 @@
2273	2803	}
2274	2804	}
2275	2805	} else
2276		- if (event.getSource() == linkerItem)
	2806	+ if (source == linkerItem)
2277	2807	{
2278	2808	group(new cLinker());
2279	2809	} else
2280		- if (event.getSource() == textureItem)
	2810	+ if (source == textureItem \|\| source == textureButton)
2281	2811	{
2282	2812	group(new TextureNode());
2283	2813	} else
2284		- if (event.getSource() == shadowXItem)
	2814	+ if (source == billboardItem)
	2815	+ {
	2816	+ group(new BillboardNode());
	2817	+ } else
	2818	+ if (source == shadowXItem)
2285	2819	{
2286	2820	CastShadow(0);
2287	2821	} else
2288		- if (event.getSource() == shadowYItem)
	2822	+ if (source == shadowYItem)
2289	2823	{
2290	2824	CastShadow(1);
2291	2825	} else
2292		- if (event.getSource() == shadowZItem)
	2826	+ if (source == shadowZItem)
2293	2827	{
2294	2828	CastShadow(2);
2295	2829	} else
2296		- if (event.getSource() == ungroupItem)
	2830	+ if (source == ungroupItem \|\| source == ungroupButton)
2297	2831	{
2298		- 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	+ }
2299	2854	} else
2300		- if (event.getSource() == genUVItem)
	2855	+ if (source == genUVItem)
2301	2856	{
2302	2857	GenUV();
2303	2858	} else
2304		- if (event.getSource() == genNormalsCADItem)
	2859	+ if (source == genNormalsCADItem)
2305	2860	{
2306	2861	GenNormals(true);
2307	2862	} else
2308		- if (event.getSource() == genNormalsORGANItem)
	2863	+ if (source == genNormalsMESHItem)
	2864	+ {
	2865	+ GenNormalsMESH();
	2866	+ } else
	2867	+ if (source == genNormalsORGANItem)
2309	2868	{
2310	2869	GenNormals(false);
2311	2870	} else
2312		- if (event.getSource() == stripifyItem)
	2871	+ if (source == genNormalsMINEItem)
	2872	+ {
	2873	+ GenNormalsMINE();
	2874	+ } else
	2875	+ if (source == stripifyItem)
2313	2876	{
2314	2877	Stripify();
2315	2878	} else
2316		- if (event.getSource() == unstripifyItem)
	2879	+ if (source == unstripifyItem)
2317	2880	{
2318	2881	Unstripify();
2319	2882	} else
2320		- if (event.getSource() == trimItem)
	2883	+ if (source == trimItem)
2321	2884	{
2322	2885	Trim();
2323	2886	} else
2324		- if (event.getSource() == untrimItem)
	2887	+ if (source == untrimItem)
2325	2888	{
2326	2889	Untrim();
2327	2890	} else
2328		- if (event.getSource() == clearColorsItem)
	2891	+ if (source == clearColorsItem)
2329	2892	{
2330	2893	ClearColors();
2331	2894	} else
2332		- if (event.getSource() == clearMaterialsItem)
	2895	+ if (source == clearMaterialsItem)
2333	2896	{
2334	2897	ClearMaterials();
2335	2898	} else
2336		- if (event.getSource() == liveleavesItem)
	2899	+ if (source == liveleavesItem)
2337	2900	{
2338	2901	LiveLeaves(true);
2339	2902	} else
2340		- if (event.getSource() == unliveleavesItem)
	2903	+ if (source == unliveleavesItem)
2341	2904	{
2342	2905	LiveLeaves(false);
2343	2906	} else
2344		- if (event.getSource() == supportleavesItem)
	2907	+ if (source == supportleavesItem)
2345	2908	{
2346	2909	SupportLeaves(true);
2347	2910	} else
2348		- if (event.getSource() == unsupportleavesItem)
	2911	+ if (source == unsupportleavesItem)
2349	2912	{
2350	2913	SupportLeaves(false);
2351	2914	} else
2352		- if (event.getSource() == hideleavesItem)
	2915	+ if (source == hideleavesItem)
2353	2916	{
2354	2917	HideLeaves(true);
2355	2918	} else
2356		- if (event.getSource() == showleavesItem)
	2919	+ if (source == showleavesItem)
2357	2920	{
2358	2921	HideLeaves(false);
2359	2922	} else
2360		- if (event.getSource() == markleavesItem)
	2923	+ if (source == markleavesItem)
2361	2924	{
2362	2925	MarkLeaves(true);
2363	2926	} else
2364		- if (event.getSource() == unmarkleavesItem)
	2927	+ if (source == unmarkleavesItem)
2365	2928	{
2366	2929	MarkLeaves(false);
2367	2930	} else
2368		- 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)
2369	2948	{
2370	2949	FlipV(true);
2371	2950	} else
2372		- if (event.getSource() == unflipVItem)
	2951	+ if (source == unflipVItem)
2373	2952	{
2374	2953	FlipV(false);
2375	2954	} else
2376		- if (event.getSource() == lowTexturesItem)
	2955	+ if (source == lowTexturesItem)
2377	2956	{
2378	2957	SetTexRes(0);
2379	2958	} else
2380		- if (event.getSource() == normalTexturesItem)
	2959	+ if (source == normalTexturesItem)
2381	2960	{
2382	2961	SetTexRes(1);
2383	2962	} else
2384		- if (event.getSource() == highTexturesItem)
	2963	+ if (source == highTexturesItem)
2385	2964	{
2386	2965	SetTexRes(2);
2387	2966	} else
2388		- if (event.getSource() == veryhighTexturesItem)
	2967	+ if (source == veryhighTexturesItem)
2389	2968	{
2390	2969	SetTexRes(3);
2391	2970	} else
2392		- if (event.getSource() == maxTexturesItem)
	2971	+ if (source == maxTexturesItem)
2393	2972	{
2394	2973	SetTexRes(4);
2395	2974	} else
2396		- if (event.getSource() == panoTexturesItem)
	2975	+ if (source == panoTexturesItem)
2397	2976	{
2398	2977	SetTexRes(5);
2399	2978	} else
2400		- if (event.getSource() == reverseNormalsItem)
	2979	+ if (source == reverseNormalsItem)
2401	2980	{
2402	2981	ReverseNormals();
2403	2982	} else
2404		- if (event.getSource() == parseverticesItem)
	2983	+ if (source == parseverticesItem)
2405	2984	{
2406	2985	ParseVertices();
2407	2986	} else
2408		- if (event.getSource() == textureFieldItem)
	2987	+ if (source == textureFieldItem)
2409	2988	{
2410	2989	TextureVertices();
2411	2990	} else
2412		- if (event.getSource() == alignItem)
	2991	+ if (source == alignItem)
2413	2992	{
2414	2993	Align();
2415	2994	} else
2416		- if (event.getSource() == mirrorItem)
	2995	+ if (source == mirrorItem)
2417	2996	{
2418	2997	MirrorPoses();
2419	2998	} else
2420		- if (event.getSource() == reduceMorphItem)
	2999	+ if (source == reduceMorphItem)
2421	3000	{
2422	3001	MeshReduction(false);
2423	3002	} else
2424		- if (event.getSource() == reduce34MorphItem)
	3003	+ if (source == reduce34MorphItem)
2425	3004	{
2426	3005	MeshReduction(true);
2427	3006	} else
2428		- if (event.getSource() == reverseTrianglesItem)
	3007	+ if (source == reverseTrianglesItem)
2429	3008	{
2430	3009	ReverseTriangles();
2431	3010	} else
2432		- if (event.getSource() == reduceMeshItem)
	3011	+ if (source == reduceMeshItem)
2433	3012	{
2434	3013	ReduceMesh(false);
2435	3014	} else
2436		- if (event.getSource() == reduce34MeshItem)
	3015	+ if (source == reduce34MeshItem)
2437	3016	{
2438	3017	ReduceMesh(true);
2439	3018	} else
2440		- if (event.getSource() == increaseMeshItem)
	3019	+ if (source == increaseMeshItem)
2441	3020	{
2442	3021	IncreaseMesh();
2443	3022	} else
2444		- if (event.getSource() == clipMeshItem)
	3023	+ if (source == clipMeshItem)
2445	3024	{
2446	3025	ClipMesh();
2447	3026	} else
2448		- if (event.getSource() == smoothMeshItem)
	3027	+ if (source == smoothMeshItem)
2449	3028	{
2450	3029	SmoothMesh();
2451	3030	} else
2452		- if (event.getSource() == transformgeometryItem)
	3031	+ if (source == transformGeometryItem)
2453	3032	{
2454	3033	TransformGeometry();
2455	3034	} else
2456		- if (event.getSource() == resetTransformItem)
	3035	+ if (source == transformChildrenItem)
	3036	+ {
	3037	+ TransformChildren();
	3038	+ } else
	3039	+ if (source == resetTransformItem)
2457	3040	{
2458	3041	ResetTransform();
2459	3042	} else
2460		- if (event.getSource() == resetCentroidItem)
	3043	+ if (source == resetCentroidItem)
2461	3044	{
2462		- ResetCentroid();
	3045	+ ResetCentroid(true);
2463	3046	} else
2464		- if (event.getSource() == resetParentItem)
	3047	+ if (source == resetCentroidXZItem)
	3048	+ {
	3049	+ ResetCentroid(false);
	3050	+ } else
	3051	+ if (source == resetParentItem)
2465	3052	{
2466	3053	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2467	3054	{
..	..	@@ -2471,7 +3058,7 @@
2471	3058
2472	3059	refreshContents();
2473	3060	} else
2474		- if (event.getSource() == repairParentItem)
	3061	+ if (source == repairParentItem)
2475	3062	{
2476	3063	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	3064	{
..	..	@@ -2485,7 +3072,21 @@
2485	3072
2486	3073	refreshContents();
2487	3074	} else
2488		- 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)
2489	3090	{
2490	3091	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2491	3092	{
..	..	@@ -2497,7 +3098,7 @@
2497	3098	ResetModel();
2498	3099	refreshContents();
2499	3100	} else
2500		- if (event.getSource() == sortbynameItem)
	3101	+ if (source == sortbynameItem)
2501	3102	{
2502	3103	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2503	3104	{
..	..	@@ -2509,7 +3110,7 @@
2509	3110	ResetModel();
2510	3111	refreshContents();
2511	3112	} else
2512		- if (event.getSource() == attachPigmentItem)
	3113	+ if (source == attachPigmentItem)
2513	3114	{
2514	3115	String texture = GetFile("Attach pigment");
2515	3116	Object3D obj;
..	..	@@ -2521,7 +3122,7 @@
2521	3122
2522	3123	refreshContents();
2523	3124	} else
2524		- if (event.getSource() == detachPigmentItem)
	3125	+ if (source == detachPigmentItem)
2525	3126	{
2526	3127	Object3D obj;
2527	3128	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2532,7 +3133,7 @@
2532	3133
2533	3134	refreshContents();
2534	3135	} else
2535		- if (event.getSource() == attachBumpItem)
	3136	+ if (source == attachBumpItem)
2536	3137	{
2537	3138	String texture = GetFile("Attach bump");
2538	3139	Object3D obj;
..	..	@@ -2544,7 +3145,7 @@
2544	3145
2545	3146	refreshContents();
2546	3147	} else
2547		- if (event.getSource() == detachBumpItem)
	3148	+ if (source == detachBumpItem)
2548	3149	{
2549	3150	Object3D obj;
2550	3151	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2555,7 +3156,7 @@
2555	3156
2556	3157	refreshContents();
2557	3158	} else
2558		- if (event.getSource() == pigmentBumpItem)
	3159	+ if (source == pigmentBumpItem)
2559	3160	{
2560	3161	Object3D obj;
2561	3162	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2566,158 +3167,237 @@
2566	3167
2567	3168	refreshContents();
2568	3169	} else
2569		- if (event.getSource() == flashSelectionButton)
	3170	+ if (source == flashSelectionButton)
2570	3171	{
2571	3172	CameraPane.flash = true;
2572	3173	refreshContents();
2573	3174	} else
2574		- if (event.getSource() == oneButton)
	3175	+ if (source == oneButton)
2575	3176	{
2576	3177	} else
2577		- if (event.getSource() == twoButton)
	3178	+ if (source == twoButton)
2578	3179	{
2579	3180	radio.layout = twoButton;
	3181	+
	3182	+ if (CameraPane.FULLSCREEN)
	3183	+ fullscreenLayout = radio.layout;
	3184	+
2580	3185	// bug
2581	3186	//gridPanel.setDividerLocation(1.0);
2582	3187	//bigPanel.setDividerLocation(0.0);
2583		- bigThree.remove(jtp);
2584		- bigThree.remove(cameraPanel);
2585		- bigThree.remove(XYZPanel);
2586		- aWindowConstraints.gridx = 0;
2587		- aWindowConstraints.gridy = 0;
2588		- aWindowConstraints.gridwidth = 1;
2589		- // aConstraints.gridheight = 3;
2590		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2591		- aWindowConstraints.weightx = 0;
2592		- aWindowConstraints.weighty = 1;
2593		- //bigThree.add(jtp, aWindowConstraints);
2594		- aWindowConstraints.weightx = 1;
2595		- aWindowConstraints.gridwidth = 3;
2596		- // aConstraints.gridheight = 3;
2597		- aWindowConstraints.gridx = 1;
2598		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2599		- bigThree.add(cameraPanel, aWindowConstraints);
2600		- aWindowConstraints.weightx = 0;
2601		- aWindowConstraints.gridx = 4;
2602		- aWindowConstraints.gridwidth = 1;
2603		- // aConstraints.gridheight = 3;
2604		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2605		- //bigThree.add(XYZPanel, aWindowConstraints);
2606		- 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	+
2607	3235	} else
2608		- if (event.getSource() == threeButton)
	3236	+ if (source == threeButton)
2609	3237	{
2610	3238	radio.layout = threeButton;
2611		- bigThree.remove(jtp);
2612		- bigThree.remove(cameraPanel);
2613		- bigThree.remove(XYZPanel);
2614		- aWindowConstraints.gridx = 0;
2615		- aWindowConstraints.gridy = 0;
2616		- aWindowConstraints.gridwidth = 1;
2617		- // aConstraints.gridheight = 3;
2618		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2619		- aWindowConstraints.weightx = 0;
2620		- aWindowConstraints.weighty = 1;
2621		- //bigThree.add(jtp, aWindowConstraints);
2622		- aWindowConstraints.weightx = 1;
2623		- aWindowConstraints.gridwidth = 3;
2624		- // aConstraints.gridheight = 3;
2625		- aWindowConstraints.gridx = 1;
2626		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2627		- bigThree.add(cameraPanel, aWindowConstraints);
2628		- aWindowConstraints.weightx = 0;
2629		- aWindowConstraints.gridx = 4;
2630		- aWindowConstraints.gridwidth = 1;
2631		- // aConstraints.gridheight = 3;
2632		- aConstraints.fill = GridBagConstraints.VERTICAL;
2633		- bigThree.add(XYZPanel, aWindowConstraints);
2634		- 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();
2635	3276	} else
2636		- if (event.getSource() == fourButton)
	3277	+ if (source == fourButton)
2637	3278	{
2638	3279	radio.layout = fourButton;
2639		- bigThree.remove(jtp);
2640		- bigThree.remove(cameraPanel);
2641		- bigThree.remove(XYZPanel);
2642		- aWindowConstraints.gridx = 0;
2643		- aWindowConstraints.gridy = 0;
2644		- aWindowConstraints.gridwidth = 1;
2645		- // aWindowConstraints.gridheight = 3;
2646		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2647		- aWindowConstraints.weightx = 1;
2648		- aWindowConstraints.weighty = 1;
2649		- bigThree.add(jtp, aWindowConstraints);
2650		- aWindowConstraints.weightx = 1;
2651		- aWindowConstraints.gridwidth = 3;
2652		- // aConstraints.gridheight = 3;
2653		- aWindowConstraints.gridx = 1;
2654		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2655		- //bigThree.add(cameraPanel, aWindowConstraints);
2656		- aWindowConstraints.weightx = 0;
2657		- aWindowConstraints.gridx = 4;
2658		- aWindowConstraints.gridwidth = 1;
2659		- // aWindowConstraints.gridheight = 3;
2660		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2661		- //bigThree.add(XYZPanel, aWindowConstraints);
2662		- 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();
2663	3316	} else
2664		- if (event.getSource() == sixButton)
	3317	+ if (source == sixButton)
2665	3318	{
2666	3319	radio.layout = sixButton;
2667		- bigThree.remove(jtp);
2668		- bigThree.remove(cameraPanel);
2669		- bigThree.remove(XYZPanel);
2670		- aWindowConstraints.gridx = 0;
2671		- aWindowConstraints.gridy = 0;
2672		- aWindowConstraints.gridwidth = 1;
2673		- // aConstraints.gridheight = 3;
2674		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2675		- aWindowConstraints.weightx = 0;
2676		- aWindowConstraints.weighty = 1;
2677		- bigThree.add(jtp, aWindowConstraints);
2678		- aWindowConstraints.weightx = 1;
2679		- aWindowConstraints.gridwidth = 3;
2680		- // aWindowConstraints.gridheight = 3;
2681		- aWindowConstraints.gridx = 1;
2682		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2683		- bigThree.add(cameraPanel, aWindowConstraints);
2684		- aWindowConstraints.weightx = 0;
2685		- aWindowConstraints.gridx = 4;
2686		- aWindowConstraints.gridwidth = 1;
2687		- // aWindowConstraints.gridheight = 3;
2688		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2689		- //bigThree.add(XYZPanel, aConstraints);
2690		- 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();
2691	3357	} else
2692		- if (event.getSource() == sevenButton)
	3358	+ if (source == sevenButton)
2693	3359	{
2694	3360	radio.layout = sevenButton;
2695		- bigThree.remove(jtp);
2696		- bigThree.remove(cameraPanel);
2697		- bigThree.remove(XYZPanel);
2698		- aWindowConstraints.gridx = 0;
2699		- aWindowConstraints.gridy = 0;
2700		- aWindowConstraints.gridwidth = 1;
2701		- // aWindowConstraints.gridheight = 3;
2702		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2703		- aWindowConstraints.weightx = 0;
2704		- aWindowConstraints.weighty = 1;
2705		- bigThree.add(jtp, aWindowConstraints);
2706		- aWindowConstraints.weightx = 1;
2707		- aWindowConstraints.gridwidth = 3;
2708		- // aWindowConstraints.gridheight = 3;
2709		- aWindowConstraints.gridx = 1;
2710		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2711		- bigThree.add(cameraPanel, aWindowConstraints);
2712		- aWindowConstraints.weightx = 0;
2713		- aWindowConstraints.gridx = 4;
2714		- aWindowConstraints.gridwidth = 1;
2715		- // aConstraints.gridheight = 3;
2716		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2717		- bigThree.add(XYZPanel, aWindowConstraints);
2718		- bigThree.revalidate();
	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();
2719	3399	} else
2720		- if (event.getSource() == rootButton)
	3400	+ if (source == rootButton)
2721	3401	{
2722	3402	Object3D obj;
2723	3403	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2727,66 +3407,84 @@
2727	3407	EditObject(obj);
2728	3408	}
2729	3409
	3410	+ cameraView.requestFocusInWindow();
2730	3411	refreshContents(true);
2731	3412	} else
2732		- if (event.getSource() == closeButton)
	3413	+ if (source == closeButton)
2733	3414	{
2734	3415	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2735	3416	cRadio ab;
2736	3417	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2737	3418	{
2738	3419	ab = (cRadio)e.nextElement();
2739		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3420	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2740	3421	{
	3422	+ // Patch to avoid bug with transparency.
	3423	+ if (!ab.hadMaterial)
	3424	+ {
	3425	+ ab.object.material = null;
	3426	+ }
	3427	+
2741	3428	buttonGroup.remove(ab);
2742	3429	radioPanel.remove(ab);
2743	3430
2744		- ab.GetObject().editWindow = null;
	3431	+ //ab.GetObject().editWindow = null;
	3432	+ ab.GetObject().manipWindow = null;
2745	3433	// ab.GetObject().objectUI = null; // ?????????
2746	3434
2747	3435	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2748	3436	break;
2749	3437	}
2750	3438	}
	3439	+
	3440	+ cameraView.requestFocusInWindow();
2751	3441	refreshContents(true);
2752	3442	} else
2753		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3443	+ if (source == editItem \|\| source == editButton)
2754	3444	{
	3445	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3446	+ {
	3447	+ Object3D child = (Object3D)e.nextElement();
	3448	+ child.pinned = true;
	3449	+ }
	3450	+
2755	3451	EditSelection(false);
2756	3452	} else
2757		- if (event.getSource() == uneditButton)
	3453	+ if (source == uneditButton)
2758	3454	{
2759	3455	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2760	3456	{
2761	3457	Object3D child = (Object3D)e.nextElement();
2762	3458	if(child.editWindow != null)
2763	3459	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3460	+ child.pinned = false;
2764	3461	child.CloseUI();
2765	3462	listUI.remove(child);
2766	3463
2767		- child.editWindow = null; // ???????????
	3464	+ //child.editWindow = null; // ???????????
2768	3465	}
2769		- objEditor.ctrlPanel.revalidate();
	3466	+ objEditor.ctrlPanel.FlushUI();
2770	3467	//objEditor.jTree.clearSelection();
2771	3468	//objEditor.ResetSliders();
2772	3469	refreshContents(true);
2773	3470	} else
2774		- if (event.getSource() == clearPanelButton)
	3471	+ if (source == clearPanelButton)
2775	3472	{
2776	3473	assert(copy == group);
2777	3474	//copy.ClearUI();
2778	3475	for (Object3D obj : listUI)
2779	3476	{
	3477	+ obj.pinned = false;
2780	3478	obj.CloseUI();
2781	3479	}
2782	3480	listUI.clear();
2783	3481	refreshContents(true);
2784	3482	} else
2785		- if (event.getSource() == allParamsButton)
	3483	+ if (source == allParamsButton)
2786	3484	{
2787	3485	assert(copy == group);
2788	3486
2789		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3487	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2790	3488
2791	3489	for (Object3D obj : listUI)
2792	3490	{
..	..	@@ -2803,19 +3501,19 @@
2803	3501
2804	3502	refreshContents(true);
2805	3503	} else
2806		- if (event.getSource() == unselectButton)
	3504	+ if (source == unselectButton)
2807	3505	{
2808	3506	objEditor.jTree.clearSelection();
2809		- // ?? oct 2012 GraphreeD.clipboard.clear();
	3507	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2810	3508	objEditor.ResetSliders();
2811	3509	refreshContents(true);
2812	3510	} else
2813		- if(event.getSource() instanceof cRadio)
	3511	+ if(source instanceof cRadio)
2814	3512	{
2815	3513	group.parent = keepparent;
2816	3514	group.attributes = 0;
2817	3515	//group.editWindow = null;
2818		- /cRadio/ radio = (cRadio)event.getSource();
	3516	+ /cRadio/ radio = (cRadio)source;
2819	3517	Object3D obj = radio.GetObject();
2820	3518	System.out.println("Edit " + obj);
2821	3519	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2835,7 +3533,10 @@
2835	3533	}
2836	3534
2837	3535	copy = group;
2838		- //CameraPane.theRenderer.object = group;
	3536	+
	3537	+ SetUndoStates();
	3538	+
	3539	+ //Globals.theRenderer.object = group;
2839	3540	if(!useclient)
2840	3541	{
2841	3542	cameraView.renderCamera = radio.camera;
..	..	@@ -2844,25 +3545,52 @@
2844	3545	cameraView.cameras[cameraView.cameracount] = radio.camera;
2845	3546	cameraView.targetLookAt.set(radio.camera.lookAt);
2846	3547	cameraView.object = group;
2847		- cameraView.lighttouched = true;
	3548	+ //cameraView.lighttouched = true;
	3549	+ Globals.lighttouched = true;
2848	3550	topView.object = group;
2849	3551	frontView.object = group;
2850	3552	sideView.object = group;
2851	3553	}
2852		- group.editWindow = this;
	3554	+
	3555	+// fix "+" issue
	3556	+ //group.editWindow = this;
	3557	+ group.manipWindow = this;
	3558	+
2853	3559	/*
2854	3560	currentLayout = radio.layout;
2855	3561	if (currentLayout == null)
2856	3562	currentLayout = sevenButton;
2857	3563	*/
2858	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);
2859	3572	keepparent = group.parent;
2860	3573	// PARENT = NULL or not???
2861	3574	//group.parent = null; // ROOT
2862	3575	//group.attributes = -1;
2863	3576	ResetModel();
	3577	+
	3578	+ cameraView.requestFocusInWindow();
2864	3579	refreshContents(true);
2865		- }
	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	+ }
2866	3594	else
2867	3595	{
2868	3596	//return super.action(event, arg);
..	..	@@ -2871,7 +3599,6 @@
2871	3599	}
2872	3600
2873	3601	boolean useclient = false;
2874		- cRadio radio;
2875	3602
2876	3603	void ToggleRoot()
2877	3604	{
..	..	@@ -2880,7 +3607,7 @@
2880	3607	if (useclient)
2881	3608	{
2882	3609	cameraView.object = client;
2883		- cameraView.lighttouched = true;
	3610	+ Globals.lighttouched = true;
2884	3611	//topView.object = client;
2885	3612	//frontView.object = client;
2886	3613	//sideView.object = client;
..	..	@@ -2888,7 +3615,7 @@
2888	3615	else
2889	3616	{
2890	3617	cameraView.object = group;
2891		- cameraView.lighttouched = true;
	3618	+ Globals.lighttouched = true;
2892	3619	//topView.object = group;
2893	3620	//frontView.object = group;
2894	3621	//sideView.object = group;
..	..	@@ -2923,6 +3650,28 @@
2923	3650	refreshContents();
2924	3651	}
2925	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	+ }
2926	3675
2927	3676	void ResetTransform()
2928	3677	{
..	..	@@ -3035,7 +3784,7 @@
3035	3784	refreshContents();
3036	3785	}
3037	3786
3038		- void ResetCentroid()
	3787	+ void ResetCentroid(boolean full)
3039	3788	{
3040	3789	Object3D obj;
3041	3790	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3050,12 +3799,16 @@
3050	3799	LA.matIdentity(Object3D.mat);
3051	3800	obj.getBounds(minima, maxima, false);
3052	3801	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3053		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3802	+ if (full)
	3803	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3054	3804	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3055	3805	obj.TransformMesh(Object3D.mat);
	3806	+
3056	3807	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3057		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3808	+ if (full)
	3809	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3058	3810	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3811	+
3059	3812	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3060	3813	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3061	3814	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3084,7 +3837,8 @@
3084	3837
3085	3838	int size = obj.MemorySize();
3086	3839
3087		- 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)");
3088	3842	}
3089	3843	}
3090	3844	catch (Exception e)
..	..	@@ -3121,9 +3875,9 @@
3121	3875	obj = (Object3D)e.nextElement();
3122	3876
3123	3877	System.out.println("Object is: " + obj);
3124		- GraphreeD.AnalyzeObject(obj);
	3878	+ Grafreed.AnalyzeObject(obj);
3125	3879	System.out.println("Boundary rep: " + obj.bRep);
3126		- GraphreeD.AnalyzeObject(obj.bRep);
	3880	+ Grafreed.AnalyzeObject(obj.bRep);
3127	3881
3128	3882	// System.err.println((size/1024) + " KB is the size of " + obj);
3129	3883	}
..	..	@@ -3165,6 +3919,20 @@
3165	3919	void GenNormals(boolean crease)
3166	3920	{
3167	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();
3168	3936
3169	3937	refreshContents();
3170	3938	}
..	..	@@ -3250,7 +4018,7 @@
3250	4018	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3251	4019	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3252	4020	//
3253		-// g.add(GraphreeD.clipboard);
	4021	+// g.add(GrafreeD.clipboard);
3254	4022	//
3255	4023	// buffer.add(g);
3256	4024	// }
..	..	@@ -3269,8 +4037,8 @@
3269	4037	// nodes = new Object3D();
3270	4038	// vertices = new Vector<Vertex>();
3271	4039	//
3272		-// boolean epsequal = GraphreeD.epsequal;
3273		-// GraphreeD.epsequal = true;
	4040	+// boolean epsequal = GrafreeD.epsequal;
	4041	+// GrafreeD.epsequal = true;
3274	4042	//
3275	4043	// for (int i=0; i<group.selection.size(); i++)
3276	4044	// {
..	..	@@ -3311,7 +4079,7 @@
3311	4079	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3312	4080	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3313	4081	//
3314		-// g.add(GraphreeD.clipboard);
	4082	+// g.add(GrafreeD.clipboard);
3315	4083	//
3316	4084	// buffer.add(g);
3317	4085	// }
..	..	@@ -3319,7 +4087,7 @@
3319	4087	// makeSomething(buffer, i==group.selection.size()-1);
3320	4088	// }
3321	4089	//
3322		-// GraphreeD.epsequal = epsequal;
	4090	+// GrafreeD.epsequal = epsequal;
3323	4091	//
3324	4092	// //buffer = null;
3325	4093	// temprep = null;
..	..	@@ -3330,8 +4098,8 @@
3330	4098
3331	4099	void ParseVertices()
3332	4100	{
3333		- boolean epsequal = GraphreeD.epsequal;
3334		- GraphreeD.epsequal = true;
	4101	+ boolean epsequal = Grafreed.epsequal;
	4102	+ Grafreed.epsequal = true;
3335	4103
3336	4104	for (int i=0; i<group.selection.size(); i++)
3337	4105	{
..	..	@@ -3356,7 +4124,7 @@
3356	4124	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3357	4125	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3358	4126
3359		- g.add(GraphreeD.clipboard);
	4127	+ g.add(Grafreed.clipboard);
3360	4128
3361	4129	buffer.add(g);
3362	4130	}
..	..	@@ -3371,7 +4139,7 @@
3371	4139	makeSomething(buffer, i==group.selection.size()-1);
3372	4140	}
3373	4141
3374		- GraphreeD.epsequal = epsequal;
	4142	+ Grafreed.epsequal = epsequal;
3375	4143
3376	4144	refreshContents();
3377	4145	}
..	..	@@ -3389,7 +4157,16 @@
3389	4157	String pigment = Object3D.GetPigment(tex);
3390	4158	//String bump = Object3D.GetBump(tex);
3391	4159
3392		- 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	+ }
3393	4170
3394	4171	double s = v.s;
3395	4172
..	..	@@ -3416,7 +4193,7 @@
3416	4193	scale /= 3;
3417	4194
3418	4195	scale /= 0xFF;
3419		- scale /= 4;
	4196	+ // c'est quoi ca? scale /= 4;
3420	4197
3421	4198	//v.AO = scale;
3422	4199
..	..	@@ -3437,12 +4214,26 @@
3437	4214
3438	4215	void Align()
3439	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	+
3440	4231	for (int i=0; i<group.selection.size(); i++)
3441	4232	{
3442	4233	Object3D obj = group.selection.get(i);
3443	4234
3444		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3445		- 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);
3446	4237	}
3447	4238
3448	4239	refreshContents();
..	..	@@ -3455,7 +4246,7 @@
3455	4246	// ref.SaveSupports();
3456	4247	// Object3D par = ref.parent;
3457	4248	// ref.parent = null;
3458		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	4249	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3459	4250	// ref.parent = par;
3460	4251	// ref.RestoreSupports();
3461	4252
..	..	@@ -3463,11 +4254,11 @@
3463	4254
3464	4255	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3465	4256
3466		- boolean random = CameraPane.RANDOM;
3467		- CameraPane.RANDOM = false; // parse all random nodes
	4257	+ boolean random = CameraPane.SWITCH;
	4258	+ CameraPane.SWITCH = false; // parse all random nodes
3468	4259	lowres.linkVerticesThis(null);
3469	4260	lowres.linkVerticesThis(sn);
3470		- CameraPane.RANDOM = random;
	4261	+ CameraPane.SWITCH = random;
3471	4262
3472	4263	System.err.flush();
3473	4264
..	..	@@ -3485,7 +4276,7 @@
3485	4276	// lowres.SaveSupports();
3486	4277	// par = lowres.parent;
3487	4278	// lowres.parent = null;
3488		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	4279	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3489	4280	Object3D newlow = CloneObject(lowres, false);
3490	4281	newlow.name = sn.switchobject.get(i).name;
3491	4282	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3507,7 +4298,7 @@
3507	4298	return;
3508	4299
3509	4300	Object3D poses = group.selection.get(0);
3510		- Object3D ref = GraphreeD.clipboard.get(0);
	4301	+ Object3D ref = Grafreed.clipboard.get(0);
3511	4302
3512	4303	Object3D newgroup = new Object3D("Po:" + poses.name);
3513	4304
..	..	@@ -3676,7 +4467,7 @@
3676	4467	group.selection.RelinkToSupport(); // july 2014
3677	4468	System.out.println("DONE.");
3678	4469	refreshContents();
3679		- 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));
3680	4471	}
3681	4472
3682	4473	void ReduceMesh(boolean reduction34)
..	..	@@ -3701,20 +4492,20 @@
3701	4492
3702	4493	void ClipMesh()
3703	4494	{
3704		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	4495	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3705	4496	{
3706		- Object3D content = GraphreeD.clipboard.get(0);
	4497	+ Object3D content = Grafreed.clipboard.get(0);
3707	4498
3708	4499	if (content instanceof cGroup && ((cGroup)content).transientlink )
3709	4500	content = ((cGroup)content).get(0);
3710	4501
3711	4502	// for (int i=0; i<group.selection.size(); i++)
3712	4503	// {
3713		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	4504	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3714	4505	// }
3715		- group.selection.ClipMesh(GraphreeD.clipboard);
	4506	+ group.selection.ClipMesh(Grafreed.clipboard);
3716	4507	}
3717		-// group.selection.ClipMesh(GraphreeD.clipboard);
	4508	+// group.selection.ClipMesh(GrafreeD.clipboard);
3718	4509	System.out.println("DONE.");
3719	4510	refreshContents();
3720	4511	}
..	..	@@ -3759,6 +4550,18 @@
3759	4550	void MarkLeaves(boolean hide)
3760	4551	{
3761	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);
3762	4565	refreshContents();
3763	4566	}
3764	4567
..	..	@@ -3833,28 +4636,25 @@
3833	4636	// }
3834	4637	// }
3835	4638
3836		- static boolean allparams = true;
3837		-
3838		- static Vector<Object3D> listUI = new Vector<Object3D>();
3839		-
3840	4639	void EditSelection(boolean newWindow)
3841	4640	{
	4641	+ if (group.selection == null)
	4642	+ {
	4643	+ EditElement(group, newWindow); // ? new
	4644	+ return;
	4645	+ }
	4646	+
3842	4647	// aConstraints.gridy = 0;
3843	4648	for (int i=0; i<group.selection.size(); i++)
3844	4649	{
3845	4650	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3846	4651	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3847		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4652	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3848	4653
3849	4654	Object3D elem = (Object3D)group.selection.elementAt(i);
3850		- if(elem != group)
	4655	+ if(elem != group \|\| !newWindow)
3851	4656	{
3852		- // if (!(elem instanceof Composite))
3853		- // newWindow = false;
3854		- listUI.add(elem);
3855		- elem.openEditWindow(this, newWindow); //, false);
3856		- System.out.println("edit : " + elem);
3857		- elem.editWindow.refreshContents(true); // ? new
	4657	+ EditElement(elem, newWindow); // ? new
3858	4658	}
3859	4659	}
3860	4660	}
..	..	@@ -3929,7 +4729,8 @@
3929	4729	//new Exception().printStackTrace();
3930	4730
3931	4731	freezemodel = true;
3932		-
	4732	+ ClearUnpinned();
	4733	+
3933	4734	/**/
3934	4735	//switch (event.id)
3935	4736	{
..	..	@@ -3937,7 +4738,6 @@
3937	4738	//case 702: // Event.LIST_DESELECT
3938	4739	group.deselectAll();
3939	4740	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3940		- objEditor.ClearInfo(); // .GetMaterial());
3941	4741	if (tps != null)
3942	4742	{
3943	4743	for (int i=0; i < tps.length; i++)
..	..	@@ -3946,33 +4746,39 @@
3946	4746
3947	4747	//if (child.parent != null)
3948	4748	//child.parent.addSelectee(child);
	4749	+ objEditor.SetMaterial(child);
3949	4750	group.addSelectee(child);
3950		- objEditor.SetMaterial(child); // .GetMaterial());
3951		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3952		- System.err.println("info : " + child.GetPath());
3953	4751	}
3954	4752	}
3955		- else
3956		- {
3957		- objEditor.SetMaterial(group); // .GetMaterial());
3958		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3959		- System.err.println("info : " + group.GetPath());
3960		- }
	4753	+// else
	4754	+// {
	4755	+// objEditor.SetMaterial(group); // .GetMaterial());
	4756	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4757	+// System.err.println("info : " + group.GetPath());
	4758	+// }
3961	4759
3962		- objEditor.SetText(); // jan 2014
3963		-
3964		- 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))
3965	4761	CameraPane.flash = true;
3966	4762
3967		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4763	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3968	4764	// a camera
3969	4765	{
3970		- CameraPane.camerachangeframe = 0; // don't refuse it
3971		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3972		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3973		- // 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;
3974	4773	}
3975	4774
	4775	+ if (tps != null && tps.length == 1)
	4776	+ {
	4777	+ EditSelection(false);
	4778	+ }
	4779	+
	4780	+ SetPinStates(tps != null && tps.length > 0);
	4781	+
3976	4782	refreshContents();
3977	4783	//return true;
3978	4784	}
..	..	@@ -3981,6 +4787,35 @@
3981	4787
3982	4788	freezemodel = false;
3983	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	+ }
3984	4819
3985	4820	void linkSomething(Object3D thing)
3986	4821	{
..	..	@@ -4052,16 +4887,19 @@
4052	4887	{
4053	4888	if (group.selection.isEmpty())
4054	4889	return;
4055		- GraphreeD.clipboardIsTempGroup = false;
	4890	+
	4891	+ Grafreed.clipboardIsTempGroup = false;
4056	4892	Composite tGroup = null;
4057	4893	if (group.selection.size() > 0) // 1)
4058	4894	{
4059	4895	tGroup = new cGroup();
4060		- GraphreeD.clipboardIsTempGroup = true;
	4896	+ Grafreed.clipboardIsTempGroup = true;
4061	4897	}
4062	4898
4063	4899	if (cut)
4064	4900	{
	4901	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4902	+// Save();
4065	4903	//int indices[] = jList.getSelectedIndices();
4066	4904	//for (int i = indices.length - 1; i >= 0; i--)
4067	4905	//jList.remove(indices[i]);
..	..	@@ -4097,16 +4935,16 @@
4097	4935	//System.out.println("cut " + child);
4098	4936	//System.out.println("parent = " + child.parent);
4099	4937	// tmp.addChild(child);
4100		- if (GraphreeD.clipboardIsTempGroup)
	4938	+ if (Grafreed.clipboardIsTempGroup)
4101	4939	tGroup.add/Child/(tmp);
4102	4940	else
4103		- GraphreeD.clipboard = tmp;
	4941	+ Grafreed.clipboard = tmp;
4104	4942	}
4105	4943	else
4106		- if (GraphreeD.clipboardIsTempGroup)
	4944	+ if (Grafreed.clipboardIsTempGroup)
4107	4945	tGroup.add/Child/(child);
4108	4946	else
4109		- GraphreeD.clipboard = child;
	4947	+ Grafreed.clipboard = child;
4110	4948	}
4111	4949
4112	4950	//ResetModel();
..	..	@@ -4138,21 +4976,23 @@
4138	4976	//System.out.println("cut " + elem);
4139	4977	//System.out.println("parent = " + elem.parent);
4140	4978	// tmp.addChild(elem);
4141		- if (GraphreeD.clipboardIsTempGroup)
	4979	+ if (Grafreed.clipboardIsTempGroup)
4142	4980	tGroup.add/Child/(tmp);
4143	4981	else
4144		- GraphreeD.clipboard = tmp;
	4982	+ Grafreed.clipboard = tmp;
4145	4983	}
4146	4984	else
4147		- if (GraphreeD.clipboardIsTempGroup)
	4985	+ if (Grafreed.clipboardIsTempGroup)
4148	4986	tGroup.add/Child/(child);
4149	4987	else
4150		- GraphreeD.clipboard = child;
	4988	+ Grafreed.clipboard = child;
4151	4989	}
4152	4990
4153	4991	}
4154		- if (GraphreeD.clipboardIsTempGroup)
4155		- GraphreeD.clipboard = tGroup;
	4992	+
	4993	+ if (Grafreed.clipboardIsTempGroup)
	4994	+ Grafreed.clipboard = tGroup;
	4995	+
4156	4996	if (cut)
4157	4997	{
4158	4998	ResetModel();
..	..	@@ -4162,11 +5002,15 @@
4162	5002
4163	5003	void paste(boolean expand)
4164	5004	{
4165		- // if (GraphreeD.clipboard == null)
	5005	+ if (Globals.REPLACEONMAKE)
	5006	+ Save();
	5007	+ boolean keep = Globals.REPLACEONMAKE;
	5008	+ Globals.REPLACEONMAKE = false;
	5009	+ // if (GrafreeD.clipboard == null)
4166	5010	// return;
4167	5011	boolean first = true;
4168	5012
4169		- if (GraphreeD.clipboardIsTempGroup)
	5013	+ if (Grafreed.clipboardIsTempGroup)
4170	5014	{
4171	5015	Composite temp;
4172	5016
..	..	@@ -4177,7 +5021,7 @@
4177	5021	temp = (Composite)Applet3D.clipboard.deepCopy();
4178	5022	*/
4179	5023	Object3D elem;
4180		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5024	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4181	5025	{
4182	5026	Object3D child = (Object3D)e.nextElement();
4183	5027
..	..	@@ -4191,7 +5035,7 @@
4191	5035	else
4192	5036	elem = child.deepCopy(); // ?
4193	5037	child.parent = keepparent;
4194		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	5038	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4195	5039	// elem = elem.get(0);
4196	5040	makeSomething(elem, true); // ?? first);
4197	5041	//group.addChild(elem);
..	..	@@ -4211,23 +5055,24 @@
4211	5055	//Object3D cb = Applet3D.clipboard;
4212	5056	//temp.addChild(cb);
4213	5057	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4214		- assert(GraphreeD.clipboard.parent == null);
4215		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
4216		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
4217		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
4218		- makeSomething(expand?GraphreeD.clipboard.get(0).copyExpand():GraphreeD.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());
4219	5063	else
4220		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4221		- GraphreeD.clipboard.get(0).parent = keepparent;
	5064	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5065	+ Grafreed.clipboard.get(0).parent = keepparent;
4222	5066	}
4223	5067
	5068	+ Globals.REPLACEONMAKE = keep;
4224	5069	ResetModel();
4225	5070	refreshContents();
4226	5071	}
4227	5072
4228		- void pasteInto(boolean copyit)
	5073	+ void pasteInto(boolean copyit, boolean clone)
4229	5074	{
4230		-// if (GraphreeD.clipboard == null)
	5075	+// if (GrafreeD.clipboard == null)
4231	5076	// return;
4232	5077
4233	5078	if (group.selection.size() != 1)
..	..	@@ -4254,15 +5099,22 @@
4254	5099	if (copyit)
4255	5100	{
4256	5101	// paste(false);
4257		- CloneClipboard(false); // sept 2014
	5102	+ if (clone)
	5103	+ {
	5104	+ CloneClipboard(false); // sept 2014
	5105	+ }
	5106	+ else
	5107	+ {
	5108	+ paste(false);
	5109	+ }
4258	5110	}
4259	5111	else
4260	5112	{
4261	5113	boolean first = true;
4262	5114
4263		- if (GraphreeD.clipboardIsTempGroup)
	5115	+ if (Grafreed.clipboardIsTempGroup)
4264	5116	{
4265		- Composite temp = (Composite)GraphreeD.clipboard;
	5117	+ Composite temp = (Composite)Grafreed.clipboard;
4266	5118	Object3D copy;
4267	5119	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4268	5120	{
..	..	@@ -4272,7 +5124,7 @@
4272	5124	}
4273	5125	} else
4274	5126	{
4275		- linkSomething(GraphreeD.clipboard); //.get(0));
	5127	+ linkSomething(Grafreed.clipboard); //.get(0));
4276	5128	}
4277	5129	}
4278	5130	}
..	..	@@ -4349,6 +5201,10 @@
4349	5201
4350	5202	void group(Object3D csg, boolean grab)
4351	5203	{
	5204	+ if (Globals.REPLACEONMAKE)
	5205	+ Save();
	5206	+ boolean keep = Globals.REPLACEONMAKE;
	5207	+ Globals.REPLACEONMAKE = false;
4352	5208	if (//false) // why??
4353	5209	!group.selection.isEmpty())
4354	5210	{
..	..	@@ -4462,8 +5318,34 @@
4462	5318	//node.add(csg);
4463	5319	//makeSomething(node);
4464	5320	makeSomething(csg);
	5321	+ Globals.REPLACEONMAKE = keep;
4465	5322	}
4466	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	+
4467	5349	void ungroup()
4468	5350	{
4469	5351	/*
..	..	@@ -4657,21 +5539,6 @@
4657	5539	}
4658	5540	*/
4659	5541
4660		- void ImportGFD()
4661		- {
4662		- FileDialog browser = new FileDialog(objEditor.frame, "Import GraphreeD", FileDialog.LOAD);
4663		- browser.show();
4664		- String filename = browser.getFile();
4665		- if (filename != null && filename.length() > 0)
4666		- {
4667		- String fullname = browser.getDirectory() + filename;
4668		-
4669		- //Object3D readobj =
4670		- objEditor.ReadGFD(fullname, objEditor);
4671		- //makeSomething(readobj);
4672		- }
4673		- }
4674		-
4675	5542	/*
4676	5543	public void Callback(Object obj)
4677	5544	{
..	..	@@ -4695,26 +5562,9 @@
4695	5562	}
4696	5563	*/
4697	5564
4698		- void ImportVRMLX3D()
4699		- {
4700		- if (GraphreeD.standAlone)
4701		- {
4702		- /**/
4703		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4704		- browser.show();
4705		- String filename = browser.getFile();
4706		- if (filename != null && filename.length() > 0)
4707		- {
4708		- String fullname = browser.getDirectory() + filename;
4709		- LoadVRMLX3D(fullname);
4710		- }
4711		- /**/
4712		- }
4713		- }
4714		-
4715	5565	String GetFile(String dialogName)
4716	5566	{
4717		- if (GraphreeD.standAlone)
	5567	+ if (Grafreed.standAlone)
4718	5568	{
4719	5569	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4720	5570	browser.show();
..	..	@@ -4778,10 +5628,33 @@
4778	5628	cButton flashSelectionButton;
4779	5629	cButton editButton;
4780	5630	cButton uneditButton;
	5631	+ JCheckBox allParamsButton;
4781	5632	cButton clearpanelButton;
4782		- cButton allParamsButton;
4783	5633	cButton unselectButton;
4784	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	+
4785	5658	cButton screenfitButton;
4786	5659	cButton screenfitpointButton;
4787	5660	cButton snapobjectButton;
..	..	@@ -4793,14 +5666,6 @@
4793	5666
4794	5667	cButton setsupportButton;
4795	5668
4796		- cButton twoButton;
4797		- cButton sixButton;
4798		- cButton threeButton;
4799		- cButton sevenButton;
4800		- cButton fourButton; // full panel
4801		- cButton oneButton; // full XYZ
4802		- //cButton currentLayout;
4803		-
4804	5669	//
4805	5670	//Composite
4806	5671	Object3D // to do !!
..	..	@@ -4810,9 +5675,11 @@
4810	5675	//JTree jTree;
4811	5676	private MenuItem lookAtItem;
4812	5677	private MenuItem lookFromItem;
4813		- private MenuItem switchItem;
	5678	+ private MenuItem switchViewItem;
4814	5679	private MenuItem cutItem;
4815		- private MenuItem duplicateItem;
	5680	+ private MenuItem undoItem;
	5681	+ private MenuItem redoItem;
	5682	+ private JMenuItem duplicateItem;
4816	5683	private MenuItem cloneItem;
4817	5684	private MenuItem cloneSupportItem;
4818	5685	private MenuItem overwriteGeoItem;
..	..	@@ -4823,8 +5690,9 @@
4823	5690	private MenuItem resetsupportItem;
4824	5691	private MenuItem resetreferencesItem;
4825	5692	private MenuItem linkverticesItem;
	5693	+ private MenuItem relinkverticesItem;
4826	5694	private MenuItem setMasterItem;
4827		- private MenuItem resetMeshItem;
	5695	+ private MenuItem resetAllItem;
4828	5696	private MenuItem stepAllItem;
4829	5697	private MenuItem revertMeshItem;
4830	5698	private MenuItem poseMeshItem;
..	..	@@ -4835,14 +5703,17 @@
4835	5703	private MenuItem mergeGeometriesItem;
4836	5704	private MenuItem copyItem;
4837	5705	private MenuItem pasteItem;
	5706	+ private MenuItem pasteIntoItem;
4838	5707	private MenuItem pasteLinkItem;
4839	5708	private MenuItem pasteCloneItem;
4840	5709	private MenuItem pasteExpandItem;
4841		- private MenuItem clearItem;
	5710	+ private MenuItem deleteItem;
4842	5711	private MenuItem clearAllItem;
4843	5712	private MenuItem genUVItem;
	5713	+ private MenuItem genNormalsMESHItem;
4844	5714	private MenuItem genNormalsCADItem;
4845	5715	private MenuItem genNormalsORGANItem;
	5716	+ private MenuItem genNormalsMINEItem;
4846	5717	private MenuItem stripifyItem;
4847	5718	private MenuItem unstripifyItem;
4848	5719	private MenuItem trimItem;
..	..	@@ -4871,6 +5742,10 @@
4871	5742	private MenuItem showleavesItem;
4872	5743	private MenuItem markleavesItem;
4873	5744	private MenuItem unmarkleavesItem;
	5745	+ private MenuItem rewindleavesItem;
	5746	+ private MenuItem unrewindleavesItem;
	5747	+ private MenuItem randomleavesItem;
	5748	+ private MenuItem unrandomleavesItem;
4874	5749
4875	5750	private MenuItem flipVItem;
4876	5751	private MenuItem unflipVItem;
..	..	@@ -4882,14 +5757,17 @@
4882	5757	private MenuItem panoTexturesItem;
4883	5758
4884	5759	private MenuItem resetCentroidItem;
4885		- private MenuItem transformgeometryItem;
	5760	+ private MenuItem resetCentroidXZItem;
4886	5761	private MenuItem resetTransformItem;
	5762	+ private MenuItem transformGeometryItem;
	5763	+ private MenuItem transformChildrenItem;
	5764	+ private MenuItem hideItem;
4887	5765	private MenuItem grabItem;
4888	5766	private MenuItem backItem;
4889	5767	private MenuItem frontItem;
4890	5768	private MenuItem cameraItem;
4891	5769	private MenuItem compositeItem;
4892		- private MenuItem randomItem;
	5770	+ private MenuItem switchItem;
4893	5771	private MenuItem physicsItem;
4894	5772	private MenuItem frameselectorItem;
4895	5773	private MenuItem scriptNodeItem;
..	..	@@ -4904,6 +5782,7 @@
4904	5782
4905	5783	private MenuItem resetParentItem;
4906	5784	private MenuItem repairParentItem;
	5785	+ private MenuItem repairShadowItem;
4907	5786	private MenuItem sortbysizeItem;
4908	5787	private MenuItem sortbynameItem;
4909	5788
..	..	@@ -4924,10 +5803,11 @@
4924	5803	private MenuItem coneItem;
4925	5804	private MenuItem torusItem;
4926	5805	private MenuItem superItem;
	5806	+ private MenuItem kleinItem;
4927	5807	private MenuItem blobItem;
4928	5808	private MenuItem latheItem;
4929	5809	private MenuItem bezierItem;
4930		- private MenuItem checkerItem;
	5810	+ private MenuItem overlayItem;
4931	5811	private MenuItem meshItem;
4932	5812	// private MenuItem meshGroupItem;
4933	5813	private MenuItem springItem;
..	..	@@ -4936,6 +5816,7 @@
4936	5816	private MenuItem csgItem;
4937	5817	private MenuItem templateItem;
4938	5818	private MenuItem textureItem;
	5819	+ private MenuItem billboardItem;
4939	5820	private MenuItem shadowXItem;
4940	5821	private MenuItem shadowYItem;
4941	5822	private MenuItem shadowZItem;
..	..	@@ -4948,11 +5829,6 @@
4948	5829	private MenuItem doubleItem;
4949	5830	private MenuItem tripleItem;
4950	5831
4951		- private MenuItem importGFDItem;
4952		- private MenuItem importVRMLX3DItem;
4953		- private MenuItem import3DSItem;
4954		- private MenuItem importOBJItem;
4955		-
4956	5832	private MenuItem computeAOItem;
4957	5833	private MenuItem recompileItem;
4958	5834	private MenuItem editScriptItem;
..	..	@@ -4962,4 +5838,8 @@
4962	5838	private MenuItem analyzeItem;
4963	5839	private MenuItem dumpItem;
4964	5840	//boolean freezemodel = false;
	5841	+
	5842	+ Menu cameraMenu;
	5843	+ MenuItem editCameraItem;
	5844	+ MenuItem restoreCameraItem;
4965	5845	}