~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,6 +12,7 @@
12	12	import com.jme.math.Vector3f;
13	13	import com.jme.renderer.ColorRGBA;
14	14
	15	+import grafeme.ui.*;
15	16	//import buoy.widget.BFileChooser;
16	17
17	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
..	..	@@ -59,6 +60,12 @@
59	60	this.copy = this.group = group;
60	61	//selectees = this.group.selectees;
61	62
	63	+ if (copy.versions == null)
	64	+ {
	65	+ copy.versions = new byte[100][];
	66	+ copy.versionindex = -1;
	67	+ }
	68	+
62	69	if(ui)
63	70	SetupUI(objEditor);
64	71	}
..	..	@@ -73,7 +80,13 @@
73	80	this.copy = this.group = copy;
74	81	//selectees = this.group.selectees;
75	82
76		- SetupMenu2(objEditor);
	83	+ if (copy.versions == null)
	84	+ {
	85	+ copy.versions = new byte[100][];
	86	+ copy.versionindex = -1;
	87	+ }
	88	+
	89	+ SetupMenu2(this); //objEditor);
77	90	SetupUI2(objEditor);
78	91	objEditor.SetupUI(true);
79	92	SetupViews(objEditor);
..	..	@@ -83,6 +96,10 @@
83	96
84	97	void CloneSelection(boolean supports)
85	98	{
	99	+ if (Globals.REPLACEONMAKE)
	100	+ Save();
	101	+ boolean keep = Globals.REPLACEONMAKE;
	102	+ Globals.REPLACEONMAKE = false;
86	103	// Object3D keep = GrafreeD.clipboard;
87	104	//Object3D obj;
88	105	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -93,18 +110,19 @@
93	110
94	111	makeSomething(clone, i==group.selection.size()-1);
95	112	}
	113	+ Globals.REPLACEONMAKE = keep;
96	114	}
97	115
98	116	void CloneClipboard(boolean supports)
99	117	{
100		- assert(GrafreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
102		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	118	+ assert(Grafreed.clipboard.parent == null);
	119	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	120	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	121	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	122	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	123	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	124	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	125	+ Grafreed.clipboard.get(0).parent = keepparent;
108	126	}
109	127
110	128	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +136,7 @@
118	136	// obj.support = null;
119	137	if (!supports)
120	138	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	139	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	140	obj.parent = parent;
123	141	// obj.support = support;
124	142	// clone.support = support; // aout 2013
..	..	@@ -147,30 +165,29 @@
147	165
148	166	//JTextField nameField;
149	167
150		- void SetupMenu2(ObjEditor oe)
	168	+ void SetupMenu2(GroupEditor oe)
151	169	{
152		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
155		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
156		- oe.cameraMenu.add("-");
157		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
158		- openWindowItem.addActionListener(this);
159		- editLeafItem.addActionListener(this);
160		- lookAtItem.addActionListener(this);
161		- //lookFromItem.addActinoListener(this);
162		- //switchItem.addActionListener(this);
	170	+ oe.jTree = new cTree();
	171	+
163	172	Menu menu;
164	173	oe.menuBar.add(menu = new Menu("Edit"));
165	174	//editItem = menu.add(new MenuItem("Edit"));
166	175	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	176	+
	177	+// undoItem = menu.add(new MenuItem("Undo"));
	178	+// undoItem.addActionListener(this);
	179	+// redoItem = menu.add(new MenuItem("Redo"));
	180	+// redoItem.addActionListener(this);
	181	+// menu.add("-");
	182	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	183	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	184	cloneItem = menu.add(new MenuItem("Clone"));
171	185	cloneItem.addActionListener(this);
	186	+ if (Globals.ADVANCED)
	187	+ {
172	188	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	189	cloneSupportItem.addActionListener(this);
	190	+ }
174	191	menu.add("-");
175	192	cutItem = menu.add(new MenuItem("Cut"));
176	193	cutItem.addActionListener(this);
..	..	@@ -178,27 +195,123 @@
178	195	copyItem.addActionListener(this);
179	196	pasteItem = menu.add(new MenuItem("Paste"));
180	197	pasteItem.addActionListener(this);
	198	+
	199	+ menu.add("-");
	200	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	201	+ pasteIntoItem.addActionListener(this);
181	202	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	203	pasteLinkItem.addActionListener(this);
183	204	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	205	pasteCloneItem.addActionListener(this);
185	206	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	207	// pasteExpandItem.addActionListener(this);
	208	+ menu.add("-");
187	209	clearItem = menu.add(new MenuItem("Clear"));
188	210	clearItem.addActionListener(this);
	211	+
	212	+ if (Globals.ADVANCED)
	213	+ {
	214	+ // Deletes the cameras...
189	215	clearAllItem = menu.add(new MenuItem("Clear All"));
190	216	clearAllItem.addActionListener(this);
	217	+ }
	218	+
	219	+ menuBar.add(cameraMenu = new Menu("View"));
	220	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	221	+ //zBufferItem.addActionListener(this);
	222	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	223	+ //normalLensItem.addActionListener(this);
	224	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	225	+ restoreCameraItem.addActionListener(this);
	226	+
	227	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	228	+// toggleFullScreenItem.addItemListener(this);
	229	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	230	+// cameraMenu.add("-");
	231	+//
	232	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	233	+// toggleTextureItem.addItemListener(this);
	234	+// toggleTextureItem.setState(CameraPane.textureon);
	235	+//
	236	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	237	+// toggleSwitchItem.addItemListener(this);
	238	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	239	+
	240	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	241	+ toggleHandleItem.addItemListener(this);
	242	+ toggleHandleItem.setState(CameraPane.HANDLES);
	243	+
	244	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	245	+ togglePaintItem.addItemListener(this);
	246	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	247	+
	248	+ if (Globals.ADVANCED)
	249	+ {
	250	+ cameraMenu.add("-");
	251	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	252	+ toggleLiveItem.addItemListener(this);
	253	+ toggleLiveItem.setState(Globals.isLIVE());
191	254
	255	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	256	+ stepItem.addActionListener(this);
	257	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	258	+ // toggleDLItem.addItemListener(this);
	259	+ // toggleDLItem.setState(false);
	260	+
	261	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	262	+ toggleRenderItem.addItemListener(this);
	263	+ toggleRenderItem.setState(!CameraPane.frozen);
	264	+
	265	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	266	+ toggleDebugItem.addItemListener(this);
	267	+ toggleDebugItem.setState(Globals.DEBUG);
	268	+
	269	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	270	+ toggleFrustumItem.addItemListener(this);
	271	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	272	+
	273	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	274	+ toggleFootContactItem.addItemListener(this);
	275	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	276	+
	277	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	278	+ toggleTimelineItem.addItemListener(this);
	279	+ }
	280	+
	281	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	282	+// toggleRootItem.addItemListener(this);
	283	+// toggleRootItem.setState(false);
	284	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	285	+// animationItem.addItemListener(this);
	286	+// animationItem.setState(CameraPane.ANIMATION);
	287	+ cameraMenu.add("-");
	288	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	289	+ editCameraItem.addActionListener(this);
	290	+
	291	+ if (Globals.ADVANCED)
	292	+ {
	293	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	294	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	295	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	296	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	297	+ oe.cameraMenu.add("-");
	298	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	299	+ openWindowItem.addActionListener(this);
	300	+ editLeafItem.addActionListener(this);
	301	+ lookAtItem.addActionListener(this);
	302	+ //lookFromItem.addActinoListener(this);
	303	+ //switchViewItem.addActionListener(this);
	304	+ }
	305	+
192	306	oe.menuBar.add(menu = new Menu("Setting"));
193		- resetMeshItem = menu.add(new MenuItem("Reset All"));
194		- resetMeshItem.addActionListener(this);
195		- stepAllItem = menu.add(new MenuItem("Step All"));
196		- stepAllItem.addActionListener(this);
	307	+ if (Globals.ADVANCED)
	308	+ {
197	309	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	310	revertMeshItem.addActionListener(this);
199	311	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	312	resetreferencesItem.addActionListener(this);
201	313	menu.add("-");
	314	+ }
202	315	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	316	overwriteGeoItem.addActionListener(this);
204	317	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,79 +323,104 @@
210	323	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	324	overwriteUVItem.addActionListener(this);
212	325	menu.add("-");
	326	+ if (Globals.ADVANCED)
	327	+ {
213	328	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	329	generateMeshItem.addActionListener(this);
215	330	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	331	poseMeshItem.addActionListener(this);
217	332	menu.add("-");
	333	+ }
218	334	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	335	resetsupportItem.addActionListener(this);
220	336	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	337	linkverticesItem.addActionListener(this);
222	338	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	339	relinkverticesItem.addActionListener(this);
	340	+
	341	+ if (Globals.ADVANCED)
	342	+ {
224	343	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	344	setMasterItem.addActionListener(this);
	345	+ }
226	346
227	347	oe.menuBar.add(menu = new Menu("Group"));
228		- grabItem = menu.add(new MenuItem("Grab"));
229		- grabItem.addActionListener(this);
	348	+// grabItem = menu.add(new MenuItem("Grab"));
	349	+// grabItem.addActionListener(this);
230	350	backItem = menu.add(new MenuItem("Back"));
231	351	backItem.addActionListener(this);
232	352	frontItem = menu.add(new MenuItem("Front"));
233	353	frontItem.addActionListener(this);
234		- compositeItem = menu.add(new MenuItem("Composite"));
235		- compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	354	+// compositeItem = menu.add(new MenuItem("Composite"));
	355	+// compositeItem.addActionListener(this);
	356	+
	357	+ if (Globals.ADVANCED)
	358	+ {
	359	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	360	hideItem.addActionListener(this);
	361	+ }
238	362	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	363	ungroupItem.addActionListener(this);
240		- menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
242		- randomItem.addActionListener(this);
243		- physicsItem = menu.add(new MenuItem("Physics"));
244		- physicsItem.addActionListener(this);
245		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
246		- frameselectorItem.addActionListener(this);
	364	+
	365	+// menu.add("-");
	366	+//
	367	+// switchItem = menu.add(new MenuItem("Switch node"));
	368	+// switchItem.addActionListener(this);
	369	+ if (Globals.ADVANCED)
	370	+ {
247	371	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	372	switchGeoItem.addActionListener(this);
249	373	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	374	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	375	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	376	morphItem.addActionListener(this);
	377	+
	378	+ menu.add("-");
	379	+ physicsItem = menu.add(new MenuItem("Physics"));
	380	+ physicsItem.addActionListener(this);
	381	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	382	+ frameselectorItem.addActionListener(this);
253	383	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	384	scriptNodeItem.addActionListener(this);
255		- cameraItem = menu.add(new MenuItem("Camera"));
256		- cameraItem.addActionListener(this);
	385	+ }
257	386
258	387	oe.menuBar.add(menu = new Menu("Object"));
259		- textureItem = menu.add(new MenuItem("Texture"));
260		- textureItem.addActionListener(this);
	388	+// textureItem = menu.add(new MenuItem("Texture"));
	389	+// textureItem.addActionListener(this);
261	390	billboardItem = menu.add(new MenuItem("Billboard"));
262	391	billboardItem.addActionListener(this);
263	392	csgItem = menu.add(new MenuItem("CSG"));
264	393	csgItem.addActionListener(this);
265		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	394	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266	395	shadowXItem.addActionListener(this);
267		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	396	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268	397	shadowYItem.addActionListener(this);
269		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	398	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270	399	shadowZItem.addActionListener(this);
	400	+ attributeItem = menu.add(new MenuItem("Attribute"));
	401	+ attributeItem.addActionListener(this);
	402	+
	403	+ if (Globals.ADVANCED)
	404	+ {
	405	+ menu.add("-");
271	406	linkerItem = menu.add(new MenuItem("Linker"));
272	407	linkerItem.addActionListener(this);
273	408	templateItem = menu.add(new MenuItem("Template"));
274	409	templateItem.addActionListener(this);
275		- attributeItem = menu.add(new MenuItem("Attribute"));
276		- attributeItem.addActionListener(this);
277	410	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	411	pointflowItem.addActionListener(this);
	412	+ }
279	413	menu.add("-");
280	414	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	415	resetTransformItem.addActionListener(this);
282	416	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	417	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	418	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	419	+ resetCentroidXZItem.addActionListener(this);
	420	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	421	+ transformGeometryItem.addActionListener(this);
	422	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	423	+ transformChildrenItem.addActionListener(this);
286	424
287	425	oe.menuBar.add(menu = new Menu("Geometry"));
288	426	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +431,11 @@
293	431	genNormalsCADItem.addActionListener(this);
294	432	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	433	genNormalsMESHItem.addActionListener(this);
	434	+ if (Globals.ADVANCED)
	435	+ {
296	436	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
297	437	genNormalsMINEItem.addActionListener(this);
	438	+ }
298	439	stripifyItem = menu.add(new MenuItem("Stripify"));
299	440	stripifyItem.addActionListener(this);
300	441	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +457,34 @@
316	457	reduce34MeshItem.addActionListener(this);
317	458	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	459	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	460	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	461	clipMeshItem.addActionListener(this);
	462	+
	463	+ if (Globals.ADVANCED)
	464	+ {
	465	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	466	+ smoothMeshItem.addActionListener(this);
	467	+ }
323	468
324	469	oe.menuBar.add(menu = new Menu("Attributes"));
325	470	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	471	clearMaterialsItem.addActionListener(this);
	472	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	473	+ resetAllItem.addActionListener(this);
	474	+ stepAllItem = menu.add(new MenuItem("Step All"));
	475	+ stepAllItem.addActionListener(this);
327	476	menu.add("-");
328	477	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	478	liveleavesItem.addActionListener(this);
330	479	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	480	unliveleavesItem.addActionListener(this);
	481	+ if (Globals.ADVANCED)
	482	+ {
332	483	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	484	supportleavesItem.addActionListener(this);
334	485	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	486	unsupportleavesItem.addActionListener(this);
	487	+ }
336	488	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	489	hideleavesItem.addActionListener(this);
338	490	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -341,6 +493,14 @@
341	493	markleavesItem.addActionListener(this);
342	494	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343	495	unmarkleavesItem.addActionListener(this);
	496	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	497	+ rewindleavesItem.addActionListener(this);
	498	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	499	+ unrewindleavesItem.addActionListener(this);
	500	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	501	+ randomleavesItem.addActionListener(this);
	502	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	503	+ unrandomleavesItem.addActionListener(this);
344	504	menu.add("-");
345	505	flipVItem = menu.add(new MenuItem("Flip V"));
346	506	flipVItem.addActionListener(this);
..	..	@@ -376,35 +536,41 @@
376	536	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	537	sortbynameItem.addActionListener(this);
378	538	menu.add("-");
	539	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	540	+ shareGeometriesItem.addActionListener(this);
	541	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	542	+ mergeGeometriesItem.addActionListener(this);
	543	+ if (Globals.ADVANCED)
	544	+ {
	545	+ // Pretty much the same as duplicate and clone.
379	546	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	547	extractGeometriesItem.addActionListener(this);
381	548	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	549	cloneGeometriesItem.addActionListener(this);
383		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
384		- shareGeometriesItem.addActionListener(this);
385		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
386		- mergeGeometriesItem.addActionListener(this);
	550	+ }
387	551
388	552	oe.menuBar.add(menu = new Menu("Insert"));
389	553	buildCreateMenu(menu);
390	554
391		-
392		- oe.menuBar.add(menu = new Menu("Include"));
393		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
394		- importGFDItem.addActionListener(this);
395		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
396		- importVRMLX3DItem.addActionListener(this);
397		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
398		- importOBJItem.addActionListener(this);
399		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
400		- import3DSItem.addActionListener(this);
401		-
402	555	oe.menuBar.add(menu = new Menu("Tools"));
403	556	buildToolsMenu(menu);
404	557	}
405	558
	559	+
406	560	void SetupUI2(ObjEditor oe)
407	561	{
	562	+ // June 2019
	563	+ if (oe == null)
	564	+ {
	565	+ //super.SetupUI2(this);
	566	+ //return;
	567	+ }
	568	+
	569	+ if (copy != group)
	570	+ {
	571	+ //super.SetupUI2(this);
	572	+ }
	573	+
408	574	//new Exception().printStackTrace();
409	575
410	576	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -433,110 +599,230 @@
433	599	oe.radioPanel.add(dummyButton);
434	600	oe.buttonGroup.add(dummyButton);
435	601	*/
436		- aConstraints.gridy += 1;
	602	+ cGridBag copyOptionsPanel = new cGridBag();
	603	+
	604	+ copyOptionsPanel.preferredHeight = 1;
437	605
438	606	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	607
440		- oe.aConstraints.gridwidth = 1;
441		- oe.aConstraints.gridx = 0;
	608	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	609	+ //minButton.setToolTipText("Minimize window");
	610	+ //minButton.addActionListener(this);
442	611
443		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
444		- liveCB.setToolTipText("Enabled animation");
445		- liveCB.addItemListener(this);
446		-
447		- oe.aConstraints.gridx += 1;
448		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
449		- trackCB.setToolTipText("Enable tracking");
450		- trackCB.addItemListener(this);
451		-
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	612	+ if (Globals.ADVANCED)
	613	+ {
	614	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	615	+ maxButton.setToolTipText("Maximize window");
	616	+ maxButton.addActionListener(this);
	617	+ }
	618	+
	619	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	620	+ fullButton.setToolTipText("Full-screen window");
	621	+ fullButton.addActionListener(this);
	622	+
	623	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
454	624	screenfitButton.setToolTipText("Screen fit");
455	625	screenfitButton.addActionListener(this);
456		- oe.aConstraints.gridx += 1;
	626	+
	627	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	628	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	629	+ restoreCameraButton.addActionListener(this);
	630	+
	631	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	632	+ saveButton.setToolTipText("New version");
	633	+ saveButton.addActionListener(this);
	634	+
	635	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	636	+ undoButton.setToolTipText("Previous version");
	637	+ undoButton.addActionListener(this);
	638	+ undoButton.setEnabled(false);
	639	+
	640	+ cGridBag updown = new cGridBag().setVertical(true);
	641	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	642	+ restoreButton.setToolTipText("Restore current");
	643	+ restoreButton.addActionListener(this);
	644	+ restoreButton.setEnabled(false);
	645	+
	646	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	647	+ replaceButton.setToolTipText("Replace current");
	648	+ replaceButton.addActionListener(this);
	649	+ replaceButton.setEnabled(false);
	650	+
	651	+ copyOptionsPanel.add(updown);
	652	+
	653	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	654	+ redoButton.setToolTipText("Next version");
	655	+ redoButton.addActionListener(this);
	656	+ redoButton.setEnabled(false);
	657	+
	658	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	659	+ liveCB.setToolTipText("Enable animation");
	660	+ liveCB.addItemListener(this);
	661	+
	662	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	663	+ oneStepButton.setToolTipText("Animate one step forward");
	664	+ oneStepButton.addActionListener(this);
	665	+
	666	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	667	+ fastCB.setToolTipText("Fast mode");
	668	+ fastCB.addItemListener(this);
	669	+
	670	+ //oe.toolboxPanel.Return();
	671	+
	672	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	673	+// trackCB.setToolTipText("Enable tracking");
	674	+// trackCB.addItemListener(this);
	675	+
457	676	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
458	677	// screenfitpointButton.addActionListener(this);
459		-// oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
461		- snapobjectButton.addActionListener(this);
462		- snapobjectButton.setToolTipText("Snap Object");
463		- oe.aConstraints.gridx += 1;
464	678
465		- //aConstraints.gridx = 0;
466		- //aConstraints.gridy += 1;
467		- oe.aConstraints.weighty = 0;
468		- oe.aConstraints.gridwidth = 1;
469		-
470		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
471		- flashSelectionButton.setToolTipText("Show selection");
472		- flashSelectionButton.addActionListener(this);
	679	+ if (Globals.ADVANCED)
	680	+ {
	681	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	682	+ snapobjectButton.addActionListener(this);
	683	+ snapobjectButton.setToolTipText("Snap Object");
	684	+ }
	685	+
	686	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
473	687
474		- oe.toolbarPanel.add(new cButton(" ", false));
475		-
476		- oe.aConstraints.gridx += 1;
477		- oe.aConstraints.weighty = 0;
478		- oe.aConstraints.gridwidth = 1;
479		-
480		- //
481		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	688	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
482	689	twoButton.setToolTipText("Show center view only");
483	690	twoButton.addActionListener(this);
484		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	691	+ this.fullscreenLayout = twoButton;
	692	+
	693	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	694	fourButton.addActionListener(this);
486	695	fourButton.setToolTipText("Show left panel only");
487		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	696	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
488	697	sixButton.setToolTipText("2-column layout left");
489	698	sixButton.addActionListener(this);
490		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	699	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
491	700	threeButton.setToolTipText("2-column layout right");
492	701	threeButton.addActionListener(this);
493		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	702	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
494	703	sevenButton.setToolTipText("3-column layout");
495	704	sevenButton.addActionListener(this);
496	705	//
497	706
498		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
499		- rootButton.setToolTipText("Edit object in new tab");
	707	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	708	+ rootButton.setToolTipText("Edit selection in new tab");
500	709	rootButton.addActionListener(this);
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	710	+
	711	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
503	712	closeButton.setToolTipText("Close tab");
504	713	closeButton.addActionListener(this);
505	714	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
506	715	//clearButton.addActionListener(this);
507		- oe.aConstraints.gridx += 1;
508		-
509		- oe.aConstraints.gridx = 1; //
510		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
511		- editButton.addActionListener(this);
512		- oe.aConstraints.gridx += 1;
513		- oe.aConstraints.weighty = 0;
514		- oe.aConstraints.gridwidth = 1;
515	716
516		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	717	+ // INSERT
	718	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	719	+ gridButton.setToolTipText("Create grid");
	720	+ gridButton.addActionListener(this);
	721	+
	722	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	723	+ boxButton.setToolTipText("Create box");
	724	+ boxButton.addActionListener(this);
	725	+
	726	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	727	+ sphereButton.setToolTipText("Create sphere");
	728	+ sphereButton.addActionListener(this);
	729	+
	730	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	731	+ coneButton.setToolTipText("Create cone");
	732	+ coneButton.addActionListener(this);
	733	+
	734	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	735	+ torusButton.setToolTipText("Create torus");
	736	+ torusButton.addActionListener(this);
	737	+
	738	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	739	+ superButton.setToolTipText("Create superellipsoid");
	740	+ superButton.addActionListener(this);
	741	+
	742	+ if (Globals.ADVANCED)
	743	+ {
	744	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	745	+ kleinButton.setToolTipText("Create Klein bottle");
	746	+ kleinButton.addActionListener(this);
	747	+ }
	748	+
	749	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	750	+ particlesButton.setToolTipText("Create particle system");
	751	+ particlesButton.addActionListener(this);
	752	+
	753	+ oe.toolboxPanel.Return();
	754	+
	755	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	756	+ groupButton.setToolTipText("Create group");
	757	+ groupButton.addActionListener(this);
	758	+
	759	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	760	+ compositeButton.setToolTipText("Create composite");
	761	+ compositeButton.addActionListener(this);
	762	+
	763	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	764	+ switchButton.setToolTipText("Create item switcher");
	765	+ switchButton.addActionListener(this);
	766	+
	767	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	768	+ loopButton.setToolTipText("Create loop");
	769	+ loopButton.addActionListener(this);
	770	+
	771	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	772	+ textureButton.setToolTipText("Create texture");
	773	+ textureButton.addActionListener(this);
	774	+
	775	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	776	+ overlayButton.setToolTipText("Create overlay");
	777	+ overlayButton.addActionListener(this);
	778	+
	779	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	780	+ lightButton.setToolTipText("Create light");
	781	+ lightButton.addActionListener(this);
	782	+
	783	+ for (int i=6; --i>=0;)
	784	+ {
	785	+ oe.toolboxPanel.Return();
	786	+ oe.toolboxPanel.add(new cGridBag());
	787	+ oe.toolboxPanel.add(new cGridBag());
	788	+ oe.toolboxPanel.add(new cGridBag());
	789	+ oe.toolboxPanel.add(new cGridBag());
	790	+ oe.toolboxPanel.add(new cGridBag());
	791	+ oe.toolboxPanel.add(new cGridBag());
	792	+ oe.toolboxPanel.add(new cGridBag());
	793	+ }
	794	+
	795	+ // EDIT panel
	796	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	797	+ editButton.setToolTipText("Pin selection controls");
	798	+ editButton.addActionListener(this);
	799	+
	800	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	801	+ uneditButton.setToolTipText("Remove selection controls");
517	802	uneditButton.addActionListener(this);
518	803
519		- oe.aConstraints.gridx += 1;
520		- oe.aConstraints.weighty = 0;
521		- oe.aConstraints.gridwidth = 1;
522		-
523		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
524		- clearPanelButton.addActionListener(this);
525		-
526		- oe.aConstraints.gridx += 1;
527		- oe.aConstraints.weighty = 0;
528		- oe.aConstraints.gridwidth = 1;
529		-
530		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	804	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	805	+ allParamsButton.setToolTipText("Show all controle");
531	806	allParamsButton.addActionListener(this);
532	807
533		- oe.aConstraints.gridx += 1;
534		- oe.aConstraints.weighty = 0;
535		- oe.aConstraints.gridwidth = 1;
536		-
537		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	808	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	809	+ clearPanelButton.setToolTipText("Clear edit panel");
	810	+ clearPanelButton.addActionListener(this);
	811	+
	812	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	813	+ unselectButton.setToolTipText("Unselect");
538	814	unselectButton.addActionListener(this);
539	815
	816	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	817	+ flashSelectionButton.setToolTipText("Highlight selection");
	818	+ flashSelectionButton.addActionListener(this);
	819	+
	820	+ editCommandsPanel.preferredHeight = 1;
	821	+
	822	+ SetPinStates(false);
	823	+// oe.treePanel.add(commandsPanel);
	824	+// oe.treePanel.Return();
	825	+
540	826	// oe.aConstraints.gridx += 1;
541	827	// oe.aConstraints.weighty = 0;
542	828	// oe.aConstraints.gridwidth = 1;
..	..	@@ -548,40 +834,25 @@
548	834	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
549	835	// gcButton.addActionListener(this);
550	836
551		- oe.aConstraints.gridx = 0;
552		- oe.aConstraints.gridy += 1;
553		-
554		- //ctrlPanel.add(objList = new List(5, true));
555		- oe.aConstraints.gridwidth = 100;
556		- // oe.aConstraints.gridheight = 100;
557		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
558		- oe.aConstraints.gridheight = 1;
559		- oe.aConstraints.weighty = 0.5;
560		- oe.aConstraints.gridx = 0;
561		- JScrollPane jSP;
	837	+ cGridBag jSPPanel = new cGridBag();
	838	+
	839	+ JScrollPane jSP;
562	840	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
563		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	841	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
564	842	ResetModel();
565		- oe.aConstraints.weighty = 0.5;
566		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
567		- oe.aConstraints.gridy += 1;
568		- oe.aConstraints.gridwidth = 1;
569		-
570		- oe.aConstraints.weighty = 0;
571		- oe.aConstraints.gridwidth = 2;
572		-
573		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
574		- colorCB.addItemListener(this);
575		- oe.aConstraints.gridx += 2;
576		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
577		- materialCB.addItemListener(this);
578		- oe.aConstraints.gridx += 2;
579		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
580		- textureCB.addItemListener(this);
581		-
582		- oe.aConstraints.gridx = 0;
583		- oe.aConstraints.gridy += 1;
584	843
	844	+ oe.treePanel.add(jSPPanel);
	845	+ oe.treePanel.Return();
	846	+
	847	+ oe.treePanel.add(copyOptionsPanel);
	848	+ oe.treePanel.Return();
	849	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	850	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	851	+ sliderPane.preferredHeight = 1;
	852	+
	853	+// mainPanel.setDividerLocation(0.5); //1.0);
	854	+// mainPanel.setResizeWeight(0.5);
	855	+
585	856	//jList.addListSelectionListener(this);
586	857	oe.jTree.addTreeSelectionListener(this);
587	858	//jTree.setRootVisible(false);
..	..	@@ -604,83 +875,143 @@
604	875	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
605	876	}
606	877
607		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	878	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
608	879	{
609		- constraints.gridx = 0;
610		- constraints.gridy = 0;
611		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), constraints);
612		- fastCB.setToolTipText("Fast mode");
613		- fastCB.addItemListener(this);
614		- constraints.gridy += 1;
615		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), constraints);
616		- supportCB.setToolTipText("Enabled rigging");
617		- supportCB.addItemListener(this);
	880	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	881	+ colorCB.setToolTipText("Copy color when dropped");
	882	+ colorCB.addItemListener(this);
618	883
619		- // constraints.gridy += 1;
	884	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	885	+ materialCB.setToolTipText("Copy material when dropped");
	886	+ materialCB.addItemListener(this);
	887	+
	888	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	889	+ textureCB.setToolTipText("Copy texture when dropped");
	890	+ textureCB.addItemListener(this);
	891	+
	892	+ panel.Return();
	893	+
	894	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	895	+ boxCB.setToolTipText("Display bounding boxes");
	896	+ boxCB.addItemListener(this);
	897	+
	898	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	899	+ zoomBoxCB.setToolTipText("Display only for wheel");
	900	+ zoomBoxCB.addItemListener(this);
	901	+
	902	+ if (true) // Globals.ADVANCED)
	903	+ {
	904	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	905	+// supportCB.setToolTipText("Enable rigging");
	906	+// supportCB.addItemListener(this);
	907	+
	908	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	909	+ freezeCB.setToolTipText("Fast moving camera");
	910	+ freezeCB.addItemListener(this);
	911	+
620	912	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
621	913	// localCB.addItemListener(this);
622	914
623		- constraints.gridy += 1;
624		- panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), constraints);
	915	+ panel.Return();
	916	+
	917	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
625	918	crowdCB.setToolTipText("Used for crowds");
626	919	crowdCB.addItemListener(this);
627	920
628		- constraints.gridy += 1;
629		- panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), constraints);
	921	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
630	922	smoothCB.setToolTipText("Snapping delay");
631	923	smoothCB.addItemListener(this);
632	924
633		- constraints.gridy += 1;
634		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), constraints);
	925	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
635	926	slowCB.setToolTipText("Smooth interpolation");
636	927	slowCB.addItemListener(this);
637		- constraints.gridy += 1;
638		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), constraints);
639		- boxCB.setToolTipText("Display bounding boxes");
640		- boxCB.addItemListener(this);
641		- constraints.gridy += 1;
642		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), constraints);
643		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
644		- zoomBoxCB.addItemListener(this);
645		-
	928	+
646	929	// constraints.gridy += 1;
647	930	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
648	931	// speakerMocapCB.addItemListener(this);
649	932
	933	+ panel.Return();
	934	+
650	935	if (false)
651	936	{
652	937	// handled in scripts
653		- constraints.gridy += 1;
654		- panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), constraints);
	938	+ //constraints.gridy += 1;
	939	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
655	940	speakerCameraCB.addItemListener(this);
656	941
657		- constraints.gridy += 1;
658		- panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), constraints);
	942	+ //constraints.gridy += 1;
	943	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
659	944	speakerFocusCB.addItemListener(this);
660	945
661		- constraints.gridy += 1;
662		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), constraints);
	946	+ //constraints.gridy += 1;
	947	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
663	948	smoothfocusCB.addItemListener(this);
	949	+ panel.Return();
664	950	}
665	951
666	952	//constraints.gridx += 1;
667	953	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
668	954	// debugCB.addItemListener(this);
669	955
670		- constraints.gridy += 1;
671		- panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), constraints);
	956	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	957	+ trackCB.setToolTipText("Enable tracking target");
	958	+ trackCB.addItemListener(this);
	959	+
	960	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	961	+ oeilCB.setToolTipText("Move camera when tracking");
672	962	oeilCB.addItemListener(this);
673	963
674		- constraints.gridy += 1;
675		- panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), constraints);
	964	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	965	+ shadowCB.setToolTipText("When live compute shadows");
	966	+ shadowCB.addItemListener(this);
	967	+
	968	+ panel.Return();
	969	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	970	+ toggleTextureCB.setToolTipText("Load textures");
	971	+ toggleTextureCB.addItemListener(this);
	972	+
	973	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	974	+ toggleSwitchCB.setToolTipText("Choose a single item");
	975	+ toggleSwitchCB.addItemListener(this);
	976	+
	977	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	978	+ autokeepCB.setToolTipText("On structure change");
	979	+ autokeepCB.addItemListener(this);
	980	+
	981	+ panel.Return();
	982	+ if (Globals.ADVANCED)
	983	+ {
	984	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
676	985	lookAtCB.setToolTipText("Look-at target");
677	986	lookAtCB.addItemListener(this);
	987	+ }
	988	+
	989	+ }
	990	+
	991	+ cGridBag fill = new cGridBag();
	992	+ fill.preferredHeight = 200;
	993	+ cGridBag fill2 = new cGridBag();
	994	+ fill2.preferredHeight = 200;
	995	+ cGridBag fill3 = new cGridBag();
	996	+ fill3.preferredHeight = 200;
	997	+
	998	+ panel.add(fill);
	999	+ panel.add(fill2);
	1000	+ panel.add(fill3);
678	1001
679	1002	}
680	1003
681	1004	void EditObject(Object3D obj)
682	1005	{
683	1006	cRadio radioButton = new cRadio(obj.name);
	1007	+
	1008	+ // June 2019. Patch to avoid bug with transparency.
	1009	+ radioButton.hadMaterial = obj.material != null;
	1010	+ if (!radioButton.hadMaterial)
	1011	+ {
	1012	+ obj.material = new cMaterial();
	1013	+ }
	1014	+
684	1015	radioButton.SetObject(obj);
685	1016	radioButton.layout = sevenButton;
686	1017	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -689,8 +1020,11 @@
689	1020	buttonGroup.add(radioButton);
690	1021	radioButton.doClick();
691	1022	}
	1023	+
692	1024	void SetupViews(ObjEditor oe)
693	1025	{
	1026	+ theFrame = this;
	1027	+
694	1028	oe.SetupViews();
695	1029
696	1030	System.out.println("SetupViews");
..	..	@@ -699,23 +1033,28 @@
699	1033	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
700	1034	}
701	1035
702		- JCheckBox liveCB;
703		- JCheckBox supportCB;
704		- JCheckBox localCB;
705		- JCheckBox crowdCB;
706		- JCheckBox smoothCB;
707		- JCheckBox fastCB;
708		- JCheckBox slowCB;
709		- JCheckBox boxCB;
710		- JCheckBox zoomBoxCB;
711		- JCheckBox trackCB;
712		- JCheckBox smoothfocusCB;
	1036	+ cToggleButton liveCB;
	1037	+ cCheckBox supportCB;
	1038	+ cCheckBox localCB;
	1039	+ cCheckBox crowdCB;
	1040	+ cCheckBox smoothCB;
	1041	+ cToggleButton fastCB;
	1042	+ cCheckBox slowCB;
	1043	+ cCheckBox boxCB;
	1044	+ cCheckBox zoomBoxCB;
	1045	+ cCheckBox freezeCB;
	1046	+ //cToggleButton trackCB;
	1047	+ cCheckBox trackCB;
	1048	+ cCheckBox smoothfocusCB;
713	1049	// JCheckBox speakerMocapCB;
714		- JCheckBox speakerCameraCB;
715		- JCheckBox speakerFocusCB;
716		- JCheckBox debugCB;
717		- JCheckBox oeilCB;
718		- JCheckBox lookAtCB;
	1050	+ cCheckBox speakerCameraCB;
	1051	+ cCheckBox speakerFocusCB;
	1052	+ cCheckBox debugCB;
	1053	+
	1054	+ cCheckBox oeilCB;
	1055	+ cCheckBox shadowCB;
	1056	+ cCheckBox autokeepCB;
	1057	+ cCheckBox lookAtCB;
719	1058
720	1059	// static int COLOR = 1;
721	1060	// static int MATERIAL = 2;
..	..	@@ -723,9 +1062,9 @@
723	1062
724	1063	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
725	1064
726		- JCheckBox colorCB;
727		- JCheckBox materialCB;
728		- JCheckBox textureCB;
	1065	+ cCheckBox colorCB;
	1066	+ cCheckBox materialCB;
	1067	+ cCheckBox textureCB;
729	1068
730	1069	public void itemStateChanged(ItemEvent e)
731	1070	{
..	..	@@ -753,6 +1092,7 @@
753	1092	} else if(e.getSource() == liveCB)
754	1093	{
755	1094	cameraView.ToggleLive();
	1095	+ refreshContents(false);
756	1096	}
757	1097	else if(e.getSource() == supportCB)
758	1098	{
..	..	@@ -817,6 +1157,18 @@
817	1157	{
818	1158	cameraView.ToggleOeil();
819	1159	}
	1160	+ else if(e.getSource() == shadowCB)
	1161	+ {
	1162	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1163	+ }
	1164	+ else if(e.getSource() == freezeCB)
	1165	+ {
	1166	+ Globals.FREEZEONMOVE ^= true;
	1167	+ }
	1168	+ else if(e.getSource() == autokeepCB)
	1169	+ {
	1170	+ Globals.REPLACEONMAKE ^= true;
	1171	+ }
820	1172	else if(e.getSource() == lookAtCB)
821	1173	{
822	1174	cameraView.ToggleLookAt();
..	..	@@ -833,7 +1185,8 @@
833	1185
834	1186	/**/
835	1187	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
836		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1188	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1189	+ TreePath path = objEditor.jTree.getSelectionPath();
837	1190	if ((path == null) \|\| (path.getPathCount() <= 1)) {
838	1191	// We can't move the root node or an empty selection
839	1192	return;
..	..	@@ -896,8 +1249,6 @@
896	1249	}
897	1250	}
898	1251
899		- String string = (String) object;
900		-
901	1252	System.out.println("Transfer = " + object + "; drop : " + target);
902	1253	// if( object instanceof java.io.File[])
903	1254	// {
..	..	@@ -905,7 +1256,11 @@
905	1256	// objEditor.DropFile((java.io.File[]) object, true);
906	1257	// return;
907	1258	// }
908		- if (string.charAt(0) == '/')
	1259	+
	1260	+ String string = object.toString();
	1261	+
	1262	+ // File path for Mac and Windows
	1263	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
909	1264	{
910	1265	// file(s)
911	1266	String[] names = string.split("\n");
..	..	@@ -932,7 +1287,7 @@
932	1287
933	1288	flashIt = false;
934	1289	CameraPane pane = (CameraPane) target;
935		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1290	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
936	1291	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
937	1292
938	1293	if (group.selection.size() == 1)
..	..	@@ -948,23 +1303,33 @@
948	1303
949	1304	assert target == objEditor.jTree;
950	1305	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1306	+ Object3D destinationLeaf;
951	1307	try {
952		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1308	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
953	1309	} catch (Exception e) {
954	1310	System.out.println("destinationPath : " + destinationPath);
955	1311	return;
956	1312	}
957	1313
958		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1314	+ for (int i=group.selection.size(); --i>=0;)
959	1315	{
	1316	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1317	+
	1318	+ // Cannot move into itself
	1319	+ if (child == destinationLeaf)
	1320	+ return;
	1321	+ }
	1322	+
	1323	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1324	+// {
960	1325	loadClipboard(true);
961	1326	objEditor.jTree.setSelectionPath(destinationPath);
962		- pasteInto(false);
963		- } else {
964		- loadClipboard(false);
965		- objEditor.jTree.setSelectionPath(destinationPath);
966		- pasteInto(false); // true); // ???
967		- }
	1327	+ pasteInto(false, false);
	1328	+// } else {
	1329	+// loadClipboard(false);
	1330	+// objEditor.jTree.setSelectionPath(destinationPath);
	1331	+// pasteInto(false, false); // true); // ???
	1332	+// }
968	1333	}
969	1334	public void dropActionChanged(DropTargetDragEvent dtde)
970	1335	// Called if the user has modified the current drop gesture
..	..	@@ -1069,85 +1434,107 @@
1069	1434	{
1070	1435	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1071	1436	//heightFieldItem.addActionListener(this);
1072		- gridItem = menu.add(new MenuItem("Grid"));
1073		- gridItem.addActionListener(this);
1074		- rectoidItem = menu.add(new MenuItem("Box"));
1075		- rectoidItem.addActionListener(this);
1076		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1077		- ellipsoidItem.addActionListener(this);
1078		- coneItem = menu.add(new MenuItem("Cone"));
1079		- coneItem.addActionListener(this);
1080		- torusItem = menu.add(new MenuItem("Torus"));
1081		- torusItem.addActionListener(this);
1082		- superItem = menu.add(new MenuItem("Superellipsoid"));
1083		- superItem.addActionListener(this);
	1437	+// gridItem = menu.add(new MenuItem("Grid"));
	1438	+// gridItem.addActionListener(this);
	1439	+// rectoidItem = menu.add(new MenuItem("Box"));
	1440	+// rectoidItem.addActionListener(this);
	1441	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1442	+// ellipsoidItem.addActionListener(this);
	1443	+// coneItem = menu.add(new MenuItem("Cone"));
	1444	+// coneItem.addActionListener(this);
	1445	+// torusItem = menu.add(new MenuItem("Torus"));
	1446	+// torusItem.addActionListener(this);
	1447	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1448	+// superItem.addActionListener(this);
	1449	+
	1450	+ cameraItem = menu.add(new MenuItem("Camera"));
	1451	+ cameraItem.addActionListener(this);
	1452	+
	1453	+ if (!Globals.ADVANCED)
	1454	+ {
1084	1455	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1085	1456	kleinItem.addActionListener(this);
1086		- particleItem = menu.add(new MenuItem("Particle system"));
1087		- particleItem.addActionListener(this);
	1457	+ }
	1458	+
	1459	+// particleItem = menu.add(new MenuItem("Particle system"));
	1460	+// particleItem.addActionListener(this);
	1461	+ if (Globals.ADVANCED)
	1462	+ {
1088	1463	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1089	1464	ragdollItem.addActionListener(this);
1090	1465	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1091	1466	ragdoll2Item.addActionListener(this);
	1467	+ }
1092	1468	menu.add("-");
1093		- meshItem = menu.add(new MenuItem("Mesh"));
	1469	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1094	1470	meshItem.addActionListener(this);
1095	1471	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1096	1472	// meshGroupItem.addActionListener(this);
	1473	+ if (Globals.ADVANCED)
	1474	+ {
1097	1475	springItem = menu.add(new MenuItem("Spring"));
1098	1476	springItem.addActionListener(this);
1099	1477	flagItem = menu.add(new MenuItem("Flag"));
1100	1478	flagItem.addActionListener(this);
1101		- bezierItem = menu.add(new MenuItem("Patch"));
1102		- bezierItem.addActionListener(this);
1103		- checkerItem = menu.add(new MenuItem("Checker"));
1104		- checkerItem.addActionListener(this);
1105	1479	blobItem = menu.add(new MenuItem("Blob"));
1106	1480	blobItem.addActionListener(this);
1107	1481	latheItem = menu.add(new MenuItem("Lathe"));
1108	1482	latheItem.addActionListener(this);
1109		- lightItem = menu.add(new MenuItem("Light"));
1110		- lightItem.addActionListener(this);
	1483	+ }
	1484	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1485	+ bezierItem.addActionListener(this);
	1486	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1487	+// overlayItem.addActionListener(this);
	1488	+// lightItem = menu.add(new MenuItem("Light"));
	1489	+// lightItem.addActionListener(this);
1111	1490	menu.add("-");
1112	1491	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1113	1492	//superLoopItem.addActionListener(this);
1114		- loopItem = menu.add(new MenuItem("Loop"));
1115		- loopItem.addActionListener(this);
	1493	+// loopItem = menu.add(new MenuItem("Loop"));
	1494	+// loopItem.addActionListener(this);
1116	1495	doubleItem = menu.add(new MenuItem("Fork"));
1117	1496	doubleItem.addActionListener(this);
	1497	+ if (Globals.ADVANCED)
	1498	+ {
1118	1499	tripleItem = menu.add(new MenuItem("Trident"));
1119	1500	tripleItem.addActionListener(this);
	1501	+ }
1120	1502	}
1121	1503
1122	1504	void buildToolsMenu(Menu menu)
1123	1505	{
1124	1506	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1125	1507	animationItem.addItemListener(this);
1126		- animationItem.setState(CameraPane.ANIMATION);
	1508	+ animationItem.setState(Globals.ANIMATION);
	1509	+
	1510	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1511	+ archiveItem.addActionListener(this);
1127	1512
1128	1513	menu.add("-");
1129	1514	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1130	1515	parseverticesItem.addActionListener(this);
1131	1516	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1132	1517	textureFieldItem.addActionListener(this);
1133		- alignItem = menu.add(new MenuItem("Align"));
	1518	+ alignItem = menu.add(new MenuItem("Align Objects"));
1134	1519	alignItem.addActionListener(this);
1135		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1136		- mirrorItem.addActionListener(this);
1137	1520	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1138	1521	reduceMorphItem.addActionListener(this);
1139	1522	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1140	1523	reduce34MorphItem.addActionListener(this);
1141		-
1142		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1143		- computeAOItem.addActionListener(this);
1144	1524	menu.add("-");
1145		-
1146	1525	menu.add(memoryItem = new MenuItem("Memory Usage"));
1147	1526	memoryItem.addActionListener(this);
	1527	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	1528	+ computeAOItem.addActionListener(this);
	1529	+
	1530	+ if (Globals.ADVANCED)
	1531	+ {
	1532	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1533	+ mirrorItem.addActionListener(this);
	1534	+ menu.add("-");
1148	1535	menu.add(analyzeItem = new MenuItem("Analyze"));
1149	1536	analyzeItem.addActionListener(this);
1150		- menu.add(dumpItem = new MenuItem("Dump"));
	1537	+ menu.add(dumpItem = new MenuItem("Print"));
1151	1538	dumpItem.addActionListener(this);
1152	1539	// menu.add(pathItem = new MenuItem("From-to path"));
1153	1540	// pathItem.addActionListener(this);
..	..	@@ -1165,6 +1552,7 @@
1165	1552	menu.add("-");
1166	1553	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1167	1554	editScriptItem.addActionListener(this);
	1555	+ }
1168	1556	}
1169	1557
1170	1558	void ScreenFit()
..	..	@@ -1287,9 +1675,24 @@
1287	1675	shadow.material = new cMaterial(obj.material);
1288	1676	shadow.material.diffuse = 0.0001f;
1289	1677	shadow.material.specular = 0.0001f;
	1678	+ //shadow.projectedVertices[1].x = 300;
1290	1679
1291	1680	makeSomething(shadow);
1292	1681	}
	1682	+
	1683	+ private void ClearUnpinned()
	1684	+ {
	1685	+ //for (Object3D obj : listUI)
	1686	+ for (int i=listUI.size(); --i>=0;)
	1687	+ {
	1688	+ Object3D obj = listUI.elementAt(i);
	1689	+ if (!obj.pinned)
	1690	+ {
	1691	+ obj.CloseUI();
	1692	+ listUI.remove(i);
	1693	+ }
	1694	+ }
	1695	+ }
1293	1696
1294	1697	/**
1295	1698	* applyExample
..	..	@@ -1493,9 +1896,9 @@
1493	1896
1494	1897	void Overwrite(int mask)
1495	1898	{
1496		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1899	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1497	1900	{
1498		- Object3D content = GrafreeD.clipboard.get(0);
	1901	+ Object3D content = Grafreed.clipboard.get(0);
1499	1902
1500	1903	if (content instanceof cGroup && ((cGroup)content).transientlink )
1501	1904	content = ((cGroup)content).get(0);
..	..	@@ -1534,7 +1937,7 @@
1534	1937	{
1535	1938	ScreenFit();
1536	1939	} else
1537		- if (source == switchItem)
	1940	+ if (source == switchViewItem)
1538	1941	{
1539	1942	cVector v1 = new cVector();
1540	1943	cVector v2 = new cVector();
..	..	@@ -1543,11 +1946,11 @@
1543	1946	objEditor.cameraView.renderCamera.setAim(v2, v1);
1544	1947	objEditor.cameraView.repaint();
1545	1948	} else
1546		- if (source == rectoidItem)
	1949	+ if (source == rectoidItem \|\| source == boxButton)
1547	1950	{
1548	1951	makeSomething(new Box());
1549	1952	} else
1550		- if (source == particleItem)
	1953	+ if (source == particleItem \|\| source == particlesButton)
1551	1954	{
1552	1955	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1553	1956	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1626,27 +2029,27 @@
1626	2029
1627	2030	makeSomething(obj);
1628	2031	} else
1629		- if (source == gridItem)
	2032	+ if (source == gridItem \|\| source == gridButton)
1630	2033	{
1631	2034	makeSomething(new Grid());
1632	2035	} else
1633		- if (source == ellipsoidItem)
	2036	+ if (source == ellipsoidItem \|\| source == sphereButton)
1634	2037	{
1635	2038	makeSomething(new Sphere());
1636	2039	} else
1637		- if (source == coneItem)
	2040	+ if (source == coneItem \|\| source == coneButton)
1638	2041	{
1639	2042	makeSomething(new Cone());
1640	2043	} else
1641		- if (source == torusItem)
	2044	+ if (source == torusItem \|\| source == torusButton)
1642	2045	{
1643	2046	makeSomething(new Torus());
1644	2047	} else
1645		- if (source == superItem)
	2048	+ if (source == superItem \|\| source == superButton)
1646	2049	{
1647	2050	makeSomething(new Superellipsoid());
1648	2051	} else
1649		- if (source == kleinItem)
	2052	+ if (source == kleinItem \|\| source == kleinButton)
1650	2053	{
1651	2054	makeSomething(new Klein());
1652	2055	} else
..	..	@@ -1666,7 +2069,7 @@
1666	2069	{
1667	2070	makeSomething(new BezierSurface());
1668	2071	} else
1669		- if (source == checkerItem)
	2072	+ if (source == overlayItem \|\| source == overlayButton)
1670	2073	{
1671	2074	/*
1672	2075	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1714,7 +2117,7 @@
1714	2117	s.setup();
1715	2118	makeSomething(s);
1716	2119	} else
1717		- if (source == lightItem)
	2120	+ if (source == lightItem \|\| source == lightButton)
1718	2121	{
1719	2122	makeSomething(new Light());
1720	2123	} else
..	..	@@ -1764,30 +2167,30 @@
1764	2167
1765	2168	group(g);
1766	2169	} else
1767		- if (source == loopItem)
	2170	+ if (source == loopItem \|\| source == loopButton)
1768	2171	{
1769	2172	Composite csg = new GroupLeaf();
1770	2173	csg.count = 5;
1771	2174	group(csg);
1772		- Composite child = new cGroup();
	2175	+ Composite child = new cGroup("Branch");
1773	2176	csg.addChild(child);
1774	2177	child.addChild(csg);
1775	2178	} else
1776	2179	if (source == doubleItem)
1777	2180	{
1778		- Composite csg = new GroupLeaf();
	2181	+ Composite csg = new GroupLeaf("Fork");
1779	2182	csg.count = 5;
1780	2183	group(csg);
1781		- Composite child = new cGroup();
	2184	+ Composite child = new cGroup("Branch A");
1782	2185	csg.addChild(child);
1783	2186	child.addChild(csg);
1784		- child = new cGroup();
	2187	+ child = new cGroup("Branch B");
1785	2188	csg.addChild(child);
1786	2189	child.addChild(csg);
1787	2190	} else
1788	2191	if (source == tripleItem)
1789	2192	{
1790		- Composite csg = new GroupLeaf();
	2193	+ Composite csg = new GroupLeaf("Trident");
1791	2194	csg.count = 4;
1792	2195	group(csg);
1793	2196	Composite child = new cGroup();
..	..	@@ -1799,23 +2202,6 @@
1799	2202	child = new cGroup();
1800	2203	csg.addChild(child);
1801	2204	child.addChild(csg);
1802		- } else
1803		-
1804		- if (source == importGFDItem)
1805		- {
1806		- ImportGFD();
1807		- } else
1808		- if (source == importVRMLX3DItem)
1809		- {
1810		- ImportVRMLX3D();
1811		- } else
1812		- if (source == import3DSItem)
1813		- {
1814		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1815		- } else
1816		- if (source == importOBJItem)
1817		- {
1818		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1819	2205	} else
1820	2206	if (source == computeAOItem)
1821	2207	{
..	..	@@ -1835,7 +2221,7 @@
1835	2221	if (source == invariantsItem)
1836	2222	{
1837	2223	System.out.println("Invariants:");
1838		- GrafreeD.grafreeD.universe.invariants();
	2224	+ Grafreed.grafreeD.universe.invariants();
1839	2225	} else
1840	2226	if (source == memoryItem)
1841	2227	{
..	..	@@ -1854,19 +2240,61 @@
1854	2240	{
1855	2241	DumpObject();
1856	2242	} else
	2243	+ if (source == minButton)
	2244	+ {
	2245	+ Minimize();
	2246	+ } else
	2247	+ if (source == maxButton)
	2248	+ {
	2249	+ Maximize();
	2250	+ } else
	2251	+ if (source == fullButton)
	2252	+ {
	2253	+ ToggleFullScreen();
	2254	+ } else
	2255	+ if (source == undoButton)
	2256	+ {
	2257	+ // Go to previous version
	2258	+ //if (!Undo())
	2259	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2260	+ Undo();
	2261	+ } else
	2262	+ if (source == restoreButton)
	2263	+ {
	2264	+ // Restore current version
	2265	+ Restore();
	2266	+ } else
	2267	+ if (source == replaceButton)
	2268	+ {
	2269	+ // Overwrite current version
	2270	+ Replace();
	2271	+ } else
	2272	+ if (source == redoButton)
	2273	+ {
	2274	+ // Go to next version
	2275	+ Redo();
	2276	+ } else
	2277	+ if (source == saveButton)
	2278	+ {
	2279	+ // Save a new version
	2280	+ if (!Save(true))
	2281	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2282	+ } else
	2283	+ if (source == oneStepButton)
	2284	+ {
	2285	+ Globals.ONESTEP = true;
	2286	+ cameraView.repaint();
	2287	+ } else
1857	2288	if (source == screenfitButton)
1858	2289	{
1859		- //Reload(lastConverter, lastFilename, true);
1860	2290	ScreenFit();
1861	2291	} else
1862	2292	if (source == screenfitpointButton)
1863	2293	{
1864		- //Reload(lastConverter, lastFilename, true);
1865	2294	ScreenFitPoint();
1866	2295	} else
1867	2296	if (source == snapobjectButton)
1868	2297	{
1869		- //Reload(lastConverter, lastFilename, true);
1870	2298	SnapObject();
1871	2299	} else
1872	2300	// if (event.getSource() == recompileButton)
..	..	@@ -1903,12 +2331,20 @@
1903	2331	{
1904	2332	loadClipboard(true);
1905	2333	} else
	2334	+ if (source == undoItem)
	2335	+ {
	2336	+ Undo();
	2337	+ } else
	2338	+ if (source == redoItem)
	2339	+ {
	2340	+ Redo();
	2341	+ } else
1906	2342	if (source == duplicateItem)
1907	2343	{
1908		- Object3D keep = GrafreeD.clipboard;
	2344	+ Object3D keep = Grafreed.clipboard;
1909	2345	loadClipboard(false);
1910	2346	paste(false);
1911		- GrafreeD.clipboard = keep;
	2347	+ Grafreed.clipboard = keep;
1912	2348	} else
1913	2349	if (source == cloneItem)
1914	2350	{
..	..	@@ -1926,13 +2362,17 @@
1926	2362	{
1927	2363	paste(false);
1928	2364	} else
	2365	+ if (source == pasteIntoItem)
	2366	+ {
	2367	+ pasteInto(true, false);
	2368	+ } else
1929	2369	if (source == pasteLinkItem)
1930	2370	{
1931		- pasteInto(false);
	2371	+ pasteInto(false, false);
1932	2372	} else
1933	2373	if (source == pasteCloneItem)
1934	2374	{
1935		- pasteInto(true);
	2375	+ pasteInto(true, true);
1936	2376	} else
1937	2377	if (source == pasteExpandItem)
1938	2378	{
..	..	@@ -2124,9 +2564,9 @@
2124	2564	// group.selection.get(0).setMasterThis(content); // should be identity
2125	2565	// refreshContents();
2126	2566	// }
2127		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2567	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2128	2568	{
2129		- Object3D content = GrafreeD.clipboard.get(0);
	2569	+ Object3D content = Grafreed.clipboard.get(0);
2130	2570
2131	2571	if (content instanceof cGroup && ((cGroup)content).transientlink )
2132	2572	content = ((cGroup)content).get(0);
..	..	@@ -2134,11 +2574,11 @@
2134	2574	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2135	2575	for (int i=0; i<group.selection.size(); i++)
2136	2576	{
2137		- boolean random = CameraPane.RANDOM;
2138		- CameraPane.RANDOM = false; // parse all random nodes
	2577	+ boolean random = CameraPane.SWITCH;
	2578	+ CameraPane.SWITCH = false; // parse all random nodes
2139	2579	group.selection.get(i).linkVerticesThis(content);
2140	2580	// group.selection.get(i).setMasterThis(content); // should be identity
2141		- CameraPane.RANDOM = random;
	2581	+ CameraPane.SWITCH = random;
2142	2582	}
2143	2583	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2144	2584	refreshContents();
..	..	@@ -2148,20 +2588,20 @@
2148	2588	{
2149	2589	for (int i=0; i<group.selection.size(); i++)
2150	2590	{
2151		- boolean random = CameraPane.RANDOM;
2152		- CameraPane.RANDOM = false; // parse all random nodes
	2591	+ boolean random = CameraPane.SWITCH;
	2592	+ CameraPane.SWITCH = false; // parse all random nodes
2153	2593	group.selection.get(i).linkVerticesThis(null);
2154		- CameraPane.RANDOM = random;
	2594	+ CameraPane.SWITCH = random;
2155	2595	}
2156	2596
2157	2597	refreshContents();
2158	2598	} else
2159	2599	if (source == relinkverticesItem)
2160	2600	{
2161		- boolean random = CameraPane.RANDOM;
2162		- CameraPane.RANDOM = false; // parse all random nodes
	2601	+ boolean random = CameraPane.SWITCH;
	2602	+ CameraPane.SWITCH = false; // parse all random nodes
2163	2603	group.selection.RelinkToSupport();
2164		- CameraPane.RANDOM = random;
	2604	+ CameraPane.SWITCH = random;
2165	2605
2166	2606	refreshContents();
2167	2607	} else
..	..	@@ -2176,9 +2616,9 @@
2176	2616	} else
2177	2617	if (source == setMasterItem)
2178	2618	{
2179		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2619	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2180	2620	{
2181		- Object3D content = GrafreeD.clipboard.get(0);
	2621	+ Object3D content = Grafreed.clipboard.get(0);
2182	2622
2183	2623	if (content instanceof cGroup && ((cGroup)content).transientlink )
2184	2624	content = ((cGroup)content).get(0);
..	..	@@ -2191,9 +2631,9 @@
2191	2631	{
2192	2632	if (group.selection.size() == 1)
2193	2633	{
2194		- if (GrafreeD.clipboard.size() == 1)
	2634	+ if (Grafreed.clipboard.size() == 1)
2195	2635	{
2196		- Object3D content = GrafreeD.clipboard.get(0);
	2636	+ Object3D content = Grafreed.clipboard.get(0);
2197	2637
2198	2638	if (content instanceof cGroup && ((cGroup)content).transientlink )
2199	2639	content = ((cGroup)content).get(0);
..	..	@@ -2210,7 +2650,7 @@
2210	2650	{
2211	2651	RevertMeshes();
2212	2652	} else
2213		- if (source == resetMeshItem)
	2653	+ if (source == resetAllItem)
2214	2654	{
2215	2655	ResetAll();
2216	2656	} else
..	..	@@ -2230,9 +2670,9 @@
2230	2670	{
2231	2671	ClearSelection(true);
2232	2672	} else
2233		- if (source == grabItem)
	2673	+ if (source == grabItem \|\| source == groupButton)
2234	2674	{
2235		- group(new cGroup(), true);
	2675	+ group(new cGroup(), false); // true);
2236	2676	} else
2237	2677	if (source == hideItem)
2238	2678	{
..	..	@@ -2250,16 +2690,16 @@
2250	2690	{
2251	2691	makeSomething(new Camera());
2252	2692	} else
2253		- if (source == compositeItem)
	2693	+ if (source == compositeItem \|\| source == compositeButton)
2254	2694	{
2255	2695	group(new Composite());
2256	2696	} else
2257		- if (source == randomItem)
	2697	+ if (source == switchItem \|\| source == switchButton)
2258	2698	{
2259	2699	RandomNode random = new RandomNode();
2260	2700	group(random);
2261	2701	if (random.size() > 0)
2262		- random.name = random.get(0).name + "Rnd";
	2702	+ random.name = random.get(0).name + "Switch";
2263	2703	} else
2264	2704	if (source == physicsItem)
2265	2705	{
..	..	@@ -2356,7 +2796,7 @@
2356	2796	{
2357	2797	group(new cLinker());
2358	2798	} else
2359		- if (source == textureItem)
	2799	+ if (source == textureItem \|\| source == textureButton)
2360	2800	{
2361	2801	group(new TextureNode());
2362	2802	} else
..	..	@@ -2376,17 +2816,30 @@
2376	2816	{
2377	2817	CastShadow(2);
2378	2818	} else
2379		- if (source == ungroupItem)
	2819	+ if (source == ungroupItem \|\| source == ungroupButton)
2380	2820	{
2381		- //ungroup();
	2821	+ boolean hasRoot = false;
	2822	+
2382	2823	for (int i=0; i<group.selection.size(); i++)
2383	2824	{
2384		- Ungroup(group.selection.get(i));
	2825	+ if (group.selection.get(i) == group)
	2826	+ {
	2827	+ hasRoot = true;
	2828	+ break;
	2829	+ }
2385	2830	}
2386	2831
2387		- ClearSelection(false);
2388		-
2389		- refreshContents();
	2832	+ if (!hasRoot)
	2833	+ {
	2834	+ for (int i=0; i<group.selection.size(); i++)
	2835	+ {
	2836	+ Ungroup(group.selection.get(i));
	2837	+ }
	2838	+
	2839	+ ClearSelection(false);
	2840	+
	2841	+ refreshContents();
	2842	+ }
2390	2843	} else
2391	2844	if (source == genUVItem)
2392	2845	{
..	..	@@ -2398,7 +2851,7 @@
2398	2851	} else
2399	2852	if (source == genNormalsMESHItem)
2400	2853	{
2401		- GenNormals(true); // TODO
	2854	+ GenNormalsMESH();
2402	2855	} else
2403	2856	if (source == genNormalsORGANItem)
2404	2857	{
..	..	@@ -2463,6 +2916,22 @@
2463	2916	if (source == unmarkleavesItem)
2464	2917	{
2465	2918	MarkLeaves(false);
	2919	+ } else
	2920	+ if (source == rewindleavesItem)
	2921	+ {
	2922	+ RewindLeaves(true);
	2923	+ } else
	2924	+ if (source == unrewindleavesItem)
	2925	+ {
	2926	+ RewindLeaves(false);
	2927	+ } else
	2928	+ if (source == randomleavesItem)
	2929	+ {
	2930	+ RandomLeaves(true);
	2931	+ } else
	2932	+ if (source == unrandomleavesItem)
	2933	+ {
	2934	+ RandomLeaves(false);
2466	2935	} else
2467	2936	if (source == flipVItem)
2468	2937	{
..	..	@@ -2548,9 +3017,13 @@
2548	3017	{
2549	3018	SmoothMesh();
2550	3019	} else
2551		- if (source == transformgeometryItem)
	3020	+ if (source == transformGeometryItem)
2552	3021	{
2553	3022	TransformGeometry();
	3023	+ } else
	3024	+ if (source == transformChildrenItem)
	3025	+ {
	3026	+ TransformChildren();
2554	3027	} else
2555	3028	if (source == resetTransformItem)
2556	3029	{
..	..	@@ -2558,7 +3031,11 @@
2558	3031	} else
2559	3032	if (source == resetCentroidItem)
2560	3033	{
2561		- ResetCentroid();
	3034	+ ResetCentroid(true);
	3035	+ } else
	3036	+ if (source == resetCentroidXZItem)
	3037	+ {
	3038	+ ResetCentroid(false);
2562	3039	} else
2563	3040	if (source == resetParentItem)
2564	3041	{
..	..	@@ -2690,6 +3167,10 @@
2690	3167	if (source == twoButton)
2691	3168	{
2692	3169	radio.layout = twoButton;
	3170	+
	3171	+ if (CameraPane.FULLSCREEN)
	3172	+ fullscreenLayout = radio.layout;
	3173	+
2693	3174	// bug
2694	3175	//gridPanel.setDividerLocation(1.0);
2695	3176	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2720,12 +3201,33 @@
2720	3201	// centralPanel.setVisible(true);
2721	3202	// XYZPanel.setVisible(false);
2722	3203	bigThree.ClearUI();
2723		- bigThree.addComponent(centralPanel);
	3204	+ bigThree.add(centralPanel);
2724	3205	bigThree.FlushUI();
	3206	+
	3207	+ cameraView.requestFocusInWindow();
	3208	+
	3209	+// refreshContents(true);
	3210	+//
	3211	+// try
	3212	+// {
	3213	+// java.awt.Robot bot = new java.awt.Robot();
	3214	+// int mask = InputEvent.BUTTON1_MASK;
	3215	+// bot.mouseMove(100, 100);
	3216	+// bot.mousePress(mask);
	3217	+// bot.mouseRelease(mask);
	3218	+// }
	3219	+// catch (Exception e)
	3220	+// {
	3221	+//
	3222	+// }
	3223	+
2725	3224	} else
2726	3225	if (source == threeButton)
2727	3226	{
2728	3227	radio.layout = threeButton;
	3228	+
	3229	+ if (CameraPane.FULLSCREEN)
	3230	+ fullscreenLayout = radio.layout;
2729	3231
2730	3232	// bigThree.remove(scenePanel);
2731	3233	// bigThree.remove(centralPanel);
..	..	@@ -2755,13 +3257,18 @@
2755	3257	// centralPanel.setVisible(true);
2756	3258	// XYZPanel.setVisible(true);
2757	3259	bigThree.ClearUI();
2758		- bigThree.addComponent(centralPanel);
2759		- bigThree.addComponent(XYZPanel);
	3260	+ bigThree.add(centralPanel);
	3261	+ bigThree.add(XYZPanel);
2760	3262	bigThree.FlushUI();
	3263	+
	3264	+ cameraView.requestFocusInWindow();
2761	3265	} else
2762	3266	if (source == fourButton)
2763	3267	{
2764	3268	radio.layout = fourButton;
	3269	+
	3270	+ if (CameraPane.FULLSCREEN)
	3271	+ fullscreenLayout = radio.layout;
2765	3272
2766	3273	// bigThree.remove(scenePanel);
2767	3274	// bigThree.remove(centralPanel);
..	..	@@ -2791,12 +3298,17 @@
2791	3298	// centralPanel.setVisible(false);
2792	3299	// XYZPanel.setVisible(false);
2793	3300	bigThree.ClearUI();
2794		- bigThree.addComponent(scenePanel);
	3301	+ bigThree.add(scenePanel);
2795	3302	bigThree.FlushUI();
	3303	+
	3304	+ cameraView.requestFocusInWindow();
2796	3305	} else
2797	3306	if (source == sixButton)
2798	3307	{
2799	3308	radio.layout = sixButton;
	3309	+
	3310	+ if (CameraPane.FULLSCREEN)
	3311	+ fullscreenLayout = radio.layout;
2800	3312
2801	3313	// bigThree.remove(scenePanel);
2802	3314	// bigThree.remove(centralPanel);
..	..	@@ -2826,13 +3338,18 @@
2826	3338	// centralPanel.setVisible(true);
2827	3339	// XYZPanel.setVisible(false);
2828	3340	bigThree.ClearUI();
2829		- bigThree.addComponent(scenePanel);
2830		- bigThree.addComponent(centralPanel);
	3341	+ bigThree.add(scenePanel);
	3342	+ bigThree.add(centralPanel);
2831	3343	bigThree.FlushUI();
	3344	+
	3345	+ cameraView.requestFocusInWindow();
2832	3346	} else
2833	3347	if (source == sevenButton)
2834	3348	{
2835	3349	radio.layout = sevenButton;
	3350	+
	3351	+ if (CameraPane.FULLSCREEN)
	3352	+ fullscreenLayout = radio.layout;
2836	3353
2837	3354	// bigThree.remove(scenePanel);
2838	3355	// bigThree.remove(centralPanel);
..	..	@@ -2862,10 +3379,12 @@
2862	3379	// centralPanel.setVisible(true);
2863	3380	// XYZPanel.setVisible(true);
2864	3381	bigThree.ClearUI();
2865		- bigThree.addComponent(scenePanel);
2866		- bigThree.addComponent(centralPanel);
2867		- bigThree.addComponent(XYZPanel);
	3382	+ bigThree.add(scenePanel);
	3383	+ bigThree.add(centralPanel);
	3384	+ bigThree.add(XYZPanel);
2868	3385	bigThree.FlushUI();
	3386	+
	3387	+ cameraView.requestFocusInWindow();
2869	3388	} else
2870	3389	if (source == rootButton)
2871	3390	{
..	..	@@ -2877,6 +3396,7 @@
2877	3396	EditObject(obj);
2878	3397	}
2879	3398
	3399	+ cameraView.requestFocusInWindow();
2880	3400	refreshContents(true);
2881	3401	} else
2882	3402	if (source == closeButton)
..	..	@@ -2886,22 +3406,37 @@
2886	3406	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2887	3407	{
2888	3408	ab = (cRadio)e.nextElement();
2889		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3409	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2890	3410	{
	3411	+ // Patch to avoid bug with transparency.
	3412	+ if (!ab.hadMaterial)
	3413	+ {
	3414	+ ab.object.material = null;
	3415	+ }
	3416	+
2891	3417	buttonGroup.remove(ab);
2892	3418	radioPanel.remove(ab);
2893	3419
2894		- ab.GetObject().editWindow = null;
	3420	+ //ab.GetObject().editWindow = null;
	3421	+ ab.GetObject().manipWindow = null;
2895	3422	// ab.GetObject().objectUI = null; // ?????????
2896	3423
2897	3424	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2898	3425	break;
2899	3426	}
2900	3427	}
	3428	+
	3429	+ cameraView.requestFocusInWindow();
2901	3430	refreshContents(true);
2902	3431	} else
2903	3432	if (source == editItem \|\| source == editButton)
2904	3433	{
	3434	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3435	+ {
	3436	+ Object3D child = (Object3D)e.nextElement();
	3437	+ child.pinned = true;
	3438	+ }
	3439	+
2905	3440	EditSelection(false);
2906	3441	} else
2907	3442	if (source == uneditButton)
..	..	@@ -2911,12 +3446,13 @@
2911	3446	Object3D child = (Object3D)e.nextElement();
2912	3447	if(child.editWindow != null)
2913	3448	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3449	+ child.pinned = false;
2914	3450	child.CloseUI();
2915	3451	listUI.remove(child);
2916	3452
2917		- child.editWindow = null; // ???????????
	3453	+ //child.editWindow = null; // ???????????
2918	3454	}
2919		- objEditor.ctrlPanel.revalidate();
	3455	+ objEditor.ctrlPanel.FlushUI();
2920	3456	//objEditor.jTree.clearSelection();
2921	3457	//objEditor.ResetSliders();
2922	3458	refreshContents(true);
..	..	@@ -2927,6 +3463,7 @@
2927	3463	//copy.ClearUI();
2928	3464	for (Object3D obj : listUI)
2929	3465	{
	3466	+ obj.pinned = false;
2930	3467	obj.CloseUI();
2931	3468	}
2932	3469	listUI.clear();
..	..	@@ -2936,7 +3473,7 @@
2936	3473	{
2937	3474	assert(copy == group);
2938	3475
2939		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3476	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2940	3477
2941	3478	for (Object3D obj : listUI)
2942	3479	{
..	..	@@ -2985,6 +3522,9 @@
2985	3522	}
2986	3523
2987	3524	copy = group;
	3525	+
	3526	+ SetUndoStates();
	3527	+
2988	3528	//Globals.theRenderer.object = group;
2989	3529	if(!useclient)
2990	3530	{
..	..	@@ -3000,20 +3540,46 @@
3000	3540	frontView.object = group;
3001	3541	sideView.object = group;
3002	3542	}
3003		- group.editWindow = this;
	3543	+
	3544	+// fix "+" issue
	3545	+ //group.editWindow = this;
	3546	+ group.manipWindow = this;
	3547	+
3004	3548	/*
3005	3549	currentLayout = radio.layout;
3006	3550	if (currentLayout == null)
3007	3551	currentLayout = sevenButton;
3008	3552	*/
3009	3553	radio.layout.doClick();
	3554	+
	3555	+ ClearUnpinned();
	3556	+ Grafreed.Assert(group != null);
	3557	+ Grafreed.Assert(group.selection != null);
	3558	+ SetPinStates(group.selection.size() > 0);
	3559	+ if (group.selection.size() == 1)
	3560	+ EditSelection(false);
3010	3561	keepparent = group.parent;
3011	3562	// PARENT = NULL or not???
3012	3563	//group.parent = null; // ROOT
3013	3564	//group.attributes = -1;
3014	3565	ResetModel();
	3566	+
	3567	+ cameraView.requestFocusInWindow();
3015	3568	refreshContents(true);
3016		- }
	3569	+ } else if (event.getSource() == editCameraItem)
	3570	+ {
	3571	+ cameraView.ProtectCamera();
	3572	+ cameraView.repaint();
	3573	+ return;
	3574	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3575	+ {
	3576	+ cameraView.RevertCamera();
	3577	+ cameraView.repaint();
	3578	+ return;
	3579	+ // } else if (event.getSource() == textureButton)
	3580	+ // {
	3581	+ // return; // true;
	3582	+ }
3017	3583	else
3018	3584	{
3019	3585	//return super.action(event, arg);
..	..	@@ -3022,7 +3588,6 @@
3022	3588	}
3023	3589
3024	3590	boolean useclient = false;
3025		- cRadio radio;
3026	3591
3027	3592	void ToggleRoot()
3028	3593	{
..	..	@@ -3074,6 +3639,28 @@
3074	3639	refreshContents();
3075	3640	}
3076	3641
	3642	+ void TransformChildren()
	3643	+ {
	3644	+ Object3D obj;
	3645	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3646	+ {
	3647	+ obj = (Object3D)e.nextElement();
	3648	+ obj.KeepTextureMatrices();
	3649	+ obj.TransformChildren();
	3650	+ obj.RestoreTextureMatrices();
	3651	+
	3652	+// if (obj.parent == null)
	3653	+// {
	3654	+// System.out.println("NULL PARENT!");
	3655	+// new Exception().printStackTrace();
	3656	+// }
	3657	+// else
	3658	+// TouchTransform(obj);
	3659	+// //obj.parent.Touch();
	3660	+ }
	3661	+
	3662	+ refreshContents();
	3663	+ }
3077	3664
3078	3665	void ResetTransform()
3079	3666	{
..	..	@@ -3186,7 +3773,7 @@
3186	3773	refreshContents();
3187	3774	}
3188	3775
3189		- void ResetCentroid()
	3776	+ void ResetCentroid(boolean full)
3190	3777	{
3191	3778	Object3D obj;
3192	3779	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3201,12 +3788,16 @@
3201	3788	LA.matIdentity(Object3D.mat);
3202	3789	obj.getBounds(minima, maxima, false);
3203	3790	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3204		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3791	+ if (full)
	3792	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3205	3793	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3206	3794	obj.TransformMesh(Object3D.mat);
	3795	+
3207	3796	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3208		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3797	+ if (full)
	3798	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3209	3799	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3800	+
3210	3801	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3211	3802	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3212	3803	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3235,7 +3826,8 @@
3235	3826
3236	3827	int size = obj.MemorySize();
3237	3828
3238		- System.err.println((size/1024) + " KB is the size of " + obj);
	3829	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3830	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3239	3831	}
3240	3832	}
3241	3833	catch (Exception e)
..	..	@@ -3272,9 +3864,9 @@
3272	3864	obj = (Object3D)e.nextElement();
3273	3865
3274	3866	System.out.println("Object is: " + obj);
3275		- GrafreeD.AnalyzeObject(obj);
	3867	+ Grafreed.AnalyzeObject(obj);
3276	3868	System.out.println("Boundary rep: " + obj.bRep);
3277		- GrafreeD.AnalyzeObject(obj.bRep);
	3869	+ Grafreed.AnalyzeObject(obj.bRep);
3278	3870
3279	3871	// System.err.println((size/1024) + " KB is the size of " + obj);
3280	3872	}
..	..	@@ -3316,6 +3908,13 @@
3316	3908	void GenNormals(boolean crease)
3317	3909	{
3318	3910	group.GenNormalsS(crease);
	3911	+
	3912	+ refreshContents();
	3913	+ }
	3914	+
	3915	+ void GenNormalsMESH()
	3916	+ {
	3917	+ group.GenNormalsMeshS();
3319	3918
3320	3919	refreshContents();
3321	3920	}
..	..	@@ -3488,8 +4087,8 @@
3488	4087
3489	4088	void ParseVertices()
3490	4089	{
3491		- boolean epsequal = GrafreeD.epsequal;
3492		- GrafreeD.epsequal = true;
	4090	+ boolean epsequal = Grafreed.epsequal;
	4091	+ Grafreed.epsequal = true;
3493	4092
3494	4093	for (int i=0; i<group.selection.size(); i++)
3495	4094	{
..	..	@@ -3514,7 +4113,7 @@
3514	4113	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3515	4114	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3516	4115
3517		- g.add(GrafreeD.clipboard);
	4116	+ g.add(Grafreed.clipboard);
3518	4117
3519	4118	buffer.add(g);
3520	4119	}
..	..	@@ -3529,7 +4128,7 @@
3529	4128	makeSomething(buffer, i==group.selection.size()-1);
3530	4129	}
3531	4130
3532		- GrafreeD.epsequal = epsequal;
	4131	+ Grafreed.epsequal = epsequal;
3533	4132
3534	4133	refreshContents();
3535	4134	}
..	..	@@ -3547,7 +4146,16 @@
3547	4146	String pigment = Object3D.GetPigment(tex);
3548	4147	//String bump = Object3D.GetBump(tex);
3549	4148
3550		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4149	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4150	+
	4151	+ try
	4152	+ {
	4153	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4154	+ }
	4155	+ catch (Exception e)
	4156	+ {
	4157	+ System.err.println("FAIL: " + node);
	4158	+ }
3551	4159
3552	4160	double s = v.s;
3553	4161
..	..	@@ -3635,11 +4243,11 @@
3635	4243
3636	4244	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3637	4245
3638		- boolean random = CameraPane.RANDOM;
3639		- CameraPane.RANDOM = false; // parse all random nodes
	4246	+ boolean random = CameraPane.SWITCH;
	4247	+ CameraPane.SWITCH = false; // parse all random nodes
3640	4248	lowres.linkVerticesThis(null);
3641	4249	lowres.linkVerticesThis(sn);
3642		- CameraPane.RANDOM = random;
	4250	+ CameraPane.SWITCH = random;
3643	4251
3644	4252	System.err.flush();
3645	4253
..	..	@@ -3679,7 +4287,7 @@
3679	4287	return;
3680	4288
3681	4289	Object3D poses = group.selection.get(0);
3682		- Object3D ref = GrafreeD.clipboard.get(0);
	4290	+ Object3D ref = Grafreed.clipboard.get(0);
3683	4291
3684	4292	Object3D newgroup = new Object3D("Po:" + poses.name);
3685	4293
..	..	@@ -3873,9 +4481,9 @@
3873	4481
3874	4482	void ClipMesh()
3875	4483	{
3876		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4484	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3877	4485	{
3878		- Object3D content = GrafreeD.clipboard.get(0);
	4486	+ Object3D content = Grafreed.clipboard.get(0);
3879	4487
3880	4488	if (content instanceof cGroup && ((cGroup)content).transientlink )
3881	4489	content = ((cGroup)content).get(0);
..	..	@@ -3884,7 +4492,7 @@
3884	4492	// {
3885	4493	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3886	4494	// }
3887		- group.selection.ClipMesh(GrafreeD.clipboard);
	4495	+ group.selection.ClipMesh(Grafreed.clipboard);
3888	4496	}
3889	4497	// group.selection.ClipMesh(GrafreeD.clipboard);
3890	4498	System.out.println("DONE.");
..	..	@@ -3931,6 +4539,18 @@
3931	4539	void MarkLeaves(boolean hide)
3932	4540	{
3933	4541	group.selection.MarkLeaves(hide);
	4542	+ refreshContents();
	4543	+ }
	4544	+
	4545	+ void RewindLeaves(boolean hide)
	4546	+ {
	4547	+ group.selection.RewindLeaves(hide);
	4548	+ refreshContents();
	4549	+ }
	4550	+
	4551	+ void RandomLeaves(boolean hide)
	4552	+ {
	4553	+ group.selection.RandomLeaves(hide);
3934	4554	refreshContents();
3935	4555	}
3936	4556
..	..	@@ -4005,10 +4625,6 @@
4005	4625	// }
4006	4626	// }
4007	4627
4008		- static boolean allparams = true;
4009		-
4010		- static Vector<Object3D> listUI = new Vector<Object3D>();
4011		-
4012	4628	void EditSelection(boolean newWindow)
4013	4629	{
4014	4630	// aConstraints.gridy = 0;
..	..	@@ -4016,10 +4632,10 @@
4016	4632	{
4017	4633	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4018	4634	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4019		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4635	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4020	4636
4021	4637	Object3D elem = (Object3D)group.selection.elementAt(i);
4022		- if(elem != group)
	4638	+ if(elem != group \|\| !newWindow)
4023	4639	{
4024	4640	// if (!(elem instanceof Composite))
4025	4641	// newWindow = false;
..	..	@@ -4101,7 +4717,8 @@
4101	4717	//new Exception().printStackTrace();
4102	4718
4103	4719	freezemodel = true;
4104		-
	4720	+ ClearUnpinned();
	4721	+
4105	4722	/**/
4106	4723	//switch (event.id)
4107	4724	{
..	..	@@ -4109,7 +4726,6 @@
4109	4726	//case 702: // Event.LIST_DESELECT
4110	4727	group.deselectAll();
4111	4728	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4112		- objEditor.ClearInfo(); // .GetMaterial());
4113	4729	if (tps != null)
4114	4730	{
4115	4731	for (int i=0; i < tps.length; i++)
..	..	@@ -4118,33 +4734,39 @@
4118	4734
4119	4735	//if (child.parent != null)
4120	4736	//child.parent.addSelectee(child);
	4737	+ objEditor.SetMaterial(child);
4121	4738	group.addSelectee(child);
4122		- objEditor.SetMaterial(child); // .GetMaterial());
4123		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4124		- System.err.println("info : " + child.GetPath());
4125	4739	}
4126	4740	}
4127		- else
4128		- {
4129		- objEditor.SetMaterial(group); // .GetMaterial());
4130		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4131		- System.err.println("info : " + group.GetPath());
4132		- }
	4741	+// else
	4742	+// {
	4743	+// objEditor.SetMaterial(group); // .GetMaterial());
	4744	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4745	+// System.err.println("info : " + group.GetPath());
	4746	+// }
4133	4747
4134		- objEditor.SetText(); // jan 2014
4135		-
4136		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4748	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4137	4749	CameraPane.flash = true;
4138	4750
4139		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4751	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4140	4752	// a camera
4141	4753	{
4142		- CameraPane.camerachangeframe = 0; // don't refuse it
4143		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4754	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4755	+ {
	4756	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4757	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4758	+ }
4144	4759	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4145	4760	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4146	4761	}
4147	4762
	4763	+ if (tps != null && tps.length == 1)
	4764	+ {
	4765	+ EditSelection(false);
	4766	+ }
	4767	+
	4768	+ SetPinStates(tps != null && tps.length > 0);
	4769	+
4148	4770	refreshContents();
4149	4771	//return true;
4150	4772	}
..	..	@@ -4153,6 +4775,35 @@
4153	4775
4154	4776	freezemodel = false;
4155	4777	}
	4778	+
	4779	+ void SetPinStates(boolean enabled)
	4780	+ {
	4781	+ editButton.setEnabled(enabled);
	4782	+ uneditButton.setEnabled(enabled);
	4783	+ unselectButton.setEnabled(enabled);
	4784	+ flashSelectionButton.setEnabled(enabled);
	4785	+ }
	4786	+
	4787	+ void refreshContents(boolean cp)
	4788	+ {
	4789	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4790	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4791	+ {
	4792	+ objEditor.ClearInfo(); // .GetMaterial());
	4793	+
	4794	+ for (int i=0; i < group.selection.Size(); i++)
	4795	+ {
	4796	+ Object3D child = (Object3D) group.selection.get(i);
	4797	+
	4798	+ objEditor.AddInfo(child, this, true);
	4799	+ System.err.println("info : " + child.GetPath());
	4800	+ }
	4801	+
	4802	+ objEditor.SetText(); // jan 2014
	4803	+ }
	4804	+
	4805	+ super.refreshContents(cp);
	4806	+ }
4156	4807
4157	4808	void linkSomething(Object3D thing)
4158	4809	{
..	..	@@ -4224,16 +4875,19 @@
4224	4875	{
4225	4876	if (group.selection.isEmpty())
4226	4877	return;
4227		- GrafreeD.clipboardIsTempGroup = false;
	4878	+
	4879	+ Grafreed.clipboardIsTempGroup = false;
4228	4880	Composite tGroup = null;
4229	4881	if (group.selection.size() > 0) // 1)
4230	4882	{
4231	4883	tGroup = new cGroup();
4232		- GrafreeD.clipboardIsTempGroup = true;
	4884	+ Grafreed.clipboardIsTempGroup = true;
4233	4885	}
4234	4886
4235	4887	if (cut)
4236	4888	{
	4889	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4890	+// Save();
4237	4891	//int indices[] = jList.getSelectedIndices();
4238	4892	//for (int i = indices.length - 1; i >= 0; i--)
4239	4893	//jList.remove(indices[i]);
..	..	@@ -4269,16 +4923,16 @@
4269	4923	//System.out.println("cut " + child);
4270	4924	//System.out.println("parent = " + child.parent);
4271	4925	// tmp.addChild(child);
4272		- if (GrafreeD.clipboardIsTempGroup)
	4926	+ if (Grafreed.clipboardIsTempGroup)
4273	4927	tGroup.add/Child/(tmp);
4274	4928	else
4275		- GrafreeD.clipboard = tmp;
	4929	+ Grafreed.clipboard = tmp;
4276	4930	}
4277	4931	else
4278		- if (GrafreeD.clipboardIsTempGroup)
	4932	+ if (Grafreed.clipboardIsTempGroup)
4279	4933	tGroup.add/Child/(child);
4280	4934	else
4281		- GrafreeD.clipboard = child;
	4935	+ Grafreed.clipboard = child;
4282	4936	}
4283	4937
4284	4938	//ResetModel();
..	..	@@ -4310,21 +4964,23 @@
4310	4964	//System.out.println("cut " + elem);
4311	4965	//System.out.println("parent = " + elem.parent);
4312	4966	// tmp.addChild(elem);
4313		- if (GrafreeD.clipboardIsTempGroup)
	4967	+ if (Grafreed.clipboardIsTempGroup)
4314	4968	tGroup.add/Child/(tmp);
4315	4969	else
4316		- GrafreeD.clipboard = tmp;
	4970	+ Grafreed.clipboard = tmp;
4317	4971	}
4318	4972	else
4319		- if (GrafreeD.clipboardIsTempGroup)
	4973	+ if (Grafreed.clipboardIsTempGroup)
4320	4974	tGroup.add/Child/(child);
4321	4975	else
4322		- GrafreeD.clipboard = child;
	4976	+ Grafreed.clipboard = child;
4323	4977	}
4324	4978
4325	4979	}
4326		- if (GrafreeD.clipboardIsTempGroup)
4327		- GrafreeD.clipboard = tGroup;
	4980	+
	4981	+ if (Grafreed.clipboardIsTempGroup)
	4982	+ Grafreed.clipboard = tGroup;
	4983	+
4328	4984	if (cut)
4329	4985	{
4330	4986	ResetModel();
..	..	@@ -4334,11 +4990,15 @@
4334	4990
4335	4991	void paste(boolean expand)
4336	4992	{
	4993	+ if (Globals.REPLACEONMAKE)
	4994	+ Save();
	4995	+ boolean keep = Globals.REPLACEONMAKE;
	4996	+ Globals.REPLACEONMAKE = false;
4337	4997	// if (GrafreeD.clipboard == null)
4338	4998	// return;
4339	4999	boolean first = true;
4340	5000
4341		- if (GrafreeD.clipboardIsTempGroup)
	5001	+ if (Grafreed.clipboardIsTempGroup)
4342	5002	{
4343	5003	Composite temp;
4344	5004
..	..	@@ -4349,7 +5009,7 @@
4349	5009	temp = (Composite)Applet3D.clipboard.deepCopy();
4350	5010	*/
4351	5011	Object3D elem;
4352		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5012	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4353	5013	{
4354	5014	Object3D child = (Object3D)e.nextElement();
4355	5015
..	..	@@ -4383,21 +5043,22 @@
4383	5043	//Object3D cb = Applet3D.clipboard;
4384	5044	//temp.addChild(cb);
4385	5045	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4386		- assert(GrafreeD.clipboard.parent == null);
4387		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4388		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4389		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4390		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5046	+ assert(Grafreed.clipboard.parent == null);
	5047	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5048	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5049	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5050	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4391	5051	else
4392		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4393		- GrafreeD.clipboard.get(0).parent = keepparent;
	5052	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5053	+ Grafreed.clipboard.get(0).parent = keepparent;
4394	5054	}
4395	5055
	5056	+ Globals.REPLACEONMAKE = keep;
4396	5057	ResetModel();
4397	5058	refreshContents();
4398	5059	}
4399	5060
4400		- void pasteInto(boolean copyit)
	5061	+ void pasteInto(boolean copyit, boolean clone)
4401	5062	{
4402	5063	// if (GrafreeD.clipboard == null)
4403	5064	// return;
..	..	@@ -4426,15 +5087,22 @@
4426	5087	if (copyit)
4427	5088	{
4428	5089	// paste(false);
4429		- CloneClipboard(false); // sept 2014
	5090	+ if (clone)
	5091	+ {
	5092	+ CloneClipboard(false); // sept 2014
	5093	+ }
	5094	+ else
	5095	+ {
	5096	+ paste(false);
	5097	+ }
4430	5098	}
4431	5099	else
4432	5100	{
4433	5101	boolean first = true;
4434	5102
4435		- if (GrafreeD.clipboardIsTempGroup)
	5103	+ if (Grafreed.clipboardIsTempGroup)
4436	5104	{
4437		- Composite temp = (Composite)GrafreeD.clipboard;
	5105	+ Composite temp = (Composite)Grafreed.clipboard;
4438	5106	Object3D copy;
4439	5107	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4440	5108	{
..	..	@@ -4444,7 +5112,7 @@
4444	5112	}
4445	5113	} else
4446	5114	{
4447		- linkSomething(GrafreeD.clipboard); //.get(0));
	5115	+ linkSomething(Grafreed.clipboard); //.get(0));
4448	5116	}
4449	5117	}
4450	5118	}
..	..	@@ -4521,6 +5189,10 @@
4521	5189
4522	5190	void group(Object3D csg, boolean grab)
4523	5191	{
	5192	+ if (Globals.REPLACEONMAKE)
	5193	+ Save();
	5194	+ boolean keep = Globals.REPLACEONMAKE;
	5195	+ Globals.REPLACEONMAKE = false;
4524	5196	if (//false) // why??
4525	5197	!group.selection.isEmpty())
4526	5198	{
..	..	@@ -4634,10 +5306,15 @@
4634	5306	//node.add(csg);
4635	5307	//makeSomething(node);
4636	5308	makeSomething(csg);
	5309	+ Globals.REPLACEONMAKE = keep;
4637	5310	}
4638	5311
4639	5312	void Ungroup(Object3D g)
4640	5313	{
	5314	+ if (Globals.REPLACEONMAKE)
	5315	+ Save();
	5316	+ boolean keep = Globals.REPLACEONMAKE;
	5317	+ Globals.REPLACEONMAKE = false;
4641	5318	if (g instanceof HiddenObject)
4642	5319	{
4643	5320	HiddenObject h = (HiddenObject) g;
..	..	@@ -4654,6 +5331,7 @@
4654	5331	objEditor.makeSomething(g.get(i), false);
4655	5332	}
4656	5333	}
	5334	+ Globals.REPLACEONMAKE = keep;
4657	5335	}
4658	5336
4659	5337	void ungroup()
..	..	@@ -4849,21 +5527,6 @@
4849	5527	}
4850	5528	*/
4851	5529
4852		- void ImportGFD()
4853		- {
4854		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4855		- browser.show();
4856		- String filename = browser.getFile();
4857		- if (filename != null && filename.length() > 0)
4858		- {
4859		- String fullname = browser.getDirectory() + filename;
4860		-
4861		- //Object3D readobj =
4862		- objEditor.ReadGFD(fullname, objEditor);
4863		- //makeSomething(readobj);
4864		- }
4865		- }
4866		-
4867	5530	/*
4868	5531	public void Callback(Object obj)
4869	5532	{
..	..	@@ -4887,26 +5550,9 @@
4887	5550	}
4888	5551	*/
4889	5552
4890		- void ImportVRMLX3D()
4891		- {
4892		- if (GrafreeD.standAlone)
4893		- {
4894		- /**/
4895		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4896		- browser.show();
4897		- String filename = browser.getFile();
4898		- if (filename != null && filename.length() > 0)
4899		- {
4900		- String fullname = browser.getDirectory() + filename;
4901		- LoadVRMLX3D(fullname);
4902		- }
4903		- /**/
4904		- }
4905		- }
4906		-
4907	5553	String GetFile(String dialogName)
4908	5554	{
4909		- if (GrafreeD.standAlone)
	5555	+ if (Grafreed.standAlone)
4910	5556	{
4911	5557	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4912	5558	browser.show();
..	..	@@ -4970,10 +5616,33 @@
4970	5616	cButton flashSelectionButton;
4971	5617	cButton editButton;
4972	5618	cButton uneditButton;
	5619	+ JCheckBox allParamsButton;
4973	5620	cButton clearpanelButton;
4974		- cButton allParamsButton;
4975	5621	cButton unselectButton;
4976	5622
	5623	+ cButton restoreCameraButton;
	5624	+
	5625	+ cButton saveButton;
	5626	+ cButton oneStepButton;
	5627	+
	5628	+ cButton groupButton;
	5629	+ cButton ungroupButton;
	5630	+ cButton compositeButton;
	5631	+ cButton switchButton;
	5632	+ cButton loopButton;
	5633	+ cButton textureButton;
	5634	+
	5635	+ cButton gridButton;
	5636	+ cButton boxButton;
	5637	+ cButton sphereButton;
	5638	+ cButton coneButton;
	5639	+ cButton torusButton;
	5640	+ cButton superButton;
	5641	+ cButton kleinButton;
	5642	+ cButton particlesButton;
	5643	+ cButton overlayButton;
	5644	+ cButton lightButton;
	5645	+
4977	5646	cButton screenfitButton;
4978	5647	cButton screenfitpointButton;
4979	5648	cButton snapobjectButton;
..	..	@@ -4985,14 +5654,6 @@
4985	5654
4986	5655	cButton setsupportButton;
4987	5656
4988		- cButton twoButton;
4989		- cButton sixButton;
4990		- cButton threeButton;
4991		- cButton sevenButton;
4992		- cButton fourButton; // full panel
4993		- cButton oneButton; // full XYZ
4994		- //cButton currentLayout;
4995		-
4996	5657	//
4997	5658	//Composite
4998	5659	Object3D // to do !!
..	..	@@ -5002,9 +5663,11 @@
5002	5663	//JTree jTree;
5003	5664	private MenuItem lookAtItem;
5004	5665	private MenuItem lookFromItem;
5005		- private MenuItem switchItem;
	5666	+ private MenuItem switchViewItem;
5006	5667	private MenuItem cutItem;
5007		- private MenuItem duplicateItem;
	5668	+ private MenuItem undoItem;
	5669	+ private MenuItem redoItem;
	5670	+ private JMenuItem duplicateItem;
5008	5671	private MenuItem cloneItem;
5009	5672	private MenuItem cloneSupportItem;
5010	5673	private MenuItem overwriteGeoItem;
..	..	@@ -5017,7 +5680,7 @@
5017	5680	private MenuItem linkverticesItem;
5018	5681	private MenuItem relinkverticesItem;
5019	5682	private MenuItem setMasterItem;
5020		- private MenuItem resetMeshItem;
	5683	+ private MenuItem resetAllItem;
5021	5684	private MenuItem stepAllItem;
5022	5685	private MenuItem revertMeshItem;
5023	5686	private MenuItem poseMeshItem;
..	..	@@ -5028,6 +5691,7 @@
5028	5691	private MenuItem mergeGeometriesItem;
5029	5692	private MenuItem copyItem;
5030	5693	private MenuItem pasteItem;
	5694	+ private MenuItem pasteIntoItem;
5031	5695	private MenuItem pasteLinkItem;
5032	5696	private MenuItem pasteCloneItem;
5033	5697	private MenuItem pasteExpandItem;
..	..	@@ -5066,6 +5730,10 @@
5066	5730	private MenuItem showleavesItem;
5067	5731	private MenuItem markleavesItem;
5068	5732	private MenuItem unmarkleavesItem;
	5733	+ private MenuItem rewindleavesItem;
	5734	+ private MenuItem unrewindleavesItem;
	5735	+ private MenuItem randomleavesItem;
	5736	+ private MenuItem unrandomleavesItem;
5069	5737
5070	5738	private MenuItem flipVItem;
5071	5739	private MenuItem unflipVItem;
..	..	@@ -5077,15 +5745,17 @@
5077	5745	private MenuItem panoTexturesItem;
5078	5746
5079	5747	private MenuItem resetCentroidItem;
5080		- private MenuItem transformgeometryItem;
	5748	+ private MenuItem resetCentroidXZItem;
5081	5749	private MenuItem resetTransformItem;
	5750	+ private MenuItem transformGeometryItem;
	5751	+ private MenuItem transformChildrenItem;
5082	5752	private MenuItem hideItem;
5083	5753	private MenuItem grabItem;
5084	5754	private MenuItem backItem;
5085	5755	private MenuItem frontItem;
5086	5756	private MenuItem cameraItem;
5087	5757	private MenuItem compositeItem;
5088		- private MenuItem randomItem;
	5758	+ private MenuItem switchItem;
5089	5759	private MenuItem physicsItem;
5090	5760	private MenuItem frameselectorItem;
5091	5761	private MenuItem scriptNodeItem;
..	..	@@ -5125,7 +5795,7 @@
5125	5795	private MenuItem blobItem;
5126	5796	private MenuItem latheItem;
5127	5797	private MenuItem bezierItem;
5128		- private MenuItem checkerItem;
	5798	+ private MenuItem overlayItem;
5129	5799	private MenuItem meshItem;
5130	5800	// private MenuItem meshGroupItem;
5131	5801	private MenuItem springItem;
..	..	@@ -5147,11 +5817,6 @@
5147	5817	private MenuItem doubleItem;
5148	5818	private MenuItem tripleItem;
5149	5819
5150		- private MenuItem importGFDItem;
5151		- private MenuItem importVRMLX3DItem;
5152		- private MenuItem import3DSItem;
5153		- private MenuItem importOBJItem;
5154		-
5155	5820	private MenuItem computeAOItem;
5156	5821	private MenuItem recompileItem;
5157	5822	private MenuItem editScriptItem;
..	..	@@ -5161,4 +5826,8 @@
5161	5826	private MenuItem analyzeItem;
5162	5827	private MenuItem dumpItem;
5163	5828	//boolean freezemodel = false;
	5829	+
	5830	+ Menu cameraMenu;
	5831	+ MenuItem editCameraItem;
	5832	+ MenuItem restoreCameraItem;
5164	5833	}