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