~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,16 +80,28 @@
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	{
	101	+ if (Globals.REPLACEONMAKE)
	102	+ Save();
	103	+ boolean keep = Globals.REPLACEONMAKE;
	104	+ Globals.REPLACEONMAKE = false;
86	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();)
..	..	@@ -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(GrafreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
102		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	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(GrafreeD.clipboard, false));
107		- GrafreeD.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)GrafreeD.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,79 +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);
222	340	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	341	relinkverticesItem.addActionListener(this);
	342	+
	343	+ if (Globals.ADVANCED)
	344	+ {
224	345	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	346	setMasterItem.addActionListener(this);
	347	+ }
226	348
227	349	oe.menuBar.add(menu = new Menu("Group"));
228		- grabItem = menu.add(new MenuItem("Grab"));
229		- grabItem.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	354	frontItem = menu.add(new MenuItem("Front"));
233	355	frontItem.addActionListener(this);
234		- compositeItem = menu.add(new MenuItem("Composite"));
235		- compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	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"));
237	362	hideItem.addActionListener(this);
	363	+ }
238	364	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	365	ungroupItem.addActionListener(this);
240		- menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
242		- randomItem.addActionListener(this);
243		- physicsItem = menu.add(new MenuItem("Physics"));
244		- physicsItem.addActionListener(this);
245		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
246		- frameselectorItem.addActionListener(this);
	366	+
	367	+// menu.add("-");
	368	+//
	369	+// switchItem = menu.add(new MenuItem("Switch node"));
	370	+// switchItem.addActionListener(this);
	371	+ if (Globals.ADVANCED)
	372	+ {
247	373	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	374	switchGeoItem.addActionListener(this);
249	375	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	376	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	377	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	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);
253	385	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	386	scriptNodeItem.addActionListener(this);
255		- cameraItem = menu.add(new MenuItem("Camera"));
256		- cameraItem.addActionListener(this);
	387	+ }
257	388
258	389	oe.menuBar.add(menu = new Menu("Object"));
259		- textureItem = menu.add(new MenuItem("Texture"));
260		- textureItem.addActionListener(this);
	390	+// textureItem = menu.add(new MenuItem("Texture"));
	391	+// textureItem.addActionListener(this);
261	392	billboardItem = menu.add(new MenuItem("Billboard"));
262	393	billboardItem.addActionListener(this);
263	394	csgItem = menu.add(new MenuItem("CSG"));
264	395	csgItem.addActionListener(this);
265		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	396	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266	397	shadowXItem.addActionListener(this);
267		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	398	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268	399	shadowYItem.addActionListener(this);
269		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	400	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270	401	shadowZItem.addActionListener(this);
	402	+ attributeItem = menu.add(new MenuItem("Attribute"));
	403	+ attributeItem.addActionListener(this);
	404	+
	405	+ if (Globals.ADVANCED)
	406	+ {
	407	+ menu.add("-");
271	408	linkerItem = menu.add(new MenuItem("Linker"));
272	409	linkerItem.addActionListener(this);
273	410	templateItem = menu.add(new MenuItem("Template"));
274	411	templateItem.addActionListener(this);
275		- attributeItem = menu.add(new MenuItem("Attribute"));
276		- attributeItem.addActionListener(this);
277	412	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	413	pointflowItem.addActionListener(this);
	414	+ }
279	415	menu.add("-");
280	416	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	417	resetTransformItem.addActionListener(this);
282	418	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	419	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.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);
286	426
287	427	oe.menuBar.add(menu = new Menu("Geometry"));
288	428	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +433,11 @@
293	433	genNormalsCADItem.addActionListener(this);
294	434	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	435	genNormalsMESHItem.addActionListener(this);
296		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	436	+ if (Globals.ADVANCED)
	437	+ {
	438	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
297	439	genNormalsMINEItem.addActionListener(this);
	440	+ }
298	441	stripifyItem = menu.add(new MenuItem("Stripify"));
299	442	stripifyItem.addActionListener(this);
300	443	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +459,34 @@
316	459	reduce34MeshItem.addActionListener(this);
317	460	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	461	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	462	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	463	clipMeshItem.addActionListener(this);
	464	+
	465	+ if (Globals.ADVANCED)
	466	+ {
	467	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	468	+ smoothMeshItem.addActionListener(this);
	469	+ }
323	470
324	471	oe.menuBar.add(menu = new Menu("Attributes"));
325	472	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	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);
327	478	menu.add("-");
328	479	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	480	liveleavesItem.addActionListener(this);
330	481	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	482	unliveleavesItem.addActionListener(this);
	483	+ if (Globals.ADVANCED)
	484	+ {
332	485	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	486	supportleavesItem.addActionListener(this);
334	487	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	488	unsupportleavesItem.addActionListener(this);
	489	+ }
336	490	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	491	hideleavesItem.addActionListener(this);
338	492	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -341,6 +495,14 @@
341	495	markleavesItem.addActionListener(this);
342	496	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343	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);
344	506	menu.add("-");
345	507	flipVItem = menu.add(new MenuItem("Flip V"));
346	508	flipVItem.addActionListener(this);
..	..	@@ -376,35 +538,41 @@
376	538	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	539	sortbynameItem.addActionListener(this);
378	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.
379	548	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	549	extractGeometriesItem.addActionListener(this);
381	550	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	551	cloneGeometriesItem.addActionListener(this);
383		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
384		- shareGeometriesItem.addActionListener(this);
385		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
386		- mergeGeometriesItem.addActionListener(this);
	552	+ }
387	553
388	554	oe.menuBar.add(menu = new Menu("Insert"));
389	555	buildCreateMenu(menu);
390	556
391		-
392		- oe.menuBar.add(menu = new Menu("Include"));
393		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
394		- importGFDItem.addActionListener(this);
395		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
396		- importVRMLX3DItem.addActionListener(this);
397		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
398		- importOBJItem.addActionListener(this);
399		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
400		- import3DSItem.addActionListener(this);
401		-
402	557	oe.menuBar.add(menu = new Menu("Tools"));
403	558	buildToolsMenu(menu);
404	559	}
405	560
	561	+
406	562	void SetupUI2(ObjEditor oe)
407	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	+
408	576	//new Exception().printStackTrace();
409	577
410	578	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -433,150 +601,231 @@
433	601	oe.radioPanel.add(dummyButton);
434	602	oe.buttonGroup.add(dummyButton);
435	603	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	604	+ cGridBag copyOptionsPanel = new cGridBag();
	605	+
	606	+ copyOptionsPanel.preferredHeight = 1;
439	607
440		- 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");
441	662	liveCB.addItemListener(this);
442	663
443		- oe.aConstraints.gridx += 1;
444		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
445		- supportCB.addItemListener(this);
446		-
447		- // oe.aConstraints.gridx += 1;
448		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
449		- // localCB.addItemListener(this);
450		-
451		- oe.aConstraints.gridx += 1;
452		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
453		- crowdCB.addItemListener(this);
454		-
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
457		- smoothCB.addItemListener(this);
458		-
459		- oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	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");
461	670	fastCB.addItemListener(this);
462		- oe.aConstraints.gridx += 1;
463		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
464		- slowCB.addItemListener(this);
465		- oe.aConstraints.gridx += 1;
466		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
467		- boxCB.addItemListener(this);
	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);
468	677
469		-// oe.aConstraints.gridx += 1;
470		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
471		-// speakerMocapCB.addItemListener(this);
472		-
473		- if (false)
474		- {
475		- // handled in scripts
476		- oe.aConstraints.gridx += 1;
477		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
478		- speakerCameraCB.addItemListener(this);
479		-
480		- oe.aConstraints.gridx += 1;
481		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
482		- speakerFocusCB.addItemListener(this);
483		-
484		- oe.aConstraints.gridx += 1;
485		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
486		- smoothfocusCB.addItemListener(this);
487		- }
488		-
489		-//oe.aConstraints.gridx += 1;
490		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
491		-// debugCB.addItemListener(this);
492		-
493		- oe.aConstraints.gridx += 1;
494		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
495		- oeilCB.addItemListener(this);
496		-
497		- oe.aConstraints.gridx += 1;
498		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
499		- lookAtCB.addItemListener(this);
500		-
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
503		- trackCB.addItemListener(this);
504		-
505		- oe.aConstraints.gridx += 1;
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
507		- screenfitButton.addActionListener(this);
508		- oe.aConstraints.gridx += 1;
509	678	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
510	679	// screenfitpointButton.addActionListener(this);
511		-// oe.aConstraints.gridx += 1;
512		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
513		- snapobjectButton.addActionListener(this);
514		- oe.aConstraints.gridx += 1;
515	680
516		- //aConstraints.gridx = 0;
517		- //aConstraints.gridy += 1;
518		- oe.aConstraints.weighty = 0;
519		- oe.aConstraints.gridwidth = 1;
520		-
521		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
522		- flashSelectionButton.addActionListener(this);
523		- oe.aConstraints.gridx += 1;
524		- oe.aConstraints.weighty = 0;
525		- oe.aConstraints.gridwidth = 1;
	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));
526	689
527		- //
528		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
529		- twoButton.addActionListener(this);
530		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	690	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
531	691	fourButton.addActionListener(this);
532		- 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");
533	701	sixButton.addActionListener(this);
534		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
535		- threeButton.addActionListener(this);
536		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
537		- 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);
538	708	//
539	709
540		- 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");
541	712	rootButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- 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");
544	716	closeButton.addActionListener(this);
545	717	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
546	718	//clearButton.addActionListener(this);
547		- oe.aConstraints.gridx += 1;
548		-
549		- oe.aConstraints.gridx = 1; //
550		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
551		- editButton.addActionListener(this);
552		- oe.aConstraints.gridx += 1;
553		- oe.aConstraints.weighty = 0;
554		- oe.aConstraints.gridwidth = 1;
555	719
556		- 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");
557	805	uneditButton.addActionListener(this);
558	806
559		- oe.aConstraints.gridx += 1;
560		- oe.aConstraints.weighty = 0;
561		- oe.aConstraints.gridwidth = 1;
562		-
563		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
564		- clearPanelButton.addActionListener(this);
565		-
566		- oe.aConstraints.gridx += 1;
567		- oe.aConstraints.weighty = 0;
568		- oe.aConstraints.gridwidth = 1;
569		-
570		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	807	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	808	+ allParamsButton.setToolTipText("Show all controle");
571	809	allParamsButton.addActionListener(this);
572	810
573		- oe.aConstraints.gridx += 1;
574		- oe.aConstraints.weighty = 0;
575		- oe.aConstraints.gridwidth = 1;
576		-
577		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	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");
578	817	unselectButton.addActionListener(this);
579	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	+
580	829	// oe.aConstraints.gridx += 1;
581	830	// oe.aConstraints.weighty = 0;
582	831	// oe.aConstraints.gridwidth = 1;
..	..	@@ -588,40 +837,25 @@
588	837	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
589	838	// gcButton.addActionListener(this);
590	839
591		- oe.aConstraints.gridx = 0;
592		- oe.aConstraints.gridy += 1;
593		-
594		- //ctrlPanel.add(objList = new List(5, true));
595		- oe.aConstraints.gridwidth = 100;
596		- // oe.aConstraints.gridheight = 100;
597		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
598		- oe.aConstraints.gridheight = 1;
599		- oe.aConstraints.weighty = 0.5;
600		- oe.aConstraints.gridx = 0;
601		- JScrollPane jSP;
	840	+ cGridBag jSPPanel = new cGridBag();
	841	+
	842	+ JScrollPane jSP;
602	843	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
603		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	844	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
604	845	ResetModel();
605		- oe.aConstraints.weighty = 0.5;
606		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
607		- oe.aConstraints.gridy += 1;
608		- oe.aConstraints.gridwidth = 1;
609		-
610		- oe.aConstraints.weighty = 0;
611		- oe.aConstraints.gridwidth = 2;
612		-
613		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
614		- colorCB.addItemListener(this);
615		- oe.aConstraints.gridx += 2;
616		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
617		- materialCB.addItemListener(this);
618		- oe.aConstraints.gridx += 2;
619		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
620		- textureCB.addItemListener(this);
621		-
622		- oe.aConstraints.gridx = 0;
623		- oe.aConstraints.gridy += 1;
624	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	+
625	859	//jList.addListSelectionListener(this);
626	860	oe.jTree.addTreeSelectionListener(this);
627	861	//jTree.setRootVisible(false);
..	..	@@ -640,23 +874,160 @@
640	874	dgr.addDragGestureListener(this);
641	875	}catch(Exception e) {}
642	876	*/
643		- radio.layout = sevenButton;
	877	+ radio.layout = sixButton; // sevenButton;
644	878	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
645	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	+ }
646	1006
647	1007	void EditObject(Object3D obj)
648	1008	{
649		- cRadio dummyButton = new cRadio(obj.name);
650		- dummyButton.SetObject(obj);
651		- dummyButton.layout = sevenButton;
652		- dummyButton.SetCamera(cameraView.renderCamera, false);
653		- dummyButton.addActionListener(this);
654		- radioPanel.add(dummyButton);
655		- buttonGroup.add(dummyButton);
656		- dummyButton.doClick();
	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();
657	1025	}
	1026	+
658	1027	void SetupViews(ObjEditor oe)
659	1028	{
	1029	+ theFrame = this;
	1030	+
660	1031	oe.SetupViews();
661	1032
662	1033	System.out.println("SetupViews");
..	..	@@ -665,22 +1036,28 @@
665	1036	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
666	1037	}
667	1038
668		- JCheckBox liveCB;
669		- JCheckBox supportCB;
670		- JCheckBox localCB;
671		- JCheckBox crowdCB;
672		- JCheckBox smoothCB;
673		- JCheckBox fastCB;
674		- JCheckBox slowCB;
675		- JCheckBox boxCB;
676		- JCheckBox trackCB;
677		- JCheckBox smoothfocusCB;
	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;
678	1052	// JCheckBox speakerMocapCB;
679		- JCheckBox speakerCameraCB;
680		- JCheckBox speakerFocusCB;
681		- JCheckBox debugCB;
682		- JCheckBox oeilCB;
683		- JCheckBox lookAtCB;
	1053	+ cCheckBox speakerCameraCB;
	1054	+ cCheckBox speakerFocusCB;
	1055	+ cCheckBox debugCB;
	1056	+
	1057	+ cCheckBox oeilCB;
	1058	+ cCheckBox shadowCB;
	1059	+ cCheckBox autokeepCB;
	1060	+ cCheckBox lookAtCB;
684	1061
685	1062	// static int COLOR = 1;
686	1063	// static int MATERIAL = 2;
..	..	@@ -688,9 +1065,9 @@
688	1065
689	1066	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
690	1067
691		- JCheckBox colorCB;
692		- JCheckBox materialCB;
693		- JCheckBox textureCB;
	1068	+ cCheckBox colorCB;
	1069	+ cCheckBox materialCB;
	1070	+ cCheckBox textureCB;
694	1071
695	1072	public void itemStateChanged(ItemEvent e)
696	1073	{
..	..	@@ -715,10 +1092,10 @@
715	1092	dropAttributes \|= Object3D.TEXTURE;
716	1093	else
717	1094	dropAttributes &= ~Object3D.TEXTURE;
718		- }
719		- else if(e.getSource() == liveCB)
	1095	+ } else if(e.getSource() == liveCB)
720	1096	{
721	1097	cameraView.ToggleLive();
	1098	+ refreshContents(false);
722	1099	}
723	1100	else if(e.getSource() == supportCB)
724	1101	{
..	..	@@ -754,6 +1131,10 @@
754	1131	cameraView.repaint();
755	1132	// refreshContents();
756	1133	}
	1134	+ else if(e.getSource() == zoomBoxCB)
	1135	+ {
	1136	+ cameraView.ToggleZoomBoxMode();
	1137	+ }
757	1138	else if(e.getSource() == smoothfocusCB)
758	1139	{
759	1140	cameraView.ToggleSmoothFocus();
..	..	@@ -779,6 +1160,18 @@
779	1160	{
780	1161	cameraView.ToggleOeil();
781	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	+ }
782	1175	else if(e.getSource() == lookAtCB)
783	1176	{
784	1177	cameraView.ToggleLookAt();
..	..	@@ -795,7 +1188,8 @@
795	1188
796	1189	/**/
797	1190	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
798		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1191	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1192	+ TreePath path = objEditor.jTree.getSelectionPath();
799	1193	if ((path == null) \|\| (path.getPathCount() <= 1)) {
800	1194	// We can't move the root node or an empty selection
801	1195	return;
..	..	@@ -858,8 +1252,6 @@
858	1252	}
859	1253	}
860	1254
861		- String string = (String) object;
862		-
863	1255	System.out.println("Transfer = " + object + "; drop : " + target);
864	1256	// if( object instanceof java.io.File[])
865	1257	// {
..	..	@@ -867,7 +1259,11 @@
867	1259	// objEditor.DropFile((java.io.File[]) object, true);
868	1260	// return;
869	1261	// }
870		- 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) == ':')
871	1267	{
872	1268	// file(s)
873	1269	String[] names = string.split("\n");
..	..	@@ -894,7 +1290,7 @@
894	1290
895	1291	flashIt = false;
896	1292	CameraPane pane = (CameraPane) target;
897		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1293	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
898	1294	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
899	1295
900	1296	if (group.selection.size() == 1)
..	..	@@ -910,23 +1306,33 @@
910	1306
911	1307	assert target == objEditor.jTree;
912	1308	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1309	+ Object3D destinationLeaf;
913	1310	try {
914		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1311	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
915	1312	} catch (Exception e) {
916	1313	System.out.println("destinationPath : " + destinationPath);
917	1314	return;
918	1315	}
919	1316
920		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1317	+ for (int i=group.selection.size(); --i>=0;)
921	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	+// {
922	1328	loadClipboard(true);
923	1329	objEditor.jTree.setSelectionPath(destinationPath);
924		- pasteInto(false);
925		- } else {
926		- loadClipboard(false);
927		- objEditor.jTree.setSelectionPath(destinationPath);
928		- pasteInto(false); // true); // ???
929		- }
	1330	+ pasteInto(false, false);
	1331	+// } else {
	1332	+// loadClipboard(false);
	1333	+// objEditor.jTree.setSelectionPath(destinationPath);
	1334	+// pasteInto(false, false); // true); // ???
	1335	+// }
930	1336	}
931	1337	public void dropActionChanged(DropTargetDragEvent dtde)
932	1338	// Called if the user has modified the current drop gesture
..	..	@@ -1031,85 +1437,107 @@
1031	1437	{
1032	1438	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1033	1439	//heightFieldItem.addActionListener(this);
1034		- gridItem = menu.add(new MenuItem("Grid"));
1035		- gridItem.addActionListener(this);
1036		- rectoidItem = menu.add(new MenuItem("Box"));
1037		- rectoidItem.addActionListener(this);
1038		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1039		- ellipsoidItem.addActionListener(this);
1040		- coneItem = menu.add(new MenuItem("Cone"));
1041		- coneItem.addActionListener(this);
1042		- torusItem = menu.add(new MenuItem("Torus"));
1043		- torusItem.addActionListener(this);
1044		- superItem = menu.add(new MenuItem("Superellipsoid"));
1045		- superItem.addActionListener(this);
	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	+ {
1046	1458	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1047	1459	kleinItem.addActionListener(this);
1048		- particleItem = menu.add(new MenuItem("Particle system"));
1049		- particleItem.addActionListener(this);
	1460	+ }
	1461	+
	1462	+// particleItem = menu.add(new MenuItem("Particle system"));
	1463	+// particleItem.addActionListener(this);
	1464	+ if (Globals.ADVANCED)
	1465	+ {
1050	1466	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1051	1467	ragdollItem.addActionListener(this);
1052	1468	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1053	1469	ragdoll2Item.addActionListener(this);
	1470	+ }
1054	1471	menu.add("-");
1055		- meshItem = menu.add(new MenuItem("Mesh"));
	1472	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1056	1473	meshItem.addActionListener(this);
1057	1474	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1058	1475	// meshGroupItem.addActionListener(this);
	1476	+ if (Globals.ADVANCED)
	1477	+ {
1059	1478	springItem = menu.add(new MenuItem("Spring"));
1060	1479	springItem.addActionListener(this);
1061	1480	flagItem = menu.add(new MenuItem("Flag"));
1062	1481	flagItem.addActionListener(this);
1063		- bezierItem = menu.add(new MenuItem("Patch"));
1064		- bezierItem.addActionListener(this);
1065		- checkerItem = menu.add(new MenuItem("Checker"));
1066		- checkerItem.addActionListener(this);
1067	1482	blobItem = menu.add(new MenuItem("Blob"));
1068	1483	blobItem.addActionListener(this);
1069	1484	latheItem = menu.add(new MenuItem("Lathe"));
1070	1485	latheItem.addActionListener(this);
1071		- lightItem = menu.add(new MenuItem("Light"));
1072		- 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);
1073	1493	menu.add("-");
1074	1494	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1075	1495	//superLoopItem.addActionListener(this);
1076		- loopItem = menu.add(new MenuItem("Loop"));
1077		- loopItem.addActionListener(this);
	1496	+// loopItem = menu.add(new MenuItem("Loop"));
	1497	+// loopItem.addActionListener(this);
1078	1498	doubleItem = menu.add(new MenuItem("Fork"));
1079	1499	doubleItem.addActionListener(this);
	1500	+ if (Globals.ADVANCED)
	1501	+ {
1080	1502	tripleItem = menu.add(new MenuItem("Trident"));
1081	1503	tripleItem.addActionListener(this);
	1504	+ }
1082	1505	}
1083	1506
1084	1507	void buildToolsMenu(Menu menu)
1085	1508	{
1086	1509	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1087	1510	animationItem.addItemListener(this);
1088		- animationItem.setState(CameraPane.ANIMATION);
	1511	+ animationItem.setState(Globals.ANIMATION);
	1512	+
	1513	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1514	+ archiveItem.addActionListener(this);
1089	1515
1090	1516	menu.add("-");
1091	1517	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1092	1518	parseverticesItem.addActionListener(this);
1093	1519	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1094	1520	textureFieldItem.addActionListener(this);
1095		- alignItem = menu.add(new MenuItem("Align"));
	1521	+ alignItem = menu.add(new MenuItem("Align Objects"));
1096	1522	alignItem.addActionListener(this);
1097		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1098		- mirrorItem.addActionListener(this);
1099	1523	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1100	1524	reduceMorphItem.addActionListener(this);
1101	1525	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1102	1526	reduce34MorphItem.addActionListener(this);
1103		-
1104		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1105		- computeAOItem.addActionListener(this);
1106	1527	menu.add("-");
1107		-
1108	1528	menu.add(memoryItem = new MenuItem("Memory Usage"));
1109	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("-");
1110	1538	menu.add(analyzeItem = new MenuItem("Analyze"));
1111	1539	analyzeItem.addActionListener(this);
1112		- menu.add(dumpItem = new MenuItem("Dump"));
	1540	+ menu.add(dumpItem = new MenuItem("Print"));
1113	1541	dumpItem.addActionListener(this);
1114	1542	// menu.add(pathItem = new MenuItem("From-to path"));
1115	1543	// pathItem.addActionListener(this);
..	..	@@ -1118,6 +1546,8 @@
1118	1546	resetParentItem.addActionListener(this);
1119	1547	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1120	1548	repairParentItem.addActionListener(this);
	1549	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1550	+ repairShadowItem.addActionListener(this);
1121	1551	menu.add(invariantsItem = new MenuItem("Invariants"));
1122	1552	invariantsItem.addActionListener(this);
1123	1553	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1125,6 +1555,7 @@
1125	1555	menu.add("-");
1126	1556	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1127	1557	editScriptItem.addActionListener(this);
	1558	+ }
1128	1559	}
1129	1560
1130	1561	void ScreenFit()
..	..	@@ -1247,9 +1678,34 @@
1247	1678	shadow.material = new cMaterial(obj.material);
1248	1679	shadow.material.diffuse = 0.0001f;
1249	1680	shadow.material.specular = 0.0001f;
	1681	+ //shadow.projectedVertices[1].x = 300;
1250	1682
1251	1683	makeSomething(shadow);
1252	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	+ }
1253	1709
1254	1710	/**
1255	1711	* applyExample
..	..	@@ -1453,9 +1909,9 @@
1453	1909
1454	1910	void Overwrite(int mask)
1455	1911	{
1456		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1912	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1457	1913	{
1458		- Object3D content = GrafreeD.clipboard.get(0);
	1914	+ Object3D content = Grafreed.clipboard.get(0);
1459	1915
1460	1916	if (content instanceof cGroup && ((cGroup)content).transientlink )
1461	1917	content = ((cGroup)content).get(0);
..	..	@@ -1478,6 +1934,7 @@
1478	1934	//
1479	1935	public void actionPerformed(ActionEvent event) // , Object arg)
1480	1936	{
	1937	+ Object source = event.getSource();
1481	1938	/*
1482	1939	if (event.getSource() == nameField)
1483	1940	{
..	..	@@ -1489,11 +1946,11 @@
1489	1946	}
1490	1947	else
1491	1948	*/
1492		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1949	+ if (source == lookAtItem \|\| source == lookFromItem)
1493	1950	{
1494	1951	ScreenFit();
1495	1952	} else
1496		- if (event.getSource() == switchItem)
	1953	+ if (source == switchViewItem)
1497	1954	{
1498	1955	cVector v1 = new cVector();
1499	1956	cVector v2 = new cVector();
..	..	@@ -1502,11 +1959,11 @@
1502	1959	objEditor.cameraView.renderCamera.setAim(v2, v1);
1503	1960	objEditor.cameraView.repaint();
1504	1961	} else
1505		- if (event.getSource() == rectoidItem)
	1962	+ if (source == rectoidItem \|\| source == boxButton)
1506	1963	{
1507	1964	makeSomething(new Box());
1508	1965	} else
1509		- if (event.getSource() == particleItem)
	1966	+ if (source == particleItem \|\| source == particlesButton)
1510	1967	{
1511	1968	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1512	1969	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1527,9 +1984,9 @@
1527	1984	applyExample(particleGeom, "SMOKE");
1528	1985	makeSomething(particleGeom);
1529	1986	} else
1530		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1987	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1531	1988	{
1532		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1989	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1533	1990
1534	1991	ragdoll.toParent = LA.newMatrix();
1535	1992	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1547,7 +2004,7 @@
1547	2004	} else
1548	2005	/*
1549	2006	*/
1550		- if (event.getSource() == heightFieldItem)
	2007	+ if (source == heightFieldItem)
1551	2008	{
1552	2009	Object3D obj = new Object3D();
1553	2010
..	..	@@ -1585,31 +2042,31 @@
1585	2042
1586	2043	makeSomething(obj);
1587	2044	} else
1588		- if (event.getSource() == gridItem)
	2045	+ if (source == gridItem \|\| source == gridButton)
1589	2046	{
1590	2047	makeSomething(new Grid());
1591	2048	} else
1592		- if (event.getSource() == ellipsoidItem)
	2049	+ if (source == ellipsoidItem \|\| source == sphereButton)
1593	2050	{
1594	2051	makeSomething(new Sphere());
1595	2052	} else
1596		- if (event.getSource() == coneItem)
	2053	+ if (source == coneItem \|\| source == coneButton)
1597	2054	{
1598	2055	makeSomething(new Cone());
1599	2056	} else
1600		- if (event.getSource() == torusItem)
	2057	+ if (source == torusItem \|\| source == torusButton)
1601	2058	{
1602	2059	makeSomething(new Torus());
1603	2060	} else
1604		- if (event.getSource() == superItem)
	2061	+ if (source == superItem \|\| source == superButton)
1605	2062	{
1606	2063	makeSomething(new Superellipsoid());
1607	2064	} else
1608		- if (event.getSource() == kleinItem)
	2065	+ if (source == kleinItem \|\| source == kleinButton)
1609	2066	{
1610	2067	makeSomething(new Klein());
1611	2068	} else
1612		- if (event.getSource() == blobItem)
	2069	+ if (source == blobItem)
1613	2070	{
1614	2071	Blob blob = new Blob();
1615	2072	BlobComponent comp = new BlobComponent();
..	..	@@ -1617,15 +2074,15 @@
1617	2074	//blob.retile();
1618	2075	makeSomething(blob);
1619	2076	} else
1620		- if (event.getSource() == latheItem)
	2077	+ if (source == latheItem)
1621	2078	{
1622	2079	makeSomething(new Lathe());
1623	2080	} else
1624		- if (event.getSource() == bezierItem)
	2081	+ if (source == bezierItem)
1625	2082	{
1626	2083	makeSomething(new BezierSurface());
1627	2084	} else
1628		- if (event.getSource() == checkerItem)
	2085	+ if (source == overlayItem \|\| source == overlayButton)
1629	2086	{
1630	2087	/*
1631	2088	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1640,7 +2097,7 @@
1640	2097	*/
1641	2098	makeSomething(new Checker());
1642	2099	} else
1643		- if (event.getSource() == meshItem)
	2100	+ if (source == meshItem)
1644	2101	{
1645	2102	Object3D itemtomake = new Object3D();
1646	2103	Object3D child;
..	..	@@ -1661,35 +2118,35 @@
1661	2118	makeSomething(child);
1662	2119	}
1663	2120	} else
1664		- if (event.getSource() == springItem)
	2121	+ if (source == springItem)
1665	2122	{
1666	2123	cSpring s = new cSpring();
1667	2124	s.setup();
1668	2125	makeSomething(s);
1669	2126	} else
1670		- if (event.getSource() == flagItem)
	2127	+ if (source == flagItem)
1671	2128	{
1672	2129	cSpring s = new cFlag();
1673	2130	s.setup();
1674	2131	makeSomething(s);
1675	2132	} else
1676		- if (event.getSource() == lightItem)
	2133	+ if (source == lightItem \|\| source == lightButton)
1677	2134	{
1678	2135	makeSomething(new Light());
1679	2136	} else
1680		- if (event.getSource() == csgItem)
	2137	+ if (source == csgItem)
1681	2138	{
1682	2139	group(new CSG());
1683	2140	} else
1684		- if (event.getSource() == templateItem)
	2141	+ if (source == templateItem)
1685	2142	{
1686	2143	group(new cTemplate());
1687	2144	} else
1688		- if (event.getSource() == attributeItem)
	2145	+ if (source == attributeItem)
1689	2146	{
1690	2147	makeSomething(new Attribute());
1691	2148	} else
1692		- if (event.getSource() == pointflowItem)
	2149	+ if (source == pointflowItem)
1693	2150	{
1694	2151	makeSomething(new PointFlow());
1695	2152	} else
..	..	@@ -1701,7 +2158,7 @@
1701	2158	} else
1702	2159	*/
1703	2160
1704		- if (event.getSource() == superLoopItem)
	2161	+ if (source == superLoopItem)
1705	2162	{
1706	2163	Composite g = new cGroup();
1707	2164	for (int i=0; i<15; i++)
..	..	@@ -1723,30 +2180,30 @@
1723	2180
1724	2181	group(g);
1725	2182	} else
1726		- if (event.getSource() == loopItem)
	2183	+ if (source == loopItem \|\| source == loopButton)
1727	2184	{
1728	2185	Composite csg = new GroupLeaf();
1729	2186	csg.count = 5;
1730	2187	group(csg);
1731		- Composite child = new cGroup();
	2188	+ Composite child = new cGroup("Branch");
1732	2189	csg.addChild(child);
1733	2190	child.addChild(csg);
1734	2191	} else
1735		- if (event.getSource() == doubleItem)
	2192	+ if (source == doubleItem)
1736	2193	{
1737		- Composite csg = new GroupLeaf();
	2194	+ Composite csg = new GroupLeaf("Fork");
1738	2195	csg.count = 5;
1739	2196	group(csg);
1740		- Composite child = new cGroup();
	2197	+ Composite child = new cGroup("Branch A");
1741	2198	csg.addChild(child);
1742	2199	child.addChild(csg);
1743		- child = new cGroup();
	2200	+ child = new cGroup("Branch B");
1744	2201	csg.addChild(child);
1745	2202	child.addChild(csg);
1746	2203	} else
1747		- if (event.getSource() == tripleItem)
	2204	+ if (source == tripleItem)
1748	2205	{
1749		- Composite csg = new GroupLeaf();
	2206	+ Composite csg = new GroupLeaf("Trident");
1750	2207	csg.count = 4;
1751	2208	group(csg);
1752	2209	Composite child = new cGroup();
..	..	@@ -1759,73 +2216,98 @@
1759	2216	csg.addChild(child);
1760	2217	child.addChild(csg);
1761	2218	} else
1762		-
1763		- if (event.getSource() == importGFDItem)
	2219	+ if (source == computeAOItem)
1764	2220	{
1765		- ImportGFD();
	2221	+ Globals.drawMode = CameraPane.OCCLUSION;
	2222	+ Globals.theRenderer.repaint();
1766	2223	} else
1767		- if (event.getSource() == importVRMLX3DItem)
1768		- {
1769		- ImportVRMLX3D();
1770		- } else
1771		- if (event.getSource() == import3DSItem)
1772		- {
1773		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1774		- } else
1775		- if (event.getSource() == importOBJItem)
1776		- {
1777		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1778		- } else
1779		- if (event.getSource() == computeAOItem)
1780		- {
1781		- CameraPane.drawMode = CameraPane.OCCLUSION;
1782		- CameraPane.theRenderer.repaint();
1783		- } else
1784		- if (event.getSource() == recompileItem)
	2224	+ if (source == recompileItem)
1785	2225	{
1786	2226	Recompile();
1787	2227	refreshContents();
1788	2228	} else
1789		- if (event.getSource() == editScriptItem)
	2229	+ if (source == editScriptItem)
1790	2230	{
1791	2231	OpenDialog();
1792	2232	refreshContents();
1793	2233	} else
1794		- if (event.getSource() == invariantsItem)
	2234	+ if (source == invariantsItem)
1795	2235	{
1796	2236	System.out.println("Invariants:");
1797		- GrafreeD.grafreeD.universe.invariants();
	2237	+ Grafreed.grafreeD.universe.invariants();
1798	2238	} else
1799		- if (event.getSource() == memoryItem)
	2239	+ if (source == memoryItem)
1800	2240	{
1801	2241	//System.out.println("Invariants:");
1802	2242	PrintMemory();
1803	2243	} else
1804		- if (event.getSource() == pathItem)
	2244	+ if (source == pathItem)
1805	2245	{
1806	2246	PrintPath();
1807	2247	} else
1808		- if (event.getSource() == analyzeItem)
	2248	+ if (source == analyzeItem)
1809	2249	{
1810	2250	AnalyzeObject();
1811	2251	} else
1812		- if (event.getSource() == dumpItem)
	2252	+ if (source == dumpItem)
1813	2253	{
1814	2254	DumpObject();
1815	2255	} else
1816		- if (event.getSource() == screenfitButton)
	2256	+ if (source == minButton)
1817	2257	{
1818		- //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	+ {
1819	2303	ScreenFit();
1820	2304	} else
1821		- if (event.getSource() == screenfitpointButton)
	2305	+ if (source == screenfitpointButton)
1822	2306	{
1823		- //Reload(lastConverter, lastFilename, true);
1824	2307	ScreenFitPoint();
1825	2308	} else
1826		- if (event.getSource() == snapobjectButton)
	2309	+ if (source == snapobjectButton)
1827	2310	{
1828		- //Reload(lastConverter, lastFilename, true);
1829	2311	SnapObject();
1830	2312	} else
1831	2313	// if (event.getSource() == recompileButton)
..	..	@@ -1834,13 +2316,13 @@
1834	2316	// Recompile();
1835	2317	// refreshContents();
1836	2318	// } else
1837		- if (event.getSource() == gcButton)
	2319	+ if (source == gcButton)
1838	2320	{
1839	2321	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1840	2322	System.gc();
1841	2323	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1842	2324	} else
1843		- if (event.getSource() == editLeafItem)
	2325	+ if (source == editLeafItem)
1844	2326	{
1845	2327	Object3D obj;
1846	2328	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1854,62 +2336,74 @@
1854	2336	}
1855	2337	refreshContents(true);
1856	2338	} else
1857		- if (event.getSource() == openWindowItem)
	2339	+ if (source == openWindowItem)
1858	2340	{
1859	2341	EditSelection(true);
1860	2342	} else
1861		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2343	+ if (source == cutItem \|\| source == clearButton)
1862	2344	{
1863	2345	loadClipboard(true);
1864	2346	} else
1865		- if (event.getSource() == duplicateItem)
	2347	+ if (source == undoItem)
1866	2348	{
1867		- Object3D keep = GrafreeD.clipboard;
	2349	+ Undo();
	2350	+ } else
	2351	+ if (source == redoItem)
	2352	+ {
	2353	+ Redo();
	2354	+ } else
	2355	+ if (source == duplicateItem)
	2356	+ {
	2357	+ Object3D keep = Grafreed.clipboard;
1868	2358	loadClipboard(false);
1869	2359	paste(false);
1870		- GrafreeD.clipboard = keep;
	2360	+ Grafreed.clipboard = keep;
1871	2361	} else
1872		- if (event.getSource() == cloneItem)
	2362	+ if (source == cloneItem)
1873	2363	{
1874	2364	CloneSelection(false);
1875	2365	} else
1876		- if (event.getSource() == cloneSupportItem)
	2366	+ if (source == cloneSupportItem)
1877	2367	{
1878	2368	CloneSelection(true);
1879	2369	} else
1880		- if (event.getSource() == copyItem)
	2370	+ if (source == copyItem)
1881	2371	{
1882	2372	loadClipboard(false);
1883	2373	} else
1884		- if (event.getSource() == pasteItem)
	2374	+ if (source == pasteItem)
1885	2375	{
1886	2376	paste(false);
1887	2377	} else
1888		- if (event.getSource() == pasteLinkItem)
	2378	+ if (source == pasteIntoItem)
1889	2379	{
1890		- pasteInto(false);
	2380	+ pasteInto(true, false);
1891	2381	} else
1892		- if (event.getSource() == pasteCloneItem)
	2382	+ if (source == pasteLinkItem)
1893	2383	{
1894		- pasteInto(true);
	2384	+ pasteInto(false, false);
1895	2385	} else
1896		- if (event.getSource() == pasteExpandItem)
	2386	+ if (source == pasteCloneItem)
	2387	+ {
	2388	+ pasteInto(true, true);
	2389	+ } else
	2390	+ if (source == pasteExpandItem)
1897	2391	{
1898	2392	paste(true);
1899	2393	} else
1900		- if (event.getSource() == synchronizeItem)
	2394	+ if (source == synchronizeItem)
1901	2395	{
1902	2396	Overwrite(Object3D.TRANSFORM);
1903	2397	} else
1904		- if (event.getSource() == overwriteNameItem)
	2398	+ if (source == overwriteNameItem)
1905	2399	{
1906	2400	Overwrite(Object3D.NAME);
1907	2401	} else
1908		- if (event.getSource() == overwriteUVItem)
	2402	+ if (source == overwriteUVItem)
1909	2403	{
1910	2404	Overwrite(Object3D.UV);
1911	2405	} else
1912		- if (event.getSource() == overwriteMatItem)
	2406	+ if (source == overwriteMatItem)
1913	2407	{
1914	2408	/* july 2015
1915	2409	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1929,7 +2423,7 @@
1929	2423
1930	2424	Overwrite(dropAttributes);
1931	2425	}
1932		- if (event.getSource() == overwriteGeoItem)
	2426	+ if (source == overwriteGeoItem)
1933	2427	{
1934	2428	Overwrite(Object3D.GEOMETRY);
1935	2429	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1946,7 +2440,7 @@
1946	2440	// refreshContents();
1947	2441	// }
1948	2442	} else
1949		- if (event.getSource() == generateMeshItem)
	2443	+ if (source == generateMeshItem)
1950	2444	{
1951	2445	//if (group.selection.size() == 1)
1952	2446	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1957,7 +2451,7 @@
1957	2451	ResetModel();
1958	2452	refreshContents();
1959	2453	} else
1960		- if (event.getSource() == extractGeometriesItem)
	2454	+ if (source == extractGeometriesItem)
1961	2455	{
1962	2456	boolean one = false;
1963	2457
..	..	@@ -1984,7 +2478,7 @@
1984	2478	ResetModel();
1985	2479	refreshContents();
1986	2480	} else
1987		- if (event.getSource() == cloneGeometriesItem)
	2481	+ if (source == cloneGeometriesItem)
1988	2482	{
1989	2483	boolean one = false;
1990	2484
..	..	@@ -2010,7 +2504,7 @@
2010	2504	ResetModel();
2011	2505	refreshContents();
2012	2506	} else
2013		- if (event.getSource() == shareGeometriesItem)
	2507	+ if (source == shareGeometriesItem)
2014	2508	{
2015	2509	boolean one = false;
2016	2510
..	..	@@ -2040,7 +2534,7 @@
2040	2534	refreshContents();
2041	2535	}
2042	2536	} else
2043		- if (event.getSource() == mergeGeometriesItem)
	2537	+ if (source == mergeGeometriesItem)
2044	2538	{
2045	2539	boolean one = false;
2046	2540
..	..	@@ -2070,7 +2564,7 @@
2070	2564	ResetModel();
2071	2565	refreshContents();
2072	2566	} else
2073		- if (event.getSource() == linkverticesItem)
	2567	+ if (source == linkverticesItem)
2074	2568	{
2075	2569	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2076	2570	// {
..	..	@@ -2083,48 +2577,48 @@
2083	2577	// group.selection.get(0).setMasterThis(content); // should be identity
2084	2578	// refreshContents();
2085	2579	// }
2086		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2580	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2087	2581	{
2088		- Object3D content = GrafreeD.clipboard.get(0);
	2582	+ Object3D content = Grafreed.clipboard.get(0);
2089	2583
2090	2584	if (content instanceof cGroup && ((cGroup)content).transientlink )
2091	2585	content = ((cGroup)content).get(0);
2092	2586
2093		- 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));
2094	2588	for (int i=0; i<group.selection.size(); i++)
2095	2589	{
2096		- boolean random = CameraPane.RANDOM;
2097		- CameraPane.RANDOM = false; // parse all random nodes
	2590	+ boolean random = CameraPane.SWITCH;
	2591	+ CameraPane.SWITCH = false; // parse all random nodes
2098	2592	group.selection.get(i).linkVerticesThis(content);
2099	2593	// group.selection.get(i).setMasterThis(content); // should be identity
2100		- CameraPane.RANDOM = random;
	2594	+ CameraPane.SWITCH = random;
2101	2595	}
2102		- 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));
2103	2597	refreshContents();
2104	2598	}
2105	2599	} else
2106		- if (event.getSource() == resetsupportItem)
	2600	+ if (source == resetsupportItem)
2107	2601	{
2108	2602	for (int i=0; i<group.selection.size(); i++)
2109	2603	{
2110		- boolean random = CameraPane.RANDOM;
2111		- CameraPane.RANDOM = false; // parse all random nodes
	2604	+ boolean random = CameraPane.SWITCH;
	2605	+ CameraPane.SWITCH = false; // parse all random nodes
2112	2606	group.selection.get(i).linkVerticesThis(null);
2113		- CameraPane.RANDOM = random;
	2607	+ CameraPane.SWITCH = random;
2114	2608	}
2115	2609
2116	2610	refreshContents();
2117	2611	} else
2118		- if (event.getSource() == relinkverticesItem)
	2612	+ if (source == relinkverticesItem)
2119	2613	{
2120		- boolean random = CameraPane.RANDOM;
2121		- CameraPane.RANDOM = false; // parse all random nodes
	2614	+ boolean random = CameraPane.SWITCH;
	2615	+ CameraPane.SWITCH = false; // parse all random nodes
2122	2616	group.selection.RelinkToSupport();
2123		- CameraPane.RANDOM = random;
	2617	+ CameraPane.SWITCH = random;
2124	2618
2125	2619	refreshContents();
2126	2620	} else
2127		- if (event.getSource() == resetreferencesItem)
	2621	+ if (source == resetreferencesItem)
2128	2622	{
2129	2623	for (int i=0; i<group.selection.size(); i++)
2130	2624	{
..	..	@@ -2133,11 +2627,11 @@
2133	2627
2134	2628	refreshContents();
2135	2629	} else
2136		- if (event.getSource() == setMasterItem)
	2630	+ if (source == setMasterItem)
2137	2631	{
2138		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2632	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2139	2633	{
2140		- Object3D content = GrafreeD.clipboard.get(0);
	2634	+ Object3D content = Grafreed.clipboard.get(0);
2141	2635
2142	2636	if (content instanceof cGroup && ((cGroup)content).transientlink )
2143	2637	content = ((cGroup)content).get(0);
..	..	@@ -2146,13 +2640,13 @@
2146	2640	refreshContents();
2147	2641	}
2148	2642	} else
2149		- if (event.getSource() == poseMeshItem)
	2643	+ if (source == poseMeshItem)
2150	2644	{
2151	2645	if (group.selection.size() == 1)
2152	2646	{
2153		- if (GrafreeD.clipboard.size() == 1)
	2647	+ if (Grafreed.clipboard.size() == 1)
2154	2648	{
2155		- Object3D content = GrafreeD.clipboard.get(0);
	2649	+ Object3D content = Grafreed.clipboard.get(0);
2156	2650
2157	2651	if (content instanceof cGroup && ((cGroup)content).transientlink )
2158	2652	content = ((cGroup)content).get(0);
..	..	@@ -2165,19 +2659,19 @@
2165	2659	}
2166	2660
2167	2661	} else
2168		- if (event.getSource() == revertMeshItem)
	2662	+ if (source == revertMeshItem)
2169	2663	{
2170	2664	RevertMeshes();
2171	2665	} else
2172		- if (event.getSource() == resetMeshItem)
	2666	+ if (source == resetAllItem)
2173	2667	{
2174	2668	ResetAll();
2175	2669	} else
2176		- if (event.getSource() == stepAllItem)
	2670	+ if (source == stepAllItem)
2177	2671	{
2178	2672	StepAll();
2179	2673	} else
2180		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2674	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2181	2675	{
2182	2676	//int indices[] = jList.getSelectedIndices();
2183	2677	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2185,46 +2679,46 @@
2185	2679
2186	2680	ClearSelection(false);
2187	2681	} else
2188		- if (event.getSource() == clearAllItem)
	2682	+ if (source == clearAllItem)
2189	2683	{
2190	2684	ClearSelection(true);
2191	2685	} else
2192		- if (event.getSource() == grabItem)
	2686	+ if (source == grabItem \|\| source == groupButton)
2193	2687	{
2194		- group(new cGroup(), true);
	2688	+ group(new cGroup(), false); // true);
2195	2689	} else
2196		- if (event.getSource() == hideItem)
	2690	+ if (source == hideItem)
2197	2691	{
2198	2692	group(new HiddenObject());
2199	2693	} else
2200		- if (event.getSource() == frontItem)
	2694	+ if (source == frontItem)
2201	2695	{
2202	2696	front();
2203	2697	} else
2204		- if (event.getSource() == backItem)
	2698	+ if (source == backItem)
2205	2699	{
2206	2700	back();
2207	2701	} else
2208		- if (event.getSource() == cameraItem)
	2702	+ if (source == cameraItem)
2209	2703	{
2210	2704	makeSomething(new Camera());
2211	2705	} else
2212		- if (event.getSource() == compositeItem)
	2706	+ if (source == compositeItem \|\| source == compositeButton)
2213	2707	{
2214	2708	group(new Composite());
2215	2709	} else
2216		- if (event.getSource() == randomItem)
	2710	+ if (source == switchItem \|\| source == switchButton)
2217	2711	{
2218	2712	RandomNode random = new RandomNode();
2219	2713	group(random);
2220	2714	if (random.size() > 0)
2221		- random.name = random.get(0).name + "Rnd";
	2715	+ random.name = random.get(0).name + "Switch";
2222	2716	} else
2223		- if (event.getSource() == physicsItem)
	2717	+ if (source == physicsItem)
2224	2718	{
2225	2719	group(new PhysicsNode());
2226	2720	} else
2227		- if (event.getSource() == frameselectorItem)
	2721	+ if (source == frameselectorItem)
2228	2722	{
2229	2723	for (int i=0; i<group.selection.size(); i++)
2230	2724	{
..	..	@@ -2236,7 +2730,7 @@
2236	2730	ResetModel();
2237	2731	refreshContents();
2238	2732	} else
2239		- if (event.getSource() == switchGeoItem)
	2733	+ if (source == switchGeoItem)
2240	2734	{
2241	2735	for (int i=0; i<group.selection.size(); i++)
2242	2736	{
..	..	@@ -2248,7 +2742,7 @@
2248	2742	ResetModel();
2249	2743	refreshContents();
2250	2744	} else
2251		- if (event.getSource() == switchTransfoItem)
	2745	+ if (source == switchTransfoItem)
2252	2746	{
2253	2747	for (int i=0; i<group.selection.size(); i++)
2254	2748	{
..	..	@@ -2260,7 +2754,7 @@
2260	2754	ResetModel();
2261	2755	refreshContents();
2262	2756	} else
2263		- if (event.getSource() == morphItem)
	2757	+ if (source == morphItem)
2264	2758	{
2265	2759	for (int i=0; i<group.selection.size(); i++)
2266	2760	{
..	..	@@ -2272,7 +2766,7 @@
2272	2766	ResetModel();
2273	2767	refreshContents();
2274	2768	} else
2275		- if (event.getSource() == scriptNodeItem)
	2769	+ if (source == scriptNodeItem)
2276	2770	{
2277	2771	boolean atleastone = false;
2278	2772
..	..	@@ -2311,215 +2805,252 @@
2311	2805	}
2312	2806	}
2313	2807	} else
2314		- if (event.getSource() == linkerItem)
	2808	+ if (source == linkerItem)
2315	2809	{
2316	2810	group(new cLinker());
2317	2811	} else
2318		- if (event.getSource() == textureItem)
	2812	+ if (source == textureItem \|\| source == textureButton)
2319	2813	{
2320	2814	group(new TextureNode());
2321	2815	} else
2322		- if (event.getSource() == billboardItem)
	2816	+ if (source == billboardItem)
2323	2817	{
2324	2818	group(new BillboardNode());
2325	2819	} else
2326		- if (event.getSource() == shadowXItem)
	2820	+ if (source == shadowXItem)
2327	2821	{
2328	2822	CastShadow(0);
2329	2823	} else
2330		- if (event.getSource() == shadowYItem)
	2824	+ if (source == shadowYItem)
2331	2825	{
2332	2826	CastShadow(1);
2333	2827	} else
2334		- if (event.getSource() == shadowZItem)
	2828	+ if (source == shadowZItem)
2335	2829	{
2336	2830	CastShadow(2);
2337	2831	} else
2338		- if (event.getSource() == ungroupItem)
	2832	+ if (source == ungroupItem \|\| source == ungroupButton)
2339	2833	{
2340		- //ungroup();
	2834	+ boolean hasRoot = false;
	2835	+
2341	2836	for (int i=0; i<group.selection.size(); i++)
2342	2837	{
2343		- Ungroup(group.selection.get(i));
	2838	+ if (group.selection.get(i) == group)
	2839	+ {
	2840	+ hasRoot = true;
	2841	+ break;
	2842	+ }
2344	2843	}
2345	2844
2346		- ClearSelection(false);
2347		-
2348		- refreshContents();
	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	+ }
2349	2856	} else
2350		- if (event.getSource() == genUVItem)
	2857	+ if (source == genUVItem)
2351	2858	{
2352	2859	GenUV();
2353	2860	} else
2354		- if (event.getSource() == genNormalsCADItem)
	2861	+ if (source == genNormalsCADItem)
2355	2862	{
2356	2863	GenNormals(true);
2357	2864	} else
2358		- if (event.getSource() == genNormalsMESHItem)
	2865	+ if (source == genNormalsMESHItem)
2359	2866	{
2360		- GenNormals(true); // TODO
	2867	+ GenNormalsMESH();
2361	2868	} else
2362		- if (event.getSource() == genNormalsORGANItem)
	2869	+ if (source == genNormalsORGANItem)
2363	2870	{
2364	2871	GenNormals(false);
2365	2872	} else
2366		- if (event.getSource() == genNormalsMINEItem)
	2873	+ if (source == genNormalsMINEItem)
2367	2874	{
2368	2875	GenNormalsMINE();
2369	2876	} else
2370		- if (event.getSource() == stripifyItem)
	2877	+ if (source == stripifyItem)
2371	2878	{
2372	2879	Stripify();
2373	2880	} else
2374		- if (event.getSource() == unstripifyItem)
	2881	+ if (source == unstripifyItem)
2375	2882	{
2376	2883	Unstripify();
2377	2884	} else
2378		- if (event.getSource() == trimItem)
	2885	+ if (source == trimItem)
2379	2886	{
2380	2887	Trim();
2381	2888	} else
2382		- if (event.getSource() == untrimItem)
	2889	+ if (source == untrimItem)
2383	2890	{
2384	2891	Untrim();
2385	2892	} else
2386		- if (event.getSource() == clearColorsItem)
	2893	+ if (source == clearColorsItem)
2387	2894	{
2388	2895	ClearColors();
2389	2896	} else
2390		- if (event.getSource() == clearMaterialsItem)
	2897	+ if (source == clearMaterialsItem)
2391	2898	{
2392	2899	ClearMaterials();
2393	2900	} else
2394		- if (event.getSource() == liveleavesItem)
	2901	+ if (source == liveleavesItem)
2395	2902	{
2396	2903	LiveLeaves(true);
2397	2904	} else
2398		- if (event.getSource() == unliveleavesItem)
	2905	+ if (source == unliveleavesItem)
2399	2906	{
2400	2907	LiveLeaves(false);
2401	2908	} else
2402		- if (event.getSource() == supportleavesItem)
	2909	+ if (source == supportleavesItem)
2403	2910	{
2404	2911	SupportLeaves(true);
2405	2912	} else
2406		- if (event.getSource() == unsupportleavesItem)
	2913	+ if (source == unsupportleavesItem)
2407	2914	{
2408	2915	SupportLeaves(false);
2409	2916	} else
2410		- if (event.getSource() == hideleavesItem)
	2917	+ if (source == hideleavesItem)
2411	2918	{
2412	2919	HideLeaves(true);
2413	2920	} else
2414		- if (event.getSource() == showleavesItem)
	2921	+ if (source == showleavesItem)
2415	2922	{
2416	2923	HideLeaves(false);
2417	2924	} else
2418		- if (event.getSource() == markleavesItem)
	2925	+ if (source == markleavesItem)
2419	2926	{
2420	2927	MarkLeaves(true);
2421	2928	} else
2422		- if (event.getSource() == unmarkleavesItem)
	2929	+ if (source == unmarkleavesItem)
2423	2930	{
2424	2931	MarkLeaves(false);
2425	2932	} else
2426		- 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)
2427	2950	{
2428	2951	FlipV(true);
2429	2952	} else
2430		- if (event.getSource() == unflipVItem)
	2953	+ if (source == unflipVItem)
2431	2954	{
2432	2955	FlipV(false);
2433	2956	} else
2434		- if (event.getSource() == lowTexturesItem)
	2957	+ if (source == lowTexturesItem)
2435	2958	{
2436	2959	SetTexRes(0);
2437	2960	} else
2438		- if (event.getSource() == normalTexturesItem)
	2961	+ if (source == normalTexturesItem)
2439	2962	{
2440	2963	SetTexRes(1);
2441	2964	} else
2442		- if (event.getSource() == highTexturesItem)
	2965	+ if (source == highTexturesItem)
2443	2966	{
2444	2967	SetTexRes(2);
2445	2968	} else
2446		- if (event.getSource() == veryhighTexturesItem)
	2969	+ if (source == veryhighTexturesItem)
2447	2970	{
2448	2971	SetTexRes(3);
2449	2972	} else
2450		- if (event.getSource() == maxTexturesItem)
	2973	+ if (source == maxTexturesItem)
2451	2974	{
2452	2975	SetTexRes(4);
2453	2976	} else
2454		- if (event.getSource() == panoTexturesItem)
	2977	+ if (source == panoTexturesItem)
2455	2978	{
2456	2979	SetTexRes(5);
2457	2980	} else
2458		- if (event.getSource() == reverseNormalsItem)
	2981	+ if (source == reverseNormalsItem)
2459	2982	{
2460	2983	ReverseNormals();
2461	2984	} else
2462		- if (event.getSource() == parseverticesItem)
	2985	+ if (source == parseverticesItem)
2463	2986	{
2464	2987	ParseVertices();
2465	2988	} else
2466		- if (event.getSource() == textureFieldItem)
	2989	+ if (source == textureFieldItem)
2467	2990	{
2468	2991	TextureVertices();
2469	2992	} else
2470		- if (event.getSource() == alignItem)
	2993	+ if (source == alignItem)
2471	2994	{
2472	2995	Align();
2473	2996	} else
2474		- if (event.getSource() == mirrorItem)
	2997	+ if (source == mirrorItem)
2475	2998	{
2476	2999	MirrorPoses();
2477	3000	} else
2478		- if (event.getSource() == reduceMorphItem)
	3001	+ if (source == reduceMorphItem)
2479	3002	{
2480	3003	MeshReduction(false);
2481	3004	} else
2482		- if (event.getSource() == reduce34MorphItem)
	3005	+ if (source == reduce34MorphItem)
2483	3006	{
2484	3007	MeshReduction(true);
2485	3008	} else
2486		- if (event.getSource() == reverseTrianglesItem)
	3009	+ if (source == reverseTrianglesItem)
2487	3010	{
2488	3011	ReverseTriangles();
2489	3012	} else
2490		- if (event.getSource() == reduceMeshItem)
	3013	+ if (source == reduceMeshItem)
2491	3014	{
2492	3015	ReduceMesh(false);
2493	3016	} else
2494		- if (event.getSource() == reduce34MeshItem)
	3017	+ if (source == reduce34MeshItem)
2495	3018	{
2496	3019	ReduceMesh(true);
2497	3020	} else
2498		- if (event.getSource() == increaseMeshItem)
	3021	+ if (source == increaseMeshItem)
2499	3022	{
2500	3023	IncreaseMesh();
2501	3024	} else
2502		- if (event.getSource() == clipMeshItem)
	3025	+ if (source == clipMeshItem)
2503	3026	{
2504	3027	ClipMesh();
2505	3028	} else
2506		- if (event.getSource() == smoothMeshItem)
	3029	+ if (source == smoothMeshItem)
2507	3030	{
2508	3031	SmoothMesh();
2509	3032	} else
2510		- if (event.getSource() == transformgeometryItem)
	3033	+ if (source == transformGeometryItem)
2511	3034	{
2512	3035	TransformGeometry();
2513	3036	} else
2514		- if (event.getSource() == resetTransformItem)
	3037	+ if (source == transformChildrenItem)
	3038	+ {
	3039	+ TransformChildren();
	3040	+ } else
	3041	+ if (source == resetTransformItem)
2515	3042	{
2516	3043	ResetTransform();
2517	3044	} else
2518		- if (event.getSource() == resetCentroidItem)
	3045	+ if (source == resetCentroidItem)
2519	3046	{
2520		- ResetCentroid();
	3047	+ ResetCentroid(true);
2521	3048	} else
2522		- if (event.getSource() == resetParentItem)
	3049	+ if (source == resetCentroidXZItem)
	3050	+ {
	3051	+ ResetCentroid(false);
	3052	+ } else
	3053	+ if (source == resetParentItem)
2523	3054	{
2524	3055	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2525	3056	{
..	..	@@ -2529,7 +3060,7 @@
2529	3060
2530	3061	refreshContents();
2531	3062	} else
2532		- if (event.getSource() == repairParentItem)
	3063	+ if (source == repairParentItem)
2533	3064	{
2534	3065	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2535	3066	{
..	..	@@ -2543,7 +3074,21 @@
2543	3074
2544	3075	refreshContents();
2545	3076	} else
2546		- 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)
2547	3092	{
2548	3093	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2549	3094	{
..	..	@@ -2555,7 +3100,7 @@
2555	3100	ResetModel();
2556	3101	refreshContents();
2557	3102	} else
2558		- if (event.getSource() == sortbynameItem)
	3103	+ if (source == sortbynameItem)
2559	3104	{
2560	3105	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2561	3106	{
..	..	@@ -2567,7 +3112,7 @@
2567	3112	ResetModel();
2568	3113	refreshContents();
2569	3114	} else
2570		- if (event.getSource() == attachPigmentItem)
	3115	+ if (source == attachPigmentItem)
2571	3116	{
2572	3117	String texture = GetFile("Attach pigment");
2573	3118	Object3D obj;
..	..	@@ -2579,7 +3124,7 @@
2579	3124
2580	3125	refreshContents();
2581	3126	} else
2582		- if (event.getSource() == detachPigmentItem)
	3127	+ if (source == detachPigmentItem)
2583	3128	{
2584	3129	Object3D obj;
2585	3130	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2590,7 +3135,7 @@
2590	3135
2591	3136	refreshContents();
2592	3137	} else
2593		- if (event.getSource() == attachBumpItem)
	3138	+ if (source == attachBumpItem)
2594	3139	{
2595	3140	String texture = GetFile("Attach bump");
2596	3141	Object3D obj;
..	..	@@ -2602,18 +3147,18 @@
2602	3147
2603	3148	refreshContents();
2604	3149	} else
2605		- if (event.getSource() == detachBumpItem)
	3150	+ if (source == detachBumpItem)
2606	3151	{
2607	3152	Object3D obj;
2608	3153	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2609	3154	{
2610	3155	obj = (Object3D)e.nextElement();
2611		- obj.SetBumpTexture(null);
	3156	+ obj.ResetBumpTexture();
2612	3157	}
2613	3158
2614	3159	refreshContents();
2615	3160	} else
2616		- if (event.getSource() == pigmentBumpItem)
	3161	+ if (source == pigmentBumpItem)
2617	3162	{
2618	3163	Object3D obj;
2619	3164	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2624,158 +3169,237 @@
2624	3169
2625	3170	refreshContents();
2626	3171	} else
2627		- if (event.getSource() == flashSelectionButton)
	3172	+ if (source == flashSelectionButton)
2628	3173	{
2629	3174	CameraPane.flash = true;
2630	3175	refreshContents();
2631	3176	} else
2632		- if (event.getSource() == oneButton)
	3177	+ if (source == oneButton)
2633	3178	{
2634	3179	} else
2635		- if (event.getSource() == twoButton)
	3180	+ if (source == twoButton)
2636	3181	{
2637	3182	radio.layout = twoButton;
	3183	+
	3184	+ if (CameraPane.FULLSCREEN)
	3185	+ fullscreenLayout = radio.layout;
	3186	+
2638	3187	// bug
2639	3188	//gridPanel.setDividerLocation(1.0);
2640	3189	//bigPanel.setDividerLocation(0.0);
2641		- bigThree.remove(scenePanel);
2642		- bigThree.remove(cameraPanel);
2643		- bigThree.remove(XYZPanel);
2644		- aWindowConstraints.gridx = 0;
2645		- aWindowConstraints.gridy = 0;
2646		- aWindowConstraints.gridwidth = 1;
2647		- // aConstraints.gridheight = 3;
2648		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2649		- aWindowConstraints.weightx = 0;
2650		- aWindowConstraints.weighty = 1;
2651		- //bigThree.add(jtp, aWindowConstraints);
2652		- aWindowConstraints.weightx = 1;
2653		- aWindowConstraints.gridwidth = 3;
2654		- // aConstraints.gridheight = 3;
2655		- aWindowConstraints.gridx = 1;
2656		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2657		- bigThree.add(cameraPanel, aWindowConstraints);
2658		- aWindowConstraints.weightx = 0;
2659		- aWindowConstraints.gridx = 4;
2660		- aWindowConstraints.gridwidth = 1;
2661		- // aConstraints.gridheight = 3;
2662		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2663		- //bigThree.add(XYZPanel, aWindowConstraints);
2664		- bigThree.revalidate();
	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	+
2665	3237	} else
2666		- if (event.getSource() == threeButton)
	3238	+ if (source == threeButton)
2667	3239	{
2668	3240	radio.layout = threeButton;
2669		- bigThree.remove(scenePanel);
2670		- bigThree.remove(cameraPanel);
2671		- bigThree.remove(XYZPanel);
2672		- aWindowConstraints.gridx = 0;
2673		- aWindowConstraints.gridy = 0;
2674		- aWindowConstraints.gridwidth = 1;
2675		- // aConstraints.gridheight = 3;
2676		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2677		- aWindowConstraints.weightx = 0;
2678		- aWindowConstraints.weighty = 1;
2679		- //bigThree.add(jtp, aWindowConstraints);
2680		- aWindowConstraints.weightx = 1;
2681		- aWindowConstraints.gridwidth = 3;
2682		- // aConstraints.gridheight = 3;
2683		- aWindowConstraints.gridx = 1;
2684		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2685		- bigThree.add(cameraPanel, aWindowConstraints);
2686		- aWindowConstraints.weightx = 0;
2687		- aWindowConstraints.gridx = 4;
2688		- aWindowConstraints.gridwidth = 1;
2689		- // aConstraints.gridheight = 3;
2690		- aConstraints.fill = GridBagConstraints.VERTICAL;
2691		- bigThree.add(XYZPanel, aWindowConstraints);
2692		- bigThree.revalidate();
	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();
2693	3278	} else
2694		- if (event.getSource() == fourButton)
	3279	+ if (source == fourButton)
2695	3280	{
2696	3281	radio.layout = fourButton;
2697		- bigThree.remove(scenePanel);
2698		- bigThree.remove(cameraPanel);
2699		- bigThree.remove(XYZPanel);
2700		- aWindowConstraints.gridx = 0;
2701		- aWindowConstraints.gridy = 0;
2702		- aWindowConstraints.gridwidth = 1;
2703		- // aWindowConstraints.gridheight = 3;
2704		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2705		- aWindowConstraints.weightx = 1;
2706		- aWindowConstraints.weighty = 1;
2707		- bigThree.add(scenePanel, aWindowConstraints);
2708		- aWindowConstraints.weightx = 1;
2709		- aWindowConstraints.gridwidth = 3;
2710		- // aConstraints.gridheight = 3;
2711		- aWindowConstraints.gridx = 1;
2712		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2713		- //bigThree.add(cameraPanel, aWindowConstraints);
2714		- aWindowConstraints.weightx = 0;
2715		- aWindowConstraints.gridx = 4;
2716		- aWindowConstraints.gridwidth = 1;
2717		- // aWindowConstraints.gridheight = 3;
2718		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2719		- //bigThree.add(XYZPanel, aWindowConstraints);
2720		- bigThree.revalidate();
	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();
2721	3318	} else
2722		- if (event.getSource() == sixButton)
	3319	+ if (source == sixButton)
2723	3320	{
2724	3321	radio.layout = sixButton;
2725		- bigThree.remove(scenePanel);
2726		- bigThree.remove(cameraPanel);
2727		- bigThree.remove(XYZPanel);
2728		- aWindowConstraints.gridx = 0;
2729		- aWindowConstraints.gridy = 0;
2730		- aWindowConstraints.gridwidth = 1;
2731		- // aConstraints.gridheight = 3;
2732		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2733		- aWindowConstraints.weightx = 0;
2734		- aWindowConstraints.weighty = 1;
2735		- bigThree.add(scenePanel, aWindowConstraints);
2736		- aWindowConstraints.weightx = 1;
2737		- aWindowConstraints.gridwidth = 3;
2738		- // aWindowConstraints.gridheight = 3;
2739		- aWindowConstraints.gridx = 1;
2740		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2741		- bigThree.add(cameraPanel, aWindowConstraints);
2742		- aWindowConstraints.weightx = 0;
2743		- aWindowConstraints.gridx = 4;
2744		- aWindowConstraints.gridwidth = 1;
2745		- // aWindowConstraints.gridheight = 3;
2746		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2747		- //bigThree.add(XYZPanel, aConstraints);
2748		- bigThree.revalidate();
	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();
2749	3359	} else
2750		- if (event.getSource() == sevenButton)
	3360	+ if (source == sevenButton)
2751	3361	{
2752	3362	radio.layout = sevenButton;
2753		- bigThree.remove(scenePanel);
2754		- bigThree.remove(cameraPanel);
2755		- bigThree.remove(XYZPanel);
2756		- aWindowConstraints.gridx = 0;
2757		- aWindowConstraints.gridy = 0;
2758		- aWindowConstraints.gridwidth = 1;
2759		- // aWindowConstraints.gridheight = 3;
2760		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2761		- aWindowConstraints.weightx = 0;
2762		- aWindowConstraints.weighty = 1;
2763		- bigThree.add(scenePanel, aWindowConstraints);
2764		- aWindowConstraints.weightx = 1;
2765		- aWindowConstraints.gridwidth = 3;
2766		- // aWindowConstraints.gridheight = 3;
2767		- aWindowConstraints.gridx = 1;
2768		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2769		- bigThree.add(cameraPanel, aWindowConstraints);
2770		- aWindowConstraints.weightx = 0;
2771		- aWindowConstraints.gridx = 4;
2772		- aWindowConstraints.gridwidth = 1;
2773		- // aConstraints.gridheight = 3;
2774		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2775		- bigThree.add(XYZPanel, aWindowConstraints);
2776		- bigThree.revalidate();
	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();
2777	3401	} else
2778		- if (event.getSource() == rootButton)
	3402	+ if (source == rootButton)
2779	3403	{
2780	3404	Object3D obj;
2781	3405	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2785,66 +3409,84 @@
2785	3409	EditObject(obj);
2786	3410	}
2787	3411
	3412	+ cameraView.requestFocusInWindow();
2788	3413	refreshContents(true);
2789	3414	} else
2790		- if (event.getSource() == closeButton)
	3415	+ if (source == closeButton)
2791	3416	{
2792	3417	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2793	3418	cRadio ab;
2794	3419	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2795	3420	{
2796	3421	ab = (cRadio)e.nextElement();
2797		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3422	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2798	3423	{
	3424	+ // Patch to avoid bug with transparency.
	3425	+ if (!ab.hadMaterial)
	3426	+ {
	3427	+ ab.object.material = null;
	3428	+ }
	3429	+
2799	3430	buttonGroup.remove(ab);
2800	3431	radioPanel.remove(ab);
2801	3432
2802		- ab.GetObject().editWindow = null;
	3433	+ //ab.GetObject().editWindow = null;
	3434	+ ab.GetObject().manipWindow = null;
2803	3435	// ab.GetObject().objectUI = null; // ?????????
2804	3436
2805	3437	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2806	3438	break;
2807	3439	}
2808	3440	}
	3441	+
	3442	+ cameraView.requestFocusInWindow();
2809	3443	refreshContents(true);
2810	3444	} else
2811		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3445	+ if (source == editItem \|\| source == editButton)
2812	3446	{
	3447	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3448	+ {
	3449	+ Object3D child = (Object3D)e.nextElement();
	3450	+ child.pinned = true;
	3451	+ }
	3452	+
2813	3453	EditSelection(false);
2814	3454	} else
2815		- if (event.getSource() == uneditButton)
	3455	+ if (source == uneditButton)
2816	3456	{
2817	3457	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2818	3458	{
2819	3459	Object3D child = (Object3D)e.nextElement();
2820	3460	if(child.editWindow != null)
2821	3461	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3462	+ child.pinned = false;
2822	3463	child.CloseUI();
2823	3464	listUI.remove(child);
2824	3465
2825		- child.editWindow = null; // ???????????
	3466	+ //child.editWindow = null; // ???????????
2826	3467	}
2827		- objEditor.ctrlPanel.revalidate();
	3468	+ objEditor.ctrlPanel.FlushUI();
2828	3469	//objEditor.jTree.clearSelection();
2829	3470	//objEditor.ResetSliders();
2830	3471	refreshContents(true);
2831	3472	} else
2832		- if (event.getSource() == clearPanelButton)
	3473	+ if (source == clearPanelButton)
2833	3474	{
2834	3475	assert(copy == group);
2835	3476	//copy.ClearUI();
2836	3477	for (Object3D obj : listUI)
2837	3478	{
	3479	+ obj.pinned = false;
2838	3480	obj.CloseUI();
2839	3481	}
2840	3482	listUI.clear();
2841	3483	refreshContents(true);
2842	3484	} else
2843		- if (event.getSource() == allParamsButton)
	3485	+ if (source == allParamsButton)
2844	3486	{
2845	3487	assert(copy == group);
2846	3488
2847		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3489	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2848	3490
2849	3491	for (Object3D obj : listUI)
2850	3492	{
..	..	@@ -2861,19 +3503,19 @@
2861	3503
2862	3504	refreshContents(true);
2863	3505	} else
2864		- if (event.getSource() == unselectButton)
	3506	+ if (source == unselectButton)
2865	3507	{
2866	3508	objEditor.jTree.clearSelection();
2867	3509	// ?? oct 2012 GrafreeD.clipboard.clear();
2868	3510	objEditor.ResetSliders();
2869	3511	refreshContents(true);
2870	3512	} else
2871		- if(event.getSource() instanceof cRadio)
	3513	+ if(source instanceof cRadio)
2872	3514	{
2873	3515	group.parent = keepparent;
2874	3516	group.attributes = 0;
2875	3517	//group.editWindow = null;
2876		- /cRadio/ radio = (cRadio)event.getSource();
	3518	+ /cRadio/ radio = (cRadio)source;
2877	3519	Object3D obj = radio.GetObject();
2878	3520	System.out.println("Edit " + obj);
2879	3521	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2893,7 +3535,10 @@
2893	3535	}
2894	3536
2895	3537	copy = group;
2896		- //CameraPane.theRenderer.object = group;
	3538	+
	3539	+ SetUndoStates();
	3540	+
	3541	+ //Globals.theRenderer.object = group;
2897	3542	if(!useclient)
2898	3543	{
2899	3544	cameraView.renderCamera = radio.camera;
..	..	@@ -2902,25 +3547,52 @@
2902	3547	cameraView.cameras[cameraView.cameracount] = radio.camera;
2903	3548	cameraView.targetLookAt.set(radio.camera.lookAt);
2904	3549	cameraView.object = group;
2905		- cameraView.lighttouched = true;
	3550	+ //cameraView.lighttouched = true;
	3551	+ Globals.lighttouched = true;
2906	3552	topView.object = group;
2907	3553	frontView.object = group;
2908	3554	sideView.object = group;
2909	3555	}
2910		- group.editWindow = this;
	3556	+
	3557	+// fix "+" issue
	3558	+ //group.editWindow = this;
	3559	+ group.manipWindow = this;
	3560	+
2911	3561	/*
2912	3562	currentLayout = radio.layout;
2913	3563	if (currentLayout == null)
2914	3564	currentLayout = sevenButton;
2915	3565	*/
2916	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);
2917	3574	keepparent = group.parent;
2918	3575	// PARENT = NULL or not???
2919	3576	//group.parent = null; // ROOT
2920	3577	//group.attributes = -1;
2921	3578	ResetModel();
	3579	+
	3580	+ cameraView.requestFocusInWindow();
2922	3581	refreshContents(true);
2923		- }
	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	+ }
2924	3596	else
2925	3597	{
2926	3598	//return super.action(event, arg);
..	..	@@ -2929,7 +3601,6 @@
2929	3601	}
2930	3602
2931	3603	boolean useclient = false;
2932		- cRadio radio;
2933	3604
2934	3605	void ToggleRoot()
2935	3606	{
..	..	@@ -2938,7 +3609,7 @@
2938	3609	if (useclient)
2939	3610	{
2940	3611	cameraView.object = client;
2941		- cameraView.lighttouched = true;
	3612	+ Globals.lighttouched = true;
2942	3613	//topView.object = client;
2943	3614	//frontView.object = client;
2944	3615	//sideView.object = client;
..	..	@@ -2946,7 +3617,7 @@
2946	3617	else
2947	3618	{
2948	3619	cameraView.object = group;
2949		- cameraView.lighttouched = true;
	3620	+ Globals.lighttouched = true;
2950	3621	//topView.object = group;
2951	3622	//frontView.object = group;
2952	3623	//sideView.object = group;
..	..	@@ -2981,6 +3652,28 @@
2981	3652	refreshContents();
2982	3653	}
2983	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	+ }
2984	3677
2985	3678	void ResetTransform()
2986	3679	{
..	..	@@ -3093,7 +3786,7 @@
3093	3786	refreshContents();
3094	3787	}
3095	3788
3096		- void ResetCentroid()
	3789	+ void ResetCentroid(boolean full)
3097	3790	{
3098	3791	Object3D obj;
3099	3792	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3108,12 +3801,16 @@
3108	3801	LA.matIdentity(Object3D.mat);
3109	3802	obj.getBounds(minima, maxima, false);
3110	3803	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3111		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3804	+ if (full)
	3805	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3112	3806	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3113	3807	obj.TransformMesh(Object3D.mat);
	3808	+
3114	3809	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3115		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3810	+ if (full)
	3811	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3116	3812	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3813	+
3117	3814	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3118	3815	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3119	3816	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3142,7 +3839,8 @@
3142	3839
3143	3840	int size = obj.MemorySize();
3144	3841
3145		- 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)");
3146	3844	}
3147	3845	}
3148	3846	catch (Exception e)
..	..	@@ -3179,9 +3877,9 @@
3179	3877	obj = (Object3D)e.nextElement();
3180	3878
3181	3879	System.out.println("Object is: " + obj);
3182		- GrafreeD.AnalyzeObject(obj);
	3880	+ Grafreed.AnalyzeObject(obj);
3183	3881	System.out.println("Boundary rep: " + obj.bRep);
3184		- GrafreeD.AnalyzeObject(obj.bRep);
	3882	+ Grafreed.AnalyzeObject(obj.bRep);
3185	3883
3186	3884	// System.err.println((size/1024) + " KB is the size of " + obj);
3187	3885	}
..	..	@@ -3223,6 +3921,13 @@
3223	3921	void GenNormals(boolean crease)
3224	3922	{
3225	3923	group.GenNormalsS(crease);
	3924	+
	3925	+ refreshContents();
	3926	+ }
	3927	+
	3928	+ void GenNormalsMESH()
	3929	+ {
	3930	+ group.GenNormalsMeshS();
3226	3931
3227	3932	refreshContents();
3228	3933	}
..	..	@@ -3395,8 +4100,8 @@
3395	4100
3396	4101	void ParseVertices()
3397	4102	{
3398		- boolean epsequal = GrafreeD.epsequal;
3399		- GrafreeD.epsequal = true;
	4103	+ boolean epsequal = Grafreed.epsequal;
	4104	+ Grafreed.epsequal = true;
3400	4105
3401	4106	for (int i=0; i<group.selection.size(); i++)
3402	4107	{
..	..	@@ -3421,7 +4126,7 @@
3421	4126	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3422	4127	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3423	4128
3424		- g.add(GrafreeD.clipboard);
	4129	+ g.add(Grafreed.clipboard);
3425	4130
3426	4131	buffer.add(g);
3427	4132	}
..	..	@@ -3436,7 +4141,7 @@
3436	4141	makeSomething(buffer, i==group.selection.size()-1);
3437	4142	}
3438	4143
3439		- GrafreeD.epsequal = epsequal;
	4144	+ Grafreed.epsequal = epsequal;
3440	4145
3441	4146	refreshContents();
3442	4147	}
..	..	@@ -3454,7 +4159,16 @@
3454	4159	String pigment = Object3D.GetPigment(tex);
3455	4160	//String bump = Object3D.GetBump(tex);
3456	4161
3457		- 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	+ }
3458	4172
3459	4173	double s = v.s;
3460	4174
..	..	@@ -3542,11 +4256,11 @@
3542	4256
3543	4257	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3544	4258
3545		- boolean random = CameraPane.RANDOM;
3546		- CameraPane.RANDOM = false; // parse all random nodes
	4259	+ boolean random = CameraPane.SWITCH;
	4260	+ CameraPane.SWITCH = false; // parse all random nodes
3547	4261	lowres.linkVerticesThis(null);
3548	4262	lowres.linkVerticesThis(sn);
3549		- CameraPane.RANDOM = random;
	4263	+ CameraPane.SWITCH = random;
3550	4264
3551	4265	System.err.flush();
3552	4266
..	..	@@ -3586,7 +4300,7 @@
3586	4300	return;
3587	4301
3588	4302	Object3D poses = group.selection.get(0);
3589		- Object3D ref = GrafreeD.clipboard.get(0);
	4303	+ Object3D ref = Grafreed.clipboard.get(0);
3590	4304
3591	4305	Object3D newgroup = new Object3D("Po:" + poses.name);
3592	4306
..	..	@@ -3755,7 +4469,7 @@
3755	4469	group.selection.RelinkToSupport(); // july 2014
3756	4470	System.out.println("DONE.");
3757	4471	refreshContents();
3758		- 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));
3759	4473	}
3760	4474
3761	4475	void ReduceMesh(boolean reduction34)
..	..	@@ -3780,9 +4494,9 @@
3780	4494
3781	4495	void ClipMesh()
3782	4496	{
3783		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4497	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3784	4498	{
3785		- Object3D content = GrafreeD.clipboard.get(0);
	4499	+ Object3D content = Grafreed.clipboard.get(0);
3786	4500
3787	4501	if (content instanceof cGroup && ((cGroup)content).transientlink )
3788	4502	content = ((cGroup)content).get(0);
..	..	@@ -3791,7 +4505,7 @@
3791	4505	// {
3792	4506	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3793	4507	// }
3794		- group.selection.ClipMesh(GrafreeD.clipboard);
	4508	+ group.selection.ClipMesh(Grafreed.clipboard);
3795	4509	}
3796	4510	// group.selection.ClipMesh(GrafreeD.clipboard);
3797	4511	System.out.println("DONE.");
..	..	@@ -3838,6 +4552,18 @@
3838	4552	void MarkLeaves(boolean hide)
3839	4553	{
3840	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);
3841	4567	refreshContents();
3842	4568	}
3843	4569
..	..	@@ -3912,28 +4638,25 @@
3912	4638	// }
3913	4639	// }
3914	4640
3915		- static boolean allparams = true;
3916		-
3917		- static Vector<Object3D> listUI = new Vector<Object3D>();
3918		-
3919	4641	void EditSelection(boolean newWindow)
3920	4642	{
	4643	+ if (group.selection == null)
	4644	+ {
	4645	+ EditElement(group, newWindow); // ? new
	4646	+ return;
	4647	+ }
	4648	+
3921	4649	// aConstraints.gridy = 0;
3922	4650	for (int i=0; i<group.selection.size(); i++)
3923	4651	{
3924	4652	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3925	4653	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3926		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4654	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3927	4655
3928	4656	Object3D elem = (Object3D)group.selection.elementAt(i);
3929		- if(elem != group)
	4657	+ if(elem != group \|\| !newWindow)
3930	4658	{
3931		- // if (!(elem instanceof Composite))
3932		- // newWindow = false;
3933		- listUI.add(elem);
3934		- elem.openEditWindow(this, newWindow); //, false);
3935		- System.out.println("edit : " + elem);
3936		- elem.editWindow.refreshContents(true); // ? new
	4659	+ EditElement(elem, newWindow); // ? new
3937	4660	}
3938	4661	}
3939	4662	}
..	..	@@ -4008,7 +4731,8 @@
4008	4731	//new Exception().printStackTrace();
4009	4732
4010	4733	freezemodel = true;
4011		-
	4734	+ ClearUnpinned();
	4735	+
4012	4736	/**/
4013	4737	//switch (event.id)
4014	4738	{
..	..	@@ -4016,7 +4740,6 @@
4016	4740	//case 702: // Event.LIST_DESELECT
4017	4741	group.deselectAll();
4018	4742	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4019		- objEditor.ClearInfo(); // .GetMaterial());
4020	4743	if (tps != null)
4021	4744	{
4022	4745	for (int i=0; i < tps.length; i++)
..	..	@@ -4025,33 +4748,39 @@
4025	4748
4026	4749	//if (child.parent != null)
4027	4750	//child.parent.addSelectee(child);
	4751	+ objEditor.SetMaterial(child);
4028	4752	group.addSelectee(child);
4029		- objEditor.SetMaterial(child); // .GetMaterial());
4030		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4031		- System.err.println("info : " + child.GetPath());
4032	4753	}
4033	4754	}
4034		- else
4035		- {
4036		- objEditor.SetMaterial(group); // .GetMaterial());
4037		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4038		- System.err.println("info : " + group.GetPath());
4039		- }
	4755	+// else
	4756	+// {
	4757	+// objEditor.SetMaterial(group); // .GetMaterial());
	4758	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4759	+// System.err.println("info : " + group.GetPath());
	4760	+// }
4040	4761
4041		- objEditor.SetText(); // jan 2014
4042		-
4043		- 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))
4044	4763	CameraPane.flash = true;
4045	4764
4046		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4765	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4047	4766	// a camera
4048	4767	{
4049		- CameraPane.camerachangeframe = 0; // don't refuse it
4050		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4051		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
4052		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	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;
4053	4775	}
4054	4776
	4777	+ if (tps != null && tps.length == 1)
	4778	+ {
	4779	+ EditSelection(false);
	4780	+ }
	4781	+
	4782	+ SetPinStates(tps != null && tps.length > 0);
	4783	+
4055	4784	refreshContents();
4056	4785	//return true;
4057	4786	}
..	..	@@ -4060,6 +4789,35 @@
4060	4789
4061	4790	freezemodel = false;
4062	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	+ }
4063	4821
4064	4822	void linkSomething(Object3D thing)
4065	4823	{
..	..	@@ -4131,16 +4889,19 @@
4131	4889	{
4132	4890	if (group.selection.isEmpty())
4133	4891	return;
4134		- GrafreeD.clipboardIsTempGroup = false;
	4892	+
	4893	+ Grafreed.clipboardIsTempGroup = false;
4135	4894	Composite tGroup = null;
4136	4895	if (group.selection.size() > 0) // 1)
4137	4896	{
4138	4897	tGroup = new cGroup();
4139		- GrafreeD.clipboardIsTempGroup = true;
	4898	+ Grafreed.clipboardIsTempGroup = true;
4140	4899	}
4141	4900
4142	4901	if (cut)
4143	4902	{
	4903	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4904	+// Save();
4144	4905	//int indices[] = jList.getSelectedIndices();
4145	4906	//for (int i = indices.length - 1; i >= 0; i--)
4146	4907	//jList.remove(indices[i]);
..	..	@@ -4176,16 +4937,16 @@
4176	4937	//System.out.println("cut " + child);
4177	4938	//System.out.println("parent = " + child.parent);
4178	4939	// tmp.addChild(child);
4179		- if (GrafreeD.clipboardIsTempGroup)
	4940	+ if (Grafreed.clipboardIsTempGroup)
4180	4941	tGroup.add/Child/(tmp);
4181	4942	else
4182		- GrafreeD.clipboard = tmp;
	4943	+ Grafreed.clipboard = tmp;
4183	4944	}
4184	4945	else
4185		- if (GrafreeD.clipboardIsTempGroup)
	4946	+ if (Grafreed.clipboardIsTempGroup)
4186	4947	tGroup.add/Child/(child);
4187	4948	else
4188		- GrafreeD.clipboard = child;
	4949	+ Grafreed.clipboard = child;
4189	4950	}
4190	4951
4191	4952	//ResetModel();
..	..	@@ -4217,21 +4978,23 @@
4217	4978	//System.out.println("cut " + elem);
4218	4979	//System.out.println("parent = " + elem.parent);
4219	4980	// tmp.addChild(elem);
4220		- if (GrafreeD.clipboardIsTempGroup)
	4981	+ if (Grafreed.clipboardIsTempGroup)
4221	4982	tGroup.add/Child/(tmp);
4222	4983	else
4223		- GrafreeD.clipboard = tmp;
	4984	+ Grafreed.clipboard = tmp;
4224	4985	}
4225	4986	else
4226		- if (GrafreeD.clipboardIsTempGroup)
	4987	+ if (Grafreed.clipboardIsTempGroup)
4227	4988	tGroup.add/Child/(child);
4228	4989	else
4229		- GrafreeD.clipboard = child;
	4990	+ Grafreed.clipboard = child;
4230	4991	}
4231	4992
4232	4993	}
4233		- if (GrafreeD.clipboardIsTempGroup)
4234		- GrafreeD.clipboard = tGroup;
	4994	+
	4995	+ if (Grafreed.clipboardIsTempGroup)
	4996	+ Grafreed.clipboard = tGroup;
	4997	+
4235	4998	if (cut)
4236	4999	{
4237	5000	ResetModel();
..	..	@@ -4241,11 +5004,15 @@
4241	5004
4242	5005	void paste(boolean expand)
4243	5006	{
	5007	+ if (Globals.REPLACEONMAKE)
	5008	+ Save();
	5009	+ boolean keep = Globals.REPLACEONMAKE;
	5010	+ Globals.REPLACEONMAKE = false;
4244	5011	// if (GrafreeD.clipboard == null)
4245	5012	// return;
4246	5013	boolean first = true;
4247	5014
4248		- if (GrafreeD.clipboardIsTempGroup)
	5015	+ if (Grafreed.clipboardIsTempGroup)
4249	5016	{
4250	5017	Composite temp;
4251	5018
..	..	@@ -4256,7 +5023,7 @@
4256	5023	temp = (Composite)Applet3D.clipboard.deepCopy();
4257	5024	*/
4258	5025	Object3D elem;
4259		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5026	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4260	5027	{
4261	5028	Object3D child = (Object3D)e.nextElement();
4262	5029
..	..	@@ -4290,21 +5057,22 @@
4290	5057	//Object3D cb = Applet3D.clipboard;
4291	5058	//temp.addChild(cb);
4292	5059	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4293		- assert(GrafreeD.clipboard.parent == null);
4294		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4295		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4296		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4297		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	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());
4298	5065	else
4299		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4300		- GrafreeD.clipboard.get(0).parent = keepparent;
	5066	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5067	+ Grafreed.clipboard.get(0).parent = keepparent;
4301	5068	}
4302	5069
	5070	+ Globals.REPLACEONMAKE = keep;
4303	5071	ResetModel();
4304	5072	refreshContents();
4305	5073	}
4306	5074
4307		- void pasteInto(boolean copyit)
	5075	+ void pasteInto(boolean copyit, boolean clone)
4308	5076	{
4309	5077	// if (GrafreeD.clipboard == null)
4310	5078	// return;
..	..	@@ -4333,15 +5101,22 @@
4333	5101	if (copyit)
4334	5102	{
4335	5103	// paste(false);
4336		- CloneClipboard(false); // sept 2014
	5104	+ if (clone)
	5105	+ {
	5106	+ CloneClipboard(false); // sept 2014
	5107	+ }
	5108	+ else
	5109	+ {
	5110	+ paste(false);
	5111	+ }
4337	5112	}
4338	5113	else
4339	5114	{
4340	5115	boolean first = true;
4341	5116
4342		- if (GrafreeD.clipboardIsTempGroup)
	5117	+ if (Grafreed.clipboardIsTempGroup)
4343	5118	{
4344		- Composite temp = (Composite)GrafreeD.clipboard;
	5119	+ Composite temp = (Composite)Grafreed.clipboard;
4345	5120	Object3D copy;
4346	5121	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4347	5122	{
..	..	@@ -4351,7 +5126,7 @@
4351	5126	}
4352	5127	} else
4353	5128	{
4354		- linkSomething(GrafreeD.clipboard); //.get(0));
	5129	+ linkSomething(Grafreed.clipboard); //.get(0));
4355	5130	}
4356	5131	}
4357	5132	}
..	..	@@ -4428,6 +5203,10 @@
4428	5203
4429	5204	void group(Object3D csg, boolean grab)
4430	5205	{
	5206	+ if (Globals.REPLACEONMAKE)
	5207	+ Save();
	5208	+ boolean keep = Globals.REPLACEONMAKE;
	5209	+ Globals.REPLACEONMAKE = false;
4431	5210	if (//false) // why??
4432	5211	!group.selection.isEmpty())
4433	5212	{
..	..	@@ -4541,10 +5320,15 @@
4541	5320	//node.add(csg);
4542	5321	//makeSomething(node);
4543	5322	makeSomething(csg);
	5323	+ Globals.REPLACEONMAKE = keep;
4544	5324	}
4545	5325
4546	5326	void Ungroup(Object3D g)
4547	5327	{
	5328	+ if (Globals.REPLACEONMAKE)
	5329	+ Save();
	5330	+ boolean keep = Globals.REPLACEONMAKE;
	5331	+ Globals.REPLACEONMAKE = false;
4548	5332	if (g instanceof HiddenObject)
4549	5333	{
4550	5334	HiddenObject h = (HiddenObject) g;
..	..	@@ -4561,6 +5345,7 @@
4561	5345	objEditor.makeSomething(g.get(i), false);
4562	5346	}
4563	5347	}
	5348	+ Globals.REPLACEONMAKE = keep;
4564	5349	}
4565	5350
4566	5351	void ungroup()
..	..	@@ -4756,21 +5541,6 @@
4756	5541	}
4757	5542	*/
4758	5543
4759		- void ImportGFD()
4760		- {
4761		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4762		- browser.show();
4763		- String filename = browser.getFile();
4764		- if (filename != null && filename.length() > 0)
4765		- {
4766		- String fullname = browser.getDirectory() + filename;
4767		-
4768		- //Object3D readobj =
4769		- objEditor.ReadGFD(fullname, objEditor);
4770		- //makeSomething(readobj);
4771		- }
4772		- }
4773		-
4774	5544	/*
4775	5545	public void Callback(Object obj)
4776	5546	{
..	..	@@ -4794,26 +5564,9 @@
4794	5564	}
4795	5565	*/
4796	5566
4797		- void ImportVRMLX3D()
4798		- {
4799		- if (GrafreeD.standAlone)
4800		- {
4801		- /**/
4802		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4803		- browser.show();
4804		- String filename = browser.getFile();
4805		- if (filename != null && filename.length() > 0)
4806		- {
4807		- String fullname = browser.getDirectory() + filename;
4808		- LoadVRMLX3D(fullname);
4809		- }
4810		- /**/
4811		- }
4812		- }
4813		-
4814	5567	String GetFile(String dialogName)
4815	5568	{
4816		- if (GrafreeD.standAlone)
	5569	+ if (Grafreed.standAlone)
4817	5570	{
4818	5571	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4819	5572	browser.show();
..	..	@@ -4877,10 +5630,33 @@
4877	5630	cButton flashSelectionButton;
4878	5631	cButton editButton;
4879	5632	cButton uneditButton;
	5633	+ JCheckBox allParamsButton;
4880	5634	cButton clearpanelButton;
4881		- cButton allParamsButton;
4882	5635	cButton unselectButton;
4883	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	+
4884	5660	cButton screenfitButton;
4885	5661	cButton screenfitpointButton;
4886	5662	cButton snapobjectButton;
..	..	@@ -4892,14 +5668,6 @@
4892	5668
4893	5669	cButton setsupportButton;
4894	5670
4895		- cButton twoButton;
4896		- cButton sixButton;
4897		- cButton threeButton;
4898		- cButton sevenButton;
4899		- cButton fourButton; // full panel
4900		- cButton oneButton; // full XYZ
4901		- //cButton currentLayout;
4902		-
4903	5671	//
4904	5672	//Composite
4905	5673	Object3D // to do !!
..	..	@@ -4909,9 +5677,11 @@
4909	5677	//JTree jTree;
4910	5678	private MenuItem lookAtItem;
4911	5679	private MenuItem lookFromItem;
4912		- private MenuItem switchItem;
	5680	+ private MenuItem switchViewItem;
4913	5681	private MenuItem cutItem;
4914		- private MenuItem duplicateItem;
	5682	+ private MenuItem undoItem;
	5683	+ private MenuItem redoItem;
	5684	+ private JMenuItem duplicateItem;
4915	5685	private MenuItem cloneItem;
4916	5686	private MenuItem cloneSupportItem;
4917	5687	private MenuItem overwriteGeoItem;
..	..	@@ -4924,7 +5694,7 @@
4924	5694	private MenuItem linkverticesItem;
4925	5695	private MenuItem relinkverticesItem;
4926	5696	private MenuItem setMasterItem;
4927		- private MenuItem resetMeshItem;
	5697	+ private MenuItem resetAllItem;
4928	5698	private MenuItem stepAllItem;
4929	5699	private MenuItem revertMeshItem;
4930	5700	private MenuItem poseMeshItem;
..	..	@@ -4935,10 +5705,11 @@
4935	5705	private MenuItem mergeGeometriesItem;
4936	5706	private MenuItem copyItem;
4937	5707	private MenuItem pasteItem;
	5708	+ private MenuItem pasteIntoItem;
4938	5709	private MenuItem pasteLinkItem;
4939	5710	private MenuItem pasteCloneItem;
4940	5711	private MenuItem pasteExpandItem;
4941		- private MenuItem clearItem;
	5712	+ private MenuItem deleteItem;
4942	5713	private MenuItem clearAllItem;
4943	5714	private MenuItem genUVItem;
4944	5715	private MenuItem genNormalsMESHItem;
..	..	@@ -4973,6 +5744,10 @@
4973	5744	private MenuItem showleavesItem;
4974	5745	private MenuItem markleavesItem;
4975	5746	private MenuItem unmarkleavesItem;
	5747	+ private MenuItem rewindleavesItem;
	5748	+ private MenuItem unrewindleavesItem;
	5749	+ private MenuItem randomleavesItem;
	5750	+ private MenuItem unrandomleavesItem;
4976	5751
4977	5752	private MenuItem flipVItem;
4978	5753	private MenuItem unflipVItem;
..	..	@@ -4984,15 +5759,17 @@
4984	5759	private MenuItem panoTexturesItem;
4985	5760
4986	5761	private MenuItem resetCentroidItem;
4987		- private MenuItem transformgeometryItem;
	5762	+ private MenuItem resetCentroidXZItem;
4988	5763	private MenuItem resetTransformItem;
	5764	+ private MenuItem transformGeometryItem;
	5765	+ private MenuItem transformChildrenItem;
4989	5766	private MenuItem hideItem;
4990	5767	private MenuItem grabItem;
4991	5768	private MenuItem backItem;
4992	5769	private MenuItem frontItem;
4993	5770	private MenuItem cameraItem;
4994	5771	private MenuItem compositeItem;
4995		- private MenuItem randomItem;
	5772	+ private MenuItem switchItem;
4996	5773	private MenuItem physicsItem;
4997	5774	private MenuItem frameselectorItem;
4998	5775	private MenuItem scriptNodeItem;
..	..	@@ -5007,6 +5784,7 @@
5007	5784
5008	5785	private MenuItem resetParentItem;
5009	5786	private MenuItem repairParentItem;
	5787	+ private MenuItem repairShadowItem;
5010	5788	private MenuItem sortbysizeItem;
5011	5789	private MenuItem sortbynameItem;
5012	5790
..	..	@@ -5031,7 +5809,7 @@
5031	5809	private MenuItem blobItem;
5032	5810	private MenuItem latheItem;
5033	5811	private MenuItem bezierItem;
5034		- private MenuItem checkerItem;
	5812	+ private MenuItem overlayItem;
5035	5813	private MenuItem meshItem;
5036	5814	// private MenuItem meshGroupItem;
5037	5815	private MenuItem springItem;
..	..	@@ -5053,11 +5831,6 @@
5053	5831	private MenuItem doubleItem;
5054	5832	private MenuItem tripleItem;
5055	5833
5056		- private MenuItem importGFDItem;
5057		- private MenuItem importVRMLX3DItem;
5058		- private MenuItem import3DSItem;
5059		- private MenuItem importOBJItem;
5060		-
5061	5834	private MenuItem computeAOItem;
5062	5835	private MenuItem recompileItem;
5063	5836	private MenuItem editScriptItem;
..	..	@@ -5067,4 +5840,8 @@
5067	5840	private MenuItem analyzeItem;
5068	5841	private MenuItem dumpItem;
5069	5842	//boolean freezemodel = false;
	5843	+
	5844	+ Menu cameraMenu;
	5845	+ MenuItem editCameraItem;
	5846	+ MenuItem restoreCameraItem;
5070	5847	}