~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,6 +12,7 @@
12	12	import com.jme.math.Vector3f;
13	13	import com.jme.renderer.ColorRGBA;
14	14
	15	+import grafeme.ui.*;
15	16	//import buoy.widget.BFileChooser;
16	17
17	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
..	..	@@ -59,6 +60,12 @@
59	60	this.copy = this.group = group;
60	61	//selectees = this.group.selectees;
61	62
	63	+ if (copy.versions == null)
	64	+ {
	65	+ copy.versions = new byte[100][];
	66	+ copy.versionindex = -1;
	67	+ }
	68	+
62	69	if(ui)
63	70	SetupUI(objEditor);
64	71	}
..	..	@@ -73,16 +80,28 @@
73	80	this.copy = this.group = copy;
74	81	//selectees = this.group.selectees;
75	82
76		- SetupMenu2(objEditor);
	83	+ SetupMenu2(this); //objEditor);
77	84	SetupUI2(objEditor);
78	85	objEditor.SetupUI(true);
79	86	SetupViews(objEditor);
80	87
81	88	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	89	+
	90	+ if (copy.versions == null)
	91	+ {
	92	+ copy.versions = new byte[100][];
	93	+ copy.versionindex = -1;
	94	+
	95	+ Save(true);
	96	+ }
82	97	}
83	98
84	99	void CloneSelection(boolean supports)
85	100	{
	101	+ if (Globals.REPLACEONMAKE)
	102	+ Save();
	103	+ boolean keep = Globals.REPLACEONMAKE;
	104	+ Globals.REPLACEONMAKE = false;
86	105	// Object3D keep = GrafreeD.clipboard;
87	106	//Object3D obj;
88	107	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -93,18 +112,19 @@
93	112
94	113	makeSomething(clone, i==group.selection.size()-1);
95	114	}
	115	+ Globals.REPLACEONMAKE = keep;
96	116	}
97	117
98	118	void CloneClipboard(boolean supports)
99	119	{
100		- assert(GrafreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
102		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	120	+ assert(Grafreed.clipboard.parent == null);
	121	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	122	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	123	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	124	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	125	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	126	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	127	+ Grafreed.clipboard.get(0).parent = keepparent;
108	128	}
109	129
110	130	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +138,7 @@
118	138	// obj.support = null;
119	139	if (!supports)
120	140	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	141	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	142	obj.parent = parent;
123	143	// obj.support = support;
124	144	// clone.support = support; // aout 2013
..	..	@@ -147,30 +167,29 @@
147	167
148	168	//JTextField nameField;
149	169
150		- void SetupMenu2(ObjEditor oe)
	170	+ void SetupMenu2(GroupEditor oe)
151	171	{
152		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
155		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
156		- oe.cameraMenu.add("-");
157		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
158		- openWindowItem.addActionListener(this);
159		- editLeafItem.addActionListener(this);
160		- lookAtItem.addActionListener(this);
161		- //lookFromItem.addActinoListener(this);
162		- //switchItem.addActionListener(this);
	172	+ oe.jTree = new cTree();
	173	+
163	174	Menu menu;
164	175	oe.menuBar.add(menu = new Menu("Edit"));
165	176	//editItem = menu.add(new MenuItem("Edit"));
166	177	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	178	+
	179	+// undoItem = menu.add(new MenuItem("Undo"));
	180	+// undoItem.addActionListener(this);
	181	+// redoItem = menu.add(new MenuItem("Redo"));
	182	+// redoItem.addActionListener(this);
	183	+// menu.add("-");
	184	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	185	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	186	cloneItem = menu.add(new MenuItem("Clone"));
171	187	cloneItem.addActionListener(this);
	188	+ if (Globals.ADVANCED)
	189	+ {
172	190	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	191	cloneSupportItem.addActionListener(this);
	192	+ }
174	193	menu.add("-");
175	194	cutItem = menu.add(new MenuItem("Cut"));
176	195	cutItem.addActionListener(this);
..	..	@@ -178,27 +197,123 @@
178	197	copyItem.addActionListener(this);
179	198	pasteItem = menu.add(new MenuItem("Paste"));
180	199	pasteItem.addActionListener(this);
	200	+
	201	+ menu.add("-");
	202	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	203	+ pasteIntoItem.addActionListener(this);
181	204	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	205	pasteLinkItem.addActionListener(this);
183	206	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	207	pasteCloneItem.addActionListener(this);
185	208	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	209	// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
	210	+ menu.add("-");
	211	+ deleteItem = menu.add(new MenuItem("Delete"));
	212	+ deleteItem.addActionListener(this);
	213	+
	214	+ if (Globals.ADVANCED)
	215	+ {
	216	+ // Deletes the cameras...
189	217	clearAllItem = menu.add(new MenuItem("Clear All"));
190	218	clearAllItem.addActionListener(this);
	219	+ }
	220	+
	221	+ menuBar.add(cameraMenu = new Menu("View"));
	222	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	223	+ //zBufferItem.addActionListener(this);
	224	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	225	+ //normalLensItem.addActionListener(this);
	226	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	227	+ restoreCameraItem.addActionListener(this);
	228	+
	229	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	230	+// toggleFullScreenItem.addItemListener(this);
	231	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	232	+// cameraMenu.add("-");
	233	+//
	234	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	235	+// toggleTextureItem.addItemListener(this);
	236	+// toggleTextureItem.setState(CameraPane.textureon);
	237	+//
	238	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	239	+// toggleSwitchItem.addItemListener(this);
	240	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	241	+
	242	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	243	+ toggleHandleItem.addItemListener(this);
	244	+ toggleHandleItem.setState(CameraPane.HANDLES);
	245	+
	246	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	247	+ togglePaintItem.addItemListener(this);
	248	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	249	+
	250	+ if (Globals.ADVANCED)
	251	+ {
	252	+ cameraMenu.add("-");
	253	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	254	+ toggleLiveItem.addItemListener(this);
	255	+ toggleLiveItem.setState(Globals.isLIVE());
191	256
	257	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	258	+ stepItem.addActionListener(this);
	259	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	260	+ // toggleDLItem.addItemListener(this);
	261	+ // toggleDLItem.setState(false);
	262	+
	263	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	264	+ toggleRenderItem.addItemListener(this);
	265	+ toggleRenderItem.setState(!CameraPane.frozen);
	266	+
	267	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	268	+ toggleDebugItem.addItemListener(this);
	269	+ toggleDebugItem.setState(Globals.DEBUG);
	270	+
	271	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	272	+ toggleFrustumItem.addItemListener(this);
	273	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	274	+
	275	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	276	+ toggleFootContactItem.addItemListener(this);
	277	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	278	+
	279	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	280	+ toggleTimelineItem.addItemListener(this);
	281	+ }
	282	+
	283	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	284	+// toggleRootItem.addItemListener(this);
	285	+// toggleRootItem.setState(false);
	286	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	287	+// animationItem.addItemListener(this);
	288	+// animationItem.setState(CameraPane.ANIMATION);
	289	+ cameraMenu.add("-");
	290	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	291	+ editCameraItem.addActionListener(this);
	292	+
	293	+ if (Globals.ADVANCED)
	294	+ {
	295	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	296	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	297	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	298	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	299	+ oe.cameraMenu.add("-");
	300	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	301	+ openWindowItem.addActionListener(this);
	302	+ editLeafItem.addActionListener(this);
	303	+ lookAtItem.addActionListener(this);
	304	+ //lookFromItem.addActinoListener(this);
	305	+ //switchViewItem.addActionListener(this);
	306	+ }
	307	+
192	308	oe.menuBar.add(menu = new Menu("Setting"));
193		- resetMeshItem = menu.add(new MenuItem("Reset All"));
194		- resetMeshItem.addActionListener(this);
195		- stepAllItem = menu.add(new MenuItem("Step All"));
196		- stepAllItem.addActionListener(this);
	309	+ if (Globals.ADVANCED)
	310	+ {
197	311	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	312	revertMeshItem.addActionListener(this);
199	313	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	314	resetreferencesItem.addActionListener(this);
201	315	menu.add("-");
	316	+ }
202	317	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	318	overwriteGeoItem.addActionListener(this);
204	319	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,79 +325,104 @@
210	325	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	326	overwriteUVItem.addActionListener(this);
212	327	menu.add("-");
	328	+ if (Globals.ADVANCED)
	329	+ {
213	330	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	331	generateMeshItem.addActionListener(this);
215	332	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	333	poseMeshItem.addActionListener(this);
217	334	menu.add("-");
	335	+ }
218	336	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	337	resetsupportItem.addActionListener(this);
220	338	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	339	linkverticesItem.addActionListener(this);
222	340	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	341	relinkverticesItem.addActionListener(this);
	342	+
	343	+ if (Globals.ADVANCED)
	344	+ {
224	345	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	346	setMasterItem.addActionListener(this);
	347	+ }
226	348
227	349	oe.menuBar.add(menu = new Menu("Group"));
228		- grabItem = menu.add(new MenuItem("Grab"));
229		- grabItem.addActionListener(this);
	350	+// grabItem = menu.add(new MenuItem("Grab"));
	351	+// grabItem.addActionListener(this);
230	352	backItem = menu.add(new MenuItem("Back"));
231	353	backItem.addActionListener(this);
232	354	frontItem = menu.add(new MenuItem("Front"));
233	355	frontItem.addActionListener(this);
234		- compositeItem = menu.add(new MenuItem("Composite"));
235		- compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	356	+// compositeItem = menu.add(new MenuItem("Composite"));
	357	+// compositeItem.addActionListener(this);
	358	+
	359	+ if (Globals.ADVANCED)
	360	+ {
	361	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	362	hideItem.addActionListener(this);
	363	+ }
238	364	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	365	ungroupItem.addActionListener(this);
240		- menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
242		- randomItem.addActionListener(this);
243		- physicsItem = menu.add(new MenuItem("Physics"));
244		- physicsItem.addActionListener(this);
245		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
246		- frameselectorItem.addActionListener(this);
	366	+
	367	+// menu.add("-");
	368	+//
	369	+// switchItem = menu.add(new MenuItem("Switch node"));
	370	+// switchItem.addActionListener(this);
	371	+ if (Globals.ADVANCED)
	372	+ {
247	373	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	374	switchGeoItem.addActionListener(this);
249	375	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	376	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	377	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	378	morphItem.addActionListener(this);
	379	+
	380	+ menu.add("-");
	381	+ physicsItem = menu.add(new MenuItem("Physics"));
	382	+ physicsItem.addActionListener(this);
	383	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	384	+ frameselectorItem.addActionListener(this);
253	385	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	386	scriptNodeItem.addActionListener(this);
255		- cameraItem = menu.add(new MenuItem("Camera"));
256		- cameraItem.addActionListener(this);
	387	+ }
257	388
258	389	oe.menuBar.add(menu = new Menu("Object"));
259		- textureItem = menu.add(new MenuItem("Texture"));
260		- textureItem.addActionListener(this);
	390	+// textureItem = menu.add(new MenuItem("Texture"));
	391	+// textureItem.addActionListener(this);
261	392	billboardItem = menu.add(new MenuItem("Billboard"));
262	393	billboardItem.addActionListener(this);
263	394	csgItem = menu.add(new MenuItem("CSG"));
264	395	csgItem.addActionListener(this);
265		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	396	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266	397	shadowXItem.addActionListener(this);
267		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	398	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268	399	shadowYItem.addActionListener(this);
269		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	400	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270	401	shadowZItem.addActionListener(this);
	402	+ attributeItem = menu.add(new MenuItem("Attribute"));
	403	+ attributeItem.addActionListener(this);
	404	+
	405	+ if (Globals.ADVANCED)
	406	+ {
	407	+ menu.add("-");
271	408	linkerItem = menu.add(new MenuItem("Linker"));
272	409	linkerItem.addActionListener(this);
273	410	templateItem = menu.add(new MenuItem("Template"));
274	411	templateItem.addActionListener(this);
275		- attributeItem = menu.add(new MenuItem("Attribute"));
276		- attributeItem.addActionListener(this);
277	412	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	413	pointflowItem.addActionListener(this);
	414	+ }
279	415	menu.add("-");
280	416	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	417	resetTransformItem.addActionListener(this);
282	418	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	419	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	420	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	421	+ resetCentroidXZItem.addActionListener(this);
	422	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	423	+ transformGeometryItem.addActionListener(this);
	424	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	425	+ transformChildrenItem.addActionListener(this);
286	426
287	427	oe.menuBar.add(menu = new Menu("Geometry"));
288	428	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +433,11 @@
293	433	genNormalsCADItem.addActionListener(this);
294	434	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	435	genNormalsMESHItem.addActionListener(this);
296		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	436	+ if (Globals.ADVANCED)
	437	+ {
	438	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
297	439	genNormalsMINEItem.addActionListener(this);
	440	+ }
298	441	stripifyItem = menu.add(new MenuItem("Stripify"));
299	442	stripifyItem.addActionListener(this);
300	443	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +459,34 @@
316	459	reduce34MeshItem.addActionListener(this);
317	460	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	461	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	462	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	463	clipMeshItem.addActionListener(this);
	464	+
	465	+ if (Globals.ADVANCED)
	466	+ {
	467	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	468	+ smoothMeshItem.addActionListener(this);
	469	+ }
323	470
324	471	oe.menuBar.add(menu = new Menu("Attributes"));
325	472	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	473	clearMaterialsItem.addActionListener(this);
	474	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	475	+ resetAllItem.addActionListener(this);
	476	+ stepAllItem = menu.add(new MenuItem("Step All"));
	477	+ stepAllItem.addActionListener(this);
327	478	menu.add("-");
328	479	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	480	liveleavesItem.addActionListener(this);
330	481	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	482	unliveleavesItem.addActionListener(this);
	483	+ if (Globals.ADVANCED)
	484	+ {
332	485	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	486	supportleavesItem.addActionListener(this);
334	487	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	488	unsupportleavesItem.addActionListener(this);
	489	+ }
336	490	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	491	hideleavesItem.addActionListener(this);
338	492	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -341,6 +495,14 @@
341	495	markleavesItem.addActionListener(this);
342	496	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343	497	unmarkleavesItem.addActionListener(this);
	498	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	499	+ rewindleavesItem.addActionListener(this);
	500	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	501	+ unrewindleavesItem.addActionListener(this);
	502	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	503	+ randomleavesItem.addActionListener(this);
	504	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	505	+ unrandomleavesItem.addActionListener(this);
344	506	menu.add("-");
345	507	flipVItem = menu.add(new MenuItem("Flip V"));
346	508	flipVItem.addActionListener(this);
..	..	@@ -366,45 +528,56 @@
366	528	attachBumpItem.addActionListener(this);
367	529	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
368	530	pigmentBumpItem.addActionListener(this);
	531	+ //embedTexturesItem
369	532	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
370	533	detachPigmentItem.addActionListener(this);
371	534	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
372	535	detachBumpItem.addActionListener(this);
	536	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	537	+ embedTexturesItem.addActionListener(this);
	538	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	539	+ deEmbedTexturesItem.addActionListener(this);
373	540	menu.add("-");
374	541	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
375	542	sortbysizeItem.addActionListener(this);
376	543	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	544	sortbynameItem.addActionListener(this);
378	545	menu.add("-");
	546	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	547	+ shareGeometriesItem.addActionListener(this);
	548	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	549	+ mergeGeometriesItem.addActionListener(this);
	550	+ if (Globals.ADVANCED)
	551	+ {
	552	+ // Pretty much the same as duplicate and clone.
379	553	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	554	extractGeometriesItem.addActionListener(this);
381	555	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	556	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);
	557	+ }
387	558
388	559	oe.menuBar.add(menu = new Menu("Insert"));
389	560	buildCreateMenu(menu);
390	561
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	562	oe.menuBar.add(menu = new Menu("Tools"));
403	563	buildToolsMenu(menu);
404	564	}
405	565
	566	+
406	567	void SetupUI2(ObjEditor oe)
407	568	{
	569	+ // June 2019
	570	+ if (oe == null)
	571	+ {
	572	+ //super.SetupUI2(this);
	573	+ //return;
	574	+ }
	575	+
	576	+ if (copy != group)
	577	+ {
	578	+ //super.SetupUI2(this);
	579	+ }
	580	+
408	581	//new Exception().printStackTrace();
409	582
410	583	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -433,110 +606,231 @@
433	606	oe.radioPanel.add(dummyButton);
434	607	oe.buttonGroup.add(dummyButton);
435	608	*/
436		- aConstraints.gridy += 1;
	609	+ cGridBag copyOptionsPanel = new cGridBag();
	610	+
	611	+ copyOptionsPanel.preferredHeight = 1;
437	612
438	613	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	614
440		- oe.aConstraints.gridwidth = 1;
441		- oe.aConstraints.gridx = 0;
	615	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	616	+ //minButton.setToolTipText("Minimize window");
	617	+ //minButton.addActionListener(this);
442	618
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);
	619	+ if (Globals.ADVANCED)
	620	+ {
	621	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	622	+ maxButton.setToolTipText("Maximize window");
	623	+ maxButton.addActionListener(this);
	624	+ }
	625	+
	626	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	627	+ fullButton.setToolTipText("Full-screen window");
	628	+ fullButton.addActionListener(this);
	629	+
	630	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
454	631	screenfitButton.setToolTipText("Screen fit");
455	632	screenfitButton.addActionListener(this);
456		- oe.aConstraints.gridx += 1;
	633	+
	634	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	635	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	636	+ restoreCameraButton.addActionListener(this);
	637	+
	638	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	639	+ saveButton.setToolTipText("New version");
	640	+ saveButton.addActionListener(this);
	641	+
	642	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	643	+ undoButton.setToolTipText("Previous version");
	644	+ undoButton.addActionListener(this);
	645	+ undoButton.setEnabled(false);
	646	+
	647	+ cGridBag updown = new cGridBag().setVertical(true);
	648	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	649	+ restoreButton.setToolTipText("Restore current");
	650	+ restoreButton.addActionListener(this);
	651	+ restoreButton.setEnabled(false);
	652	+
	653	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	654	+ replaceButton.setToolTipText("Replace current");
	655	+ replaceButton.addActionListener(this);
	656	+ replaceButton.setEnabled(false);
	657	+
	658	+ copyOptionsPanel.add(updown);
	659	+
	660	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	661	+ redoButton.setToolTipText("Next version");
	662	+ redoButton.addActionListener(this);
	663	+ redoButton.setEnabled(false);
	664	+
	665	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	666	+ liveCB.setToolTipText("Enable animation");
	667	+ liveCB.addItemListener(this);
	668	+
	669	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	670	+ oneStepButton.setToolTipText("Animate one step forward");
	671	+ oneStepButton.addActionListener(this);
	672	+
	673	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	674	+ fastCB.setToolTipText("Fast mode");
	675	+ fastCB.addItemListener(this);
	676	+
	677	+ //oe.toolboxPanel.Return();
	678	+
	679	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	680	+// trackCB.setToolTipText("Enable tracking");
	681	+// trackCB.addItemListener(this);
	682	+
457	683	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
458	684	// 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	685
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);
473		-
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);
482		- twoButton.setToolTipText("Show center view only");
483		- twoButton.addActionListener(this);
484		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	686	+ if (Globals.ADVANCED)
	687	+ {
	688	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	689	+ snapobjectButton.addActionListener(this);
	690	+ snapobjectButton.setToolTipText("Snap Object");
	691	+
	692	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	693	fourButton.addActionListener(this);
486		- fourButton.setToolTipText("Show left panel only");
487		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
488		- sixButton.setToolTipText("2-column layout left");
489		- sixButton.addActionListener(this);
490		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
491		- threeButton.setToolTipText("2-column layout right");
	694	+ fourButton.setToolTipText("Show control panel only");
	695	+ }
	696	+
	697	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	698	+
	699	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ twoButton.setToolTipText("Show 3D view only");
	701	+ twoButton.addActionListener(this);
	702	+ this.fullscreenLayout = twoButton;
	703	+
	704	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	705	+ threeButton.setToolTipText("Show controls and 3D view");
492	706	threeButton.addActionListener(this);
493		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
494		- sevenButton.setToolTipText("3-column layout");
495		- sevenButton.addActionListener(this);
	707	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	708	+ sixButton.setToolTipText("Show 3D view and controls");
	709	+ sixButton.addActionListener(this);
	710	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	711	+// sevenButton.setToolTipText("3-column layout");
	712	+// sevenButton.addActionListener(this);
496	713	//
497	714
498		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
499		- rootButton.setToolTipText("Edit object in new tab");
	715	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	716	+ rootButton.setToolTipText("Open selection in new tab");
500	717	rootButton.addActionListener(this);
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	718	+
	719	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
503	720	closeButton.setToolTipText("Close tab");
504	721	closeButton.addActionListener(this);
505	722	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
506	723	//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	724
516		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	725	+ // INSERT
	726	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	727	+ gridButton.setToolTipText("Create grid");
	728	+ gridButton.addActionListener(this);
	729	+
	730	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	731	+ boxButton.setToolTipText("Create box");
	732	+ boxButton.addActionListener(this);
	733	+
	734	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	735	+ sphereButton.setToolTipText("Create sphere");
	736	+ sphereButton.addActionListener(this);
	737	+
	738	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	739	+ coneButton.setToolTipText("Create cone");
	740	+ coneButton.addActionListener(this);
	741	+
	742	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	743	+ torusButton.setToolTipText("Create torus");
	744	+ torusButton.addActionListener(this);
	745	+
	746	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	747	+ superButton.setToolTipText("Create superellipsoid");
	748	+ superButton.addActionListener(this);
	749	+
	750	+ if (Globals.ADVANCED)
	751	+ {
	752	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	753	+ kleinButton.setToolTipText("Create Klein bottle");
	754	+ kleinButton.addActionListener(this);
	755	+ }
	756	+
	757	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	758	+ particlesButton.setToolTipText("Create particle system");
	759	+ particlesButton.addActionListener(this);
	760	+
	761	+ oe.toolboxPanel.Return();
	762	+
	763	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	764	+ groupButton.setToolTipText("Create group");
	765	+ groupButton.addActionListener(this);
	766	+
	767	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	768	+ compositeButton.setToolTipText("Create composite");
	769	+ compositeButton.addActionListener(this);
	770	+
	771	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	772	+ switchButton.setToolTipText("Create item switcher");
	773	+ switchButton.addActionListener(this);
	774	+
	775	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	776	+ loopButton.setToolTipText("Create loop");
	777	+ loopButton.addActionListener(this);
	778	+
	779	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	780	+ textureButton.setToolTipText("Create texture");
	781	+ textureButton.addActionListener(this);
	782	+
	783	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	784	+ overlayButton.setToolTipText("Create overlay");
	785	+ overlayButton.addActionListener(this);
	786	+
	787	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	788	+ lightButton.setToolTipText("Create light");
	789	+ lightButton.addActionListener(this);
	790	+
	791	+ for (int i=6; --i>=0;)
	792	+ {
	793	+ oe.toolboxPanel.Return();
	794	+ oe.toolboxPanel.add(new cGridBag());
	795	+ oe.toolboxPanel.add(new cGridBag());
	796	+ oe.toolboxPanel.add(new cGridBag());
	797	+ oe.toolboxPanel.add(new cGridBag());
	798	+ oe.toolboxPanel.add(new cGridBag());
	799	+ oe.toolboxPanel.add(new cGridBag());
	800	+ oe.toolboxPanel.add(new cGridBag());
	801	+ }
	802	+
	803	+ // EDIT panel
	804	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	805	+ editButton.setToolTipText("Pin selection controls");
	806	+ editButton.addActionListener(this);
	807	+
	808	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	809	+ uneditButton.setToolTipText("Remove selection controls");
517	810	uneditButton.addActionListener(this);
518	811
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);
	812	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	813	+ allParamsButton.setToolTipText("Show all controle");
531	814	allParamsButton.addActionListener(this);
532	815
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);
	816	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	817	+ clearPanelButton.setToolTipText("Clear edit panel");
	818	+ clearPanelButton.addActionListener(this);
	819	+
	820	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	821	+ unselectButton.setToolTipText("Unselect");
538	822	unselectButton.addActionListener(this);
539	823
	824	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	825	+ flashSelectionButton.setToolTipText("Highlight selection");
	826	+ flashSelectionButton.addActionListener(this);
	827	+
	828	+ editCommandsPanel.preferredHeight = 1;
	829	+
	830	+ SetPinStates(false);
	831	+// oe.treePanel.add(commandsPanel);
	832	+// oe.treePanel.Return();
	833	+
540	834	// oe.aConstraints.gridx += 1;
541	835	// oe.aConstraints.weighty = 0;
542	836	// oe.aConstraints.gridwidth = 1;
..	..	@@ -548,40 +842,25 @@
548	842	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
549	843	// gcButton.addActionListener(this);
550	844
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;
	845	+ cGridBag jSPPanel = new cGridBag();
	846	+
	847	+ JScrollPane jSP;
562	848	//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);
	849	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
564	850	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	851
	852	+ oe.treePanel.add(jSPPanel);
	853	+ oe.treePanel.Return();
	854	+
	855	+ oe.treePanel.add(copyOptionsPanel);
	856	+ oe.treePanel.Return();
	857	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	858	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	859	+ sliderPane.preferredHeight = 1;
	860	+
	861	+// mainPanel.setDividerLocation(0.5); //1.0);
	862	+// mainPanel.setResizeWeight(0.5);
	863	+
585	864	//jList.addListSelectionListener(this);
586	865	oe.jTree.addTreeSelectionListener(this);
587	866	//jTree.setRootVisible(false);
..	..	@@ -600,97 +879,160 @@
600	879	dgr.addDragGestureListener(this);
601	880	}catch(Exception e) {}
602	881	*/
603		- radio.layout = sevenButton;
	882	+ radio.layout = sixButton; // sevenButton;
604	883	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
605	884	}
606	885
607		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	886	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
608	887	{
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);
	888	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	889	+ colorCB.setToolTipText("Copy color when dropped");
	890	+ colorCB.addItemListener(this);
618	891
619		- // constraints.gridy += 1;
	892	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	893	+ materialCB.setToolTipText("Copy material when dropped");
	894	+ materialCB.addItemListener(this);
	895	+
	896	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	897	+ textureCB.setToolTipText("Copy texture when dropped");
	898	+ textureCB.addItemListener(this);
	899	+
	900	+ panel.Return();
	901	+
	902	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	903	+ boxCB.setToolTipText("Display bounding boxes");
	904	+ boxCB.addItemListener(this);
	905	+
	906	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	907	+ zoomBoxCB.setToolTipText("Display only for wheel");
	908	+ zoomBoxCB.addItemListener(this);
	909	+
	910	+ if (true) // Globals.ADVANCED)
	911	+ {
	912	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	913	+// supportCB.setToolTipText("Enable rigging");
	914	+// supportCB.addItemListener(this);
	915	+
	916	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	917	+ freezeCB.setToolTipText("Fast moving camera");
	918	+ freezeCB.addItemListener(this);
	919	+
620	920	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
621	921	// localCB.addItemListener(this);
622	922
623		- constraints.gridy += 1;
624		- panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), constraints);
	923	+ panel.Return();
	924	+
	925	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
625	926	crowdCB.setToolTipText("Used for crowds");
626	927	crowdCB.addItemListener(this);
627	928
628		- constraints.gridy += 1;
629		- panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), constraints);
	929	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
630	930	smoothCB.setToolTipText("Snapping delay");
631	931	smoothCB.addItemListener(this);
632	932
633		- constraints.gridy += 1;
634		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), constraints);
	933	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
635	934	slowCB.setToolTipText("Smooth interpolation");
636	935	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		-
	936	+
646	937	// constraints.gridy += 1;
647	938	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
648	939	// speakerMocapCB.addItemListener(this);
649	940
	941	+ panel.Return();
	942	+
650	943	if (false)
651	944	{
652	945	// handled in scripts
653		- constraints.gridy += 1;
654		- panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), constraints);
	946	+ //constraints.gridy += 1;
	947	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
655	948	speakerCameraCB.addItemListener(this);
656	949
657		- constraints.gridy += 1;
658		- panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), constraints);
	950	+ //constraints.gridy += 1;
	951	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
659	952	speakerFocusCB.addItemListener(this);
660	953
661		- constraints.gridy += 1;
662		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), constraints);
	954	+ //constraints.gridy += 1;
	955	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
663	956	smoothfocusCB.addItemListener(this);
	957	+ panel.Return();
664	958	}
665	959
666	960	//constraints.gridx += 1;
667	961	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
668	962	// debugCB.addItemListener(this);
669	963
670		- constraints.gridy += 1;
671		- panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), constraints);
	964	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	965	+ trackCB.setToolTipText("Enable tracking target");
	966	+ trackCB.addItemListener(this);
	967	+
	968	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	969	+ oeilCB.setToolTipText("Move camera when tracking");
672	970	oeilCB.addItemListener(this);
673	971
674		- constraints.gridy += 1;
675		- panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), constraints);
	972	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	973	+ shadowCB.setToolTipText("When live compute shadows");
	974	+ shadowCB.addItemListener(this);
	975	+
	976	+ panel.Return();
	977	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	978	+ toggleTextureCB.setToolTipText("Load textures");
	979	+ toggleTextureCB.addItemListener(this);
	980	+
	981	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	982	+ toggleSwitchCB.setToolTipText("Choose a single item");
	983	+ toggleSwitchCB.addItemListener(this);
	984	+
	985	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	986	+ autokeepCB.setToolTipText("On structure change");
	987	+ autokeepCB.addItemListener(this);
	988	+
	989	+ panel.Return();
	990	+ if (Globals.ADVANCED)
	991	+ {
	992	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
676	993	lookAtCB.setToolTipText("Look-at target");
677	994	lookAtCB.addItemListener(this);
	995	+ }
	996	+
	997	+ }
	998	+
	999	+ cGridBag fill = new cGridBag();
	1000	+ fill.preferredHeight = 200;
	1001	+ cGridBag fill2 = new cGridBag();
	1002	+ fill2.preferredHeight = 200;
	1003	+ cGridBag fill3 = new cGridBag();
	1004	+ fill3.preferredHeight = 200;
	1005	+
	1006	+ panel.add(fill);
	1007	+ panel.add(fill2);
	1008	+ panel.add(fill3);
678	1009
679	1010	}
680	1011
681	1012	void EditObject(Object3D obj)
682	1013	{
683	1014	cRadio radioButton = new cRadio(obj.name);
	1015	+
	1016	+ // June 2019. Patch to avoid bug with transparency.
	1017	+ radioButton.hadMaterial = obj.material != null;
	1018	+ if (!radioButton.hadMaterial)
	1019	+ {
	1020	+ obj.material = new cMaterial();
	1021	+ }
	1022	+
684	1023	radioButton.SetObject(obj);
685		- radioButton.layout = sevenButton;
	1024	+ radioButton.layout = sixButton; // sevenButton;
686	1025	radioButton.SetCamera(cameraView.renderCamera, false);
687	1026	radioButton.addActionListener(this);
688	1027	radioPanel.add(radioButton);
689	1028	buttonGroup.add(radioButton);
690	1029	radioButton.doClick();
691	1030	}
	1031	+
692	1032	void SetupViews(ObjEditor oe)
693	1033	{
	1034	+ theFrame = this;
	1035	+
694	1036	oe.SetupViews();
695	1037
696	1038	System.out.println("SetupViews");
..	..	@@ -699,23 +1041,28 @@
699	1041	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
700	1042	}
701	1043
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;
	1044	+ cToggleButton liveCB;
	1045	+ cCheckBox supportCB;
	1046	+ cCheckBox localCB;
	1047	+ cCheckBox crowdCB;
	1048	+ cCheckBox smoothCB;
	1049	+ cToggleButton fastCB;
	1050	+ cCheckBox slowCB;
	1051	+ cCheckBox boxCB;
	1052	+ cCheckBox zoomBoxCB;
	1053	+ cCheckBox freezeCB;
	1054	+ //cToggleButton trackCB;
	1055	+ cCheckBox trackCB;
	1056	+ cCheckBox smoothfocusCB;
713	1057	// JCheckBox speakerMocapCB;
714		- JCheckBox speakerCameraCB;
715		- JCheckBox speakerFocusCB;
716		- JCheckBox debugCB;
717		- JCheckBox oeilCB;
718		- JCheckBox lookAtCB;
	1058	+ cCheckBox speakerCameraCB;
	1059	+ cCheckBox speakerFocusCB;
	1060	+ cCheckBox debugCB;
	1061	+
	1062	+ cCheckBox oeilCB;
	1063	+ cCheckBox shadowCB;
	1064	+ cCheckBox autokeepCB;
	1065	+ cCheckBox lookAtCB;
719	1066
720	1067	// static int COLOR = 1;
721	1068	// static int MATERIAL = 2;
..	..	@@ -723,9 +1070,9 @@
723	1070
724	1071	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
725	1072
726		- JCheckBox colorCB;
727		- JCheckBox materialCB;
728		- JCheckBox textureCB;
	1073	+ cCheckBox colorCB;
	1074	+ cCheckBox materialCB;
	1075	+ cCheckBox textureCB;
729	1076
730	1077	public void itemStateChanged(ItemEvent e)
731	1078	{
..	..	@@ -753,6 +1100,7 @@
753	1100	} else if(e.getSource() == liveCB)
754	1101	{
755	1102	cameraView.ToggleLive();
	1103	+ refreshContents(false);
756	1104	}
757	1105	else if(e.getSource() == supportCB)
758	1106	{
..	..	@@ -817,6 +1165,18 @@
817	1165	{
818	1166	cameraView.ToggleOeil();
819	1167	}
	1168	+ else if(e.getSource() == shadowCB)
	1169	+ {
	1170	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1171	+ }
	1172	+ else if(e.getSource() == freezeCB)
	1173	+ {
	1174	+ Globals.FREEZEONMOVE ^= true;
	1175	+ }
	1176	+ else if(e.getSource() == autokeepCB)
	1177	+ {
	1178	+ Globals.REPLACEONMAKE ^= true;
	1179	+ }
820	1180	else if(e.getSource() == lookAtCB)
821	1181	{
822	1182	cameraView.ToggleLookAt();
..	..	@@ -833,7 +1193,8 @@
833	1193
834	1194	/**/
835	1195	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
836		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1196	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1197	+ TreePath path = objEditor.jTree.getSelectionPath();
837	1198	if ((path == null) \|\| (path.getPathCount() <= 1)) {
838	1199	// We can't move the root node or an empty selection
839	1200	return;
..	..	@@ -896,8 +1257,6 @@
896	1257	}
897	1258	}
898	1259
899		- String string = (String) object;
900		-
901	1260	System.out.println("Transfer = " + object + "; drop : " + target);
902	1261	// if( object instanceof java.io.File[])
903	1262	// {
..	..	@@ -905,7 +1264,11 @@
905	1264	// objEditor.DropFile((java.io.File[]) object, true);
906	1265	// return;
907	1266	// }
908		- if (string.charAt(0) == '/')
	1267	+
	1268	+ String string = object.toString();
	1269	+
	1270	+ // File path for Mac and Windows
	1271	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
909	1272	{
910	1273	// file(s)
911	1274	String[] names = string.split("\n");
..	..	@@ -932,7 +1295,7 @@
932	1295
933	1296	flashIt = false;
934	1297	CameraPane pane = (CameraPane) target;
935		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1298	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
936	1299	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
937	1300
938	1301	if (group.selection.size() == 1)
..	..	@@ -948,23 +1311,33 @@
948	1311
949	1312	assert target == objEditor.jTree;
950	1313	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1314	+ Object3D destinationLeaf;
951	1315	try {
952		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1316	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
953	1317	} catch (Exception e) {
954	1318	System.out.println("destinationPath : " + destinationPath);
955	1319	return;
956	1320	}
957	1321
958		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1322	+ for (int i=group.selection.size(); --i>=0;)
959	1323	{
	1324	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1325	+
	1326	+ // Cannot move into itself
	1327	+ if (child == destinationLeaf)
	1328	+ return;
	1329	+ }
	1330	+
	1331	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1332	+// {
960	1333	loadClipboard(true);
961	1334	objEditor.jTree.setSelectionPath(destinationPath);
962		- pasteInto(false);
963		- } else {
964		- loadClipboard(false);
965		- objEditor.jTree.setSelectionPath(destinationPath);
966		- pasteInto(false); // true); // ???
967		- }
	1335	+ pasteInto(false, false);
	1336	+// } else {
	1337	+// loadClipboard(false);
	1338	+// objEditor.jTree.setSelectionPath(destinationPath);
	1339	+// pasteInto(false, false); // true); // ???
	1340	+// }
968	1341	}
969	1342	public void dropActionChanged(DropTargetDragEvent dtde)
970	1343	// Called if the user has modified the current drop gesture
..	..	@@ -1069,85 +1442,107 @@
1069	1442	{
1070	1443	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1071	1444	//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);
	1445	+// gridItem = menu.add(new MenuItem("Grid"));
	1446	+// gridItem.addActionListener(this);
	1447	+// rectoidItem = menu.add(new MenuItem("Box"));
	1448	+// rectoidItem.addActionListener(this);
	1449	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1450	+// ellipsoidItem.addActionListener(this);
	1451	+// coneItem = menu.add(new MenuItem("Cone"));
	1452	+// coneItem.addActionListener(this);
	1453	+// torusItem = menu.add(new MenuItem("Torus"));
	1454	+// torusItem.addActionListener(this);
	1455	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1456	+// superItem.addActionListener(this);
	1457	+
	1458	+ cameraItem = menu.add(new MenuItem("Camera"));
	1459	+ cameraItem.addActionListener(this);
	1460	+
	1461	+ if (!Globals.ADVANCED)
	1462	+ {
1084	1463	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1085	1464	kleinItem.addActionListener(this);
1086		- particleItem = menu.add(new MenuItem("Particle system"));
1087		- particleItem.addActionListener(this);
	1465	+ }
	1466	+
	1467	+// particleItem = menu.add(new MenuItem("Particle system"));
	1468	+// particleItem.addActionListener(this);
	1469	+ if (Globals.ADVANCED)
	1470	+ {
1088	1471	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1089	1472	ragdollItem.addActionListener(this);
1090	1473	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1091	1474	ragdoll2Item.addActionListener(this);
	1475	+ }
1092	1476	menu.add("-");
1093		- meshItem = menu.add(new MenuItem("Mesh"));
	1477	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1094	1478	meshItem.addActionListener(this);
1095	1479	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1096	1480	// meshGroupItem.addActionListener(this);
	1481	+ if (Globals.ADVANCED)
	1482	+ {
1097	1483	springItem = menu.add(new MenuItem("Spring"));
1098	1484	springItem.addActionListener(this);
1099	1485	flagItem = menu.add(new MenuItem("Flag"));
1100	1486	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	1487	blobItem = menu.add(new MenuItem("Blob"));
1106	1488	blobItem.addActionListener(this);
1107	1489	latheItem = menu.add(new MenuItem("Lathe"));
1108	1490	latheItem.addActionListener(this);
1109		- lightItem = menu.add(new MenuItem("Light"));
1110		- lightItem.addActionListener(this);
	1491	+ }
	1492	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1493	+ bezierItem.addActionListener(this);
	1494	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1495	+// overlayItem.addActionListener(this);
	1496	+// lightItem = menu.add(new MenuItem("Light"));
	1497	+// lightItem.addActionListener(this);
1111	1498	menu.add("-");
1112	1499	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1113	1500	//superLoopItem.addActionListener(this);
1114		- loopItem = menu.add(new MenuItem("Loop"));
1115		- loopItem.addActionListener(this);
	1501	+// loopItem = menu.add(new MenuItem("Loop"));
	1502	+// loopItem.addActionListener(this);
1116	1503	doubleItem = menu.add(new MenuItem("Fork"));
1117	1504	doubleItem.addActionListener(this);
	1505	+ if (Globals.ADVANCED)
	1506	+ {
1118	1507	tripleItem = menu.add(new MenuItem("Trident"));
1119	1508	tripleItem.addActionListener(this);
	1509	+ }
1120	1510	}
1121	1511
1122	1512	void buildToolsMenu(Menu menu)
1123	1513	{
1124	1514	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1125	1515	animationItem.addItemListener(this);
1126		- animationItem.setState(CameraPane.ANIMATION);
	1516	+ animationItem.setState(Globals.ANIMATION);
	1517	+
	1518	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1519	+ archiveItem.addActionListener(this);
1127	1520
1128	1521	menu.add("-");
1129	1522	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1130	1523	parseverticesItem.addActionListener(this);
1131	1524	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1132	1525	textureFieldItem.addActionListener(this);
1133		- alignItem = menu.add(new MenuItem("Align"));
	1526	+ alignItem = menu.add(new MenuItem("Align Objects"));
1134	1527	alignItem.addActionListener(this);
1135		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1136		- mirrorItem.addActionListener(this);
1137	1528	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1138	1529	reduceMorphItem.addActionListener(this);
1139	1530	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1140	1531	reduce34MorphItem.addActionListener(this);
1141		-
1142		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1143		- computeAOItem.addActionListener(this);
1144	1532	menu.add("-");
1145		-
1146	1533	menu.add(memoryItem = new MenuItem("Memory Usage"));
1147	1534	memoryItem.addActionListener(this);
	1535	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	1536	+ computeAOItem.addActionListener(this);
	1537	+
	1538	+ if (Globals.ADVANCED)
	1539	+ {
	1540	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1541	+ mirrorItem.addActionListener(this);
	1542	+ menu.add("-");
1148	1543	menu.add(analyzeItem = new MenuItem("Analyze"));
1149	1544	analyzeItem.addActionListener(this);
1150		- menu.add(dumpItem = new MenuItem("Dump"));
	1545	+ menu.add(dumpItem = new MenuItem("Print"));
1151	1546	dumpItem.addActionListener(this);
1152	1547	// menu.add(pathItem = new MenuItem("From-to path"));
1153	1548	// pathItem.addActionListener(this);
..	..	@@ -1165,6 +1560,7 @@
1165	1560	menu.add("-");
1166	1561	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1167	1562	editScriptItem.addActionListener(this);
	1563	+ }
1168	1564	}
1169	1565
1170	1566	void ScreenFit()
..	..	@@ -1287,9 +1683,34 @@
1287	1683	shadow.material = new cMaterial(obj.material);
1288	1684	shadow.material.diffuse = 0.0001f;
1289	1685	shadow.material.specular = 0.0001f;
	1686	+ //shadow.projectedVertices[1].x = 300;
1290	1687
1291	1688	makeSomething(shadow);
1292	1689	}
	1690	+
	1691	+ private void ClearUnpinned()
	1692	+ {
	1693	+ //for (Object3D obj : listUI)
	1694	+ for (int i=listUI.size(); --i>=0;)
	1695	+ {
	1696	+ Object3D obj = listUI.elementAt(i);
	1697	+ if (!obj.pinned)
	1698	+ {
	1699	+ obj.CloseUI();
	1700	+ listUI.remove(i);
	1701	+ }
	1702	+ }
	1703	+ }
	1704	+
	1705	+ private void EditElement(Object3D elem, boolean newWindow)
	1706	+ {
	1707	+ // if (!(elem instanceof Composite))
	1708	+ // newWindow = false;
	1709	+ listUI.add(elem);
	1710	+ elem.openEditWindow(this, newWindow); //, false);
	1711	+ System.out.println("edit : " + elem);
	1712	+ elem.editWindow.refreshContents(true); // ? new
	1713	+ }
1293	1714
1294	1715	/**
1295	1716	* applyExample
..	..	@@ -1493,9 +1914,9 @@
1493	1914
1494	1915	void Overwrite(int mask)
1495	1916	{
1496		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1917	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1497	1918	{
1498		- Object3D content = GrafreeD.clipboard.get(0);
	1919	+ Object3D content = Grafreed.clipboard.get(0);
1499	1920
1500	1921	if (content instanceof cGroup && ((cGroup)content).transientlink )
1501	1922	content = ((cGroup)content).get(0);
..	..	@@ -1534,7 +1955,7 @@
1534	1955	{
1535	1956	ScreenFit();
1536	1957	} else
1537		- if (source == switchItem)
	1958	+ if (source == switchViewItem)
1538	1959	{
1539	1960	cVector v1 = new cVector();
1540	1961	cVector v2 = new cVector();
..	..	@@ -1543,11 +1964,11 @@
1543	1964	objEditor.cameraView.renderCamera.setAim(v2, v1);
1544	1965	objEditor.cameraView.repaint();
1545	1966	} else
1546		- if (source == rectoidItem)
	1967	+ if (source == rectoidItem \|\| source == boxButton)
1547	1968	{
1548	1969	makeSomething(new Box());
1549	1970	} else
1550		- if (source == particleItem)
	1971	+ if (source == particleItem \|\| source == particlesButton)
1551	1972	{
1552	1973	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1553	1974	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1626,27 +2047,27 @@
1626	2047
1627	2048	makeSomething(obj);
1628	2049	} else
1629		- if (source == gridItem)
	2050	+ if (source == gridItem \|\| source == gridButton)
1630	2051	{
1631	2052	makeSomething(new Grid());
1632	2053	} else
1633		- if (source == ellipsoidItem)
	2054	+ if (source == ellipsoidItem \|\| source == sphereButton)
1634	2055	{
1635	2056	makeSomething(new Sphere());
1636	2057	} else
1637		- if (source == coneItem)
	2058	+ if (source == coneItem \|\| source == coneButton)
1638	2059	{
1639	2060	makeSomething(new Cone());
1640	2061	} else
1641		- if (source == torusItem)
	2062	+ if (source == torusItem \|\| source == torusButton)
1642	2063	{
1643	2064	makeSomething(new Torus());
1644	2065	} else
1645		- if (source == superItem)
	2066	+ if (source == superItem \|\| source == superButton)
1646	2067	{
1647	2068	makeSomething(new Superellipsoid());
1648	2069	} else
1649		- if (source == kleinItem)
	2070	+ if (source == kleinItem \|\| source == kleinButton)
1650	2071	{
1651	2072	makeSomething(new Klein());
1652	2073	} else
..	..	@@ -1666,7 +2087,7 @@
1666	2087	{
1667	2088	makeSomething(new BezierSurface());
1668	2089	} else
1669		- if (source == checkerItem)
	2090	+ if (source == overlayItem \|\| source == overlayButton)
1670	2091	{
1671	2092	/*
1672	2093	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1714,7 +2135,7 @@
1714	2135	s.setup();
1715	2136	makeSomething(s);
1716	2137	} else
1717		- if (source == lightItem)
	2138	+ if (source == lightItem \|\| source == lightButton)
1718	2139	{
1719	2140	makeSomething(new Light());
1720	2141	} else
..	..	@@ -1764,30 +2185,30 @@
1764	2185
1765	2186	group(g);
1766	2187	} else
1767		- if (source == loopItem)
	2188	+ if (source == loopItem \|\| source == loopButton)
1768	2189	{
1769	2190	Composite csg = new GroupLeaf();
1770	2191	csg.count = 5;
1771	2192	group(csg);
1772		- Composite child = new cGroup();
	2193	+ Composite child = new cGroup("Branch");
1773	2194	csg.addChild(child);
1774	2195	child.addChild(csg);
1775	2196	} else
1776	2197	if (source == doubleItem)
1777	2198	{
1778		- Composite csg = new GroupLeaf();
	2199	+ Composite csg = new GroupLeaf("Fork");
1779	2200	csg.count = 5;
1780	2201	group(csg);
1781		- Composite child = new cGroup();
	2202	+ Composite child = new cGroup("Branch A");
1782	2203	csg.addChild(child);
1783	2204	child.addChild(csg);
1784		- child = new cGroup();
	2205	+ child = new cGroup("Branch B");
1785	2206	csg.addChild(child);
1786	2207	child.addChild(csg);
1787	2208	} else
1788	2209	if (source == tripleItem)
1789	2210	{
1790		- Composite csg = new GroupLeaf();
	2211	+ Composite csg = new GroupLeaf("Trident");
1791	2212	csg.count = 4;
1792	2213	group(csg);
1793	2214	Composite child = new cGroup();
..	..	@@ -1799,23 +2220,6 @@
1799	2220	child = new cGroup();
1800	2221	csg.addChild(child);
1801	2222	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	2223	} else
1820	2224	if (source == computeAOItem)
1821	2225	{
..	..	@@ -1835,7 +2239,7 @@
1835	2239	if (source == invariantsItem)
1836	2240	{
1837	2241	System.out.println("Invariants:");
1838		- GrafreeD.grafreeD.universe.invariants();
	2242	+ Grafreed.grafreeD.universe.invariants();
1839	2243	} else
1840	2244	if (source == memoryItem)
1841	2245	{
..	..	@@ -1854,19 +2258,61 @@
1854	2258	{
1855	2259	DumpObject();
1856	2260	} else
	2261	+ if (source == minButton)
	2262	+ {
	2263	+ Minimize();
	2264	+ } else
	2265	+ if (source == maxButton)
	2266	+ {
	2267	+ Maximize();
	2268	+ } else
	2269	+ if (source == fullButton)
	2270	+ {
	2271	+ ToggleFullScreen();
	2272	+ } else
	2273	+ if (source == undoButton)
	2274	+ {
	2275	+ // Go to previous version
	2276	+ //if (!Undo())
	2277	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2278	+ Undo();
	2279	+ } else
	2280	+ if (source == restoreButton)
	2281	+ {
	2282	+ // Restore current version
	2283	+ Restore();
	2284	+ } else
	2285	+ if (source == replaceButton)
	2286	+ {
	2287	+ // Overwrite current version
	2288	+ Replace();
	2289	+ } else
	2290	+ if (source == redoButton)
	2291	+ {
	2292	+ // Go to next version
	2293	+ Redo();
	2294	+ } else
	2295	+ if (source == saveButton)
	2296	+ {
	2297	+ // Save a new version
	2298	+ if (!Save(true))
	2299	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2300	+ } else
	2301	+ if (source == oneStepButton)
	2302	+ {
	2303	+ Globals.ONESTEP = true;
	2304	+ cameraView.repaint();
	2305	+ } else
1857	2306	if (source == screenfitButton)
1858	2307	{
1859		- //Reload(lastConverter, lastFilename, true);
1860	2308	ScreenFit();
1861	2309	} else
1862	2310	if (source == screenfitpointButton)
1863	2311	{
1864		- //Reload(lastConverter, lastFilename, true);
1865	2312	ScreenFitPoint();
1866	2313	} else
1867	2314	if (source == snapobjectButton)
1868	2315	{
1869		- //Reload(lastConverter, lastFilename, true);
1870	2316	SnapObject();
1871	2317	} else
1872	2318	// if (event.getSource() == recompileButton)
..	..	@@ -1903,12 +2349,20 @@
1903	2349	{
1904	2350	loadClipboard(true);
1905	2351	} else
	2352	+ if (source == undoItem)
	2353	+ {
	2354	+ Undo();
	2355	+ } else
	2356	+ if (source == redoItem)
	2357	+ {
	2358	+ Redo();
	2359	+ } else
1906	2360	if (source == duplicateItem)
1907	2361	{
1908		- Object3D keep = GrafreeD.clipboard;
	2362	+ Object3D keep = Grafreed.clipboard;
1909	2363	loadClipboard(false);
1910	2364	paste(false);
1911		- GrafreeD.clipboard = keep;
	2365	+ Grafreed.clipboard = keep;
1912	2366	} else
1913	2367	if (source == cloneItem)
1914	2368	{
..	..	@@ -1926,13 +2380,17 @@
1926	2380	{
1927	2381	paste(false);
1928	2382	} else
	2383	+ if (source == pasteIntoItem)
	2384	+ {
	2385	+ pasteInto(true, false);
	2386	+ } else
1929	2387	if (source == pasteLinkItem)
1930	2388	{
1931		- pasteInto(false);
	2389	+ pasteInto(false, false);
1932	2390	} else
1933	2391	if (source == pasteCloneItem)
1934	2392	{
1935		- pasteInto(true);
	2393	+ pasteInto(true, true);
1936	2394	} else
1937	2395	if (source == pasteExpandItem)
1938	2396	{
..	..	@@ -2124,9 +2582,9 @@
2124	2582	// group.selection.get(0).setMasterThis(content); // should be identity
2125	2583	// refreshContents();
2126	2584	// }
2127		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2585	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2128	2586	{
2129		- Object3D content = GrafreeD.clipboard.get(0);
	2587	+ Object3D content = Grafreed.clipboard.get(0);
2130	2588
2131	2589	if (content instanceof cGroup && ((cGroup)content).transientlink )
2132	2590	content = ((cGroup)content).get(0);
..	..	@@ -2134,11 +2592,11 @@
2134	2592	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2135	2593	for (int i=0; i<group.selection.size(); i++)
2136	2594	{
2137		- boolean random = CameraPane.RANDOM;
2138		- CameraPane.RANDOM = false; // parse all random nodes
	2595	+ boolean random = CameraPane.SWITCH;
	2596	+ CameraPane.SWITCH = false; // parse all random nodes
2139	2597	group.selection.get(i).linkVerticesThis(content);
2140	2598	// group.selection.get(i).setMasterThis(content); // should be identity
2141		- CameraPane.RANDOM = random;
	2599	+ CameraPane.SWITCH = random;
2142	2600	}
2143	2601	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2144	2602	refreshContents();
..	..	@@ -2148,20 +2606,20 @@
2148	2606	{
2149	2607	for (int i=0; i<group.selection.size(); i++)
2150	2608	{
2151		- boolean random = CameraPane.RANDOM;
2152		- CameraPane.RANDOM = false; // parse all random nodes
	2609	+ boolean random = CameraPane.SWITCH;
	2610	+ CameraPane.SWITCH = false; // parse all random nodes
2153	2611	group.selection.get(i).linkVerticesThis(null);
2154		- CameraPane.RANDOM = random;
	2612	+ CameraPane.SWITCH = random;
2155	2613	}
2156	2614
2157	2615	refreshContents();
2158	2616	} else
2159	2617	if (source == relinkverticesItem)
2160	2618	{
2161		- boolean random = CameraPane.RANDOM;
2162		- CameraPane.RANDOM = false; // parse all random nodes
	2619	+ boolean random = CameraPane.SWITCH;
	2620	+ CameraPane.SWITCH = false; // parse all random nodes
2163	2621	group.selection.RelinkToSupport();
2164		- CameraPane.RANDOM = random;
	2622	+ CameraPane.SWITCH = random;
2165	2623
2166	2624	refreshContents();
2167	2625	} else
..	..	@@ -2176,9 +2634,9 @@
2176	2634	} else
2177	2635	if (source == setMasterItem)
2178	2636	{
2179		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2637	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2180	2638	{
2181		- Object3D content = GrafreeD.clipboard.get(0);
	2639	+ Object3D content = Grafreed.clipboard.get(0);
2182	2640
2183	2641	if (content instanceof cGroup && ((cGroup)content).transientlink )
2184	2642	content = ((cGroup)content).get(0);
..	..	@@ -2191,9 +2649,9 @@
2191	2649	{
2192	2650	if (group.selection.size() == 1)
2193	2651	{
2194		- if (GrafreeD.clipboard.size() == 1)
	2652	+ if (Grafreed.clipboard.size() == 1)
2195	2653	{
2196		- Object3D content = GrafreeD.clipboard.get(0);
	2654	+ Object3D content = Grafreed.clipboard.get(0);
2197	2655
2198	2656	if (content instanceof cGroup && ((cGroup)content).transientlink )
2199	2657	content = ((cGroup)content).get(0);
..	..	@@ -2210,7 +2668,7 @@
2210	2668	{
2211	2669	RevertMeshes();
2212	2670	} else
2213		- if (source == resetMeshItem)
	2671	+ if (source == resetAllItem)
2214	2672	{
2215	2673	ResetAll();
2216	2674	} else
..	..	@@ -2218,7 +2676,7 @@
2218	2676	{
2219	2677	StepAll();
2220	2678	} else
2221		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2679	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2222	2680	{
2223	2681	//int indices[] = jList.getSelectedIndices();
2224	2682	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2230,9 +2688,9 @@
2230	2688	{
2231	2689	ClearSelection(true);
2232	2690	} else
2233		- if (source == grabItem)
	2691	+ if (source == grabItem \|\| source == groupButton)
2234	2692	{
2235		- group(new cGroup(), true);
	2693	+ group(new cGroup(), false); // true);
2236	2694	} else
2237	2695	if (source == hideItem)
2238	2696	{
..	..	@@ -2250,16 +2708,16 @@
2250	2708	{
2251	2709	makeSomething(new Camera());
2252	2710	} else
2253		- if (source == compositeItem)
	2711	+ if (source == compositeItem \|\| source == compositeButton)
2254	2712	{
2255	2713	group(new Composite());
2256	2714	} else
2257		- if (source == randomItem)
	2715	+ if (source == switchItem \|\| source == switchButton)
2258	2716	{
2259	2717	RandomNode random = new RandomNode();
2260	2718	group(random);
2261	2719	if (random.size() > 0)
2262		- random.name = random.get(0).name + "Rnd";
	2720	+ random.name = random.get(0).name + "Switch";
2263	2721	} else
2264	2722	if (source == physicsItem)
2265	2723	{
..	..	@@ -2356,7 +2814,7 @@
2356	2814	{
2357	2815	group(new cLinker());
2358	2816	} else
2359		- if (source == textureItem)
	2817	+ if (source == textureItem \|\| source == textureButton)
2360	2818	{
2361	2819	group(new TextureNode());
2362	2820	} else
..	..	@@ -2376,17 +2834,30 @@
2376	2834	{
2377	2835	CastShadow(2);
2378	2836	} else
2379		- if (source == ungroupItem)
	2837	+ if (source == ungroupItem \|\| source == ungroupButton)
2380	2838	{
2381		- //ungroup();
	2839	+ boolean hasRoot = false;
	2840	+
2382	2841	for (int i=0; i<group.selection.size(); i++)
2383	2842	{
2384		- Ungroup(group.selection.get(i));
	2843	+ if (group.selection.get(i) == group)
	2844	+ {
	2845	+ hasRoot = true;
	2846	+ break;
	2847	+ }
2385	2848	}
2386	2849
2387		- ClearSelection(false);
2388		-
2389		- refreshContents();
	2850	+ if (!hasRoot)
	2851	+ {
	2852	+ for (int i=0; i<group.selection.size(); i++)
	2853	+ {
	2854	+ Ungroup(group.selection.get(i));
	2855	+ }
	2856	+
	2857	+ ClearSelection(false);
	2858	+
	2859	+ refreshContents();
	2860	+ }
2390	2861	} else
2391	2862	if (source == genUVItem)
2392	2863	{
..	..	@@ -2398,7 +2869,7 @@
2398	2869	} else
2399	2870	if (source == genNormalsMESHItem)
2400	2871	{
2401		- GenNormals(true); // TODO
	2872	+ GenNormalsMESH();
2402	2873	} else
2403	2874	if (source == genNormalsORGANItem)
2404	2875	{
..	..	@@ -2463,6 +2934,22 @@
2463	2934	if (source == unmarkleavesItem)
2464	2935	{
2465	2936	MarkLeaves(false);
	2937	+ } else
	2938	+ if (source == rewindleavesItem)
	2939	+ {
	2940	+ RewindLeaves(true);
	2941	+ } else
	2942	+ if (source == unrewindleavesItem)
	2943	+ {
	2944	+ RewindLeaves(false);
	2945	+ } else
	2946	+ if (source == randomleavesItem)
	2947	+ {
	2948	+ RandomLeaves(true);
	2949	+ } else
	2950	+ if (source == unrandomleavesItem)
	2951	+ {
	2952	+ RandomLeaves(false);
2466	2953	} else
2467	2954	if (source == flipVItem)
2468	2955	{
..	..	@@ -2548,9 +3035,13 @@
2548	3035	{
2549	3036	SmoothMesh();
2550	3037	} else
2551		- if (source == transformgeometryItem)
	3038	+ if (source == transformGeometryItem)
2552	3039	{
2553	3040	TransformGeometry();
	3041	+ } else
	3042	+ if (source == transformChildrenItem)
	3043	+ {
	3044	+ TransformChildren();
2554	3045	} else
2555	3046	if (source == resetTransformItem)
2556	3047	{
..	..	@@ -2558,7 +3049,11 @@
2558	3049	} else
2559	3050	if (source == resetCentroidItem)
2560	3051	{
2561		- ResetCentroid();
	3052	+ ResetCentroid(true);
	3053	+ } else
	3054	+ if (source == resetCentroidXZItem)
	3055	+ {
	3056	+ ResetCentroid(false);
2562	3057	} else
2563	3058	if (source == resetParentItem)
2564	3059	{
..	..	@@ -2663,7 +3158,7 @@
2663	3158	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2664	3159	{
2665	3160	obj = (Object3D)e.nextElement();
2666		- obj.SetBumpTexture(null);
	3161	+ obj.ResetBumpTexture();
2667	3162	}
2668	3163
2669	3164	refreshContents();
..	..	@@ -2679,6 +3174,31 @@
2679	3174
2680	3175	refreshContents();
2681	3176	} else
	3177	+ if (source == embedTexturesItem)
	3178	+ {
	3179	+ Object3D obj;
	3180	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3181	+ {
	3182	+ obj = (Object3D)e.nextElement();
	3183	+ obj.EmbedTextures(true);
	3184	+ }
	3185	+
	3186	+ refreshContents();
	3187	+ } else
	3188	+ if (source == deEmbedTexturesItem)
	3189	+ {
	3190	+ Object3D obj;
	3191	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3192	+ {
	3193	+ obj = (Object3D)e.nextElement();
	3194	+ obj.EmbedTextures(false);
	3195	+ }
	3196	+
	3197	+ CameraPane.texturepigment.clear();
	3198	+ CameraPane.texturebump.clear();
	3199	+
	3200	+ refreshContents();
	3201	+ } else
2682	3202	if (source == flashSelectionButton)
2683	3203	{
2684	3204	CameraPane.flash = true;
..	..	@@ -2690,6 +3210,10 @@
2690	3210	if (source == twoButton)
2691	3211	{
2692	3212	radio.layout = twoButton;
	3213	+
	3214	+ if (CameraPane.FULLSCREEN)
	3215	+ fullscreenLayout = radio.layout;
	3216	+
2693	3217	// bug
2694	3218	//gridPanel.setDividerLocation(1.0);
2695	3219	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2720,12 +3244,33 @@
2720	3244	// centralPanel.setVisible(true);
2721	3245	// XYZPanel.setVisible(false);
2722	3246	bigThree.ClearUI();
2723		- bigThree.addComponent(centralPanel);
	3247	+ bigThree.add(centralPanel);
2724	3248	bigThree.FlushUI();
	3249	+
	3250	+ cameraView.requestFocusInWindow();
	3251	+
	3252	+// refreshContents(true);
	3253	+//
	3254	+// try
	3255	+// {
	3256	+// java.awt.Robot bot = new java.awt.Robot();
	3257	+// int mask = InputEvent.BUTTON1_MASK;
	3258	+// bot.mouseMove(100, 100);
	3259	+// bot.mousePress(mask);
	3260	+// bot.mouseRelease(mask);
	3261	+// }
	3262	+// catch (Exception e)
	3263	+// {
	3264	+//
	3265	+// }
	3266	+
2725	3267	} else
2726	3268	if (source == threeButton)
2727	3269	{
2728	3270	radio.layout = threeButton;
	3271	+
	3272	+ if (CameraPane.FULLSCREEN)
	3273	+ fullscreenLayout = radio.layout;
2729	3274
2730	3275	// bigThree.remove(scenePanel);
2731	3276	// bigThree.remove(centralPanel);
..	..	@@ -2755,13 +3300,18 @@
2755	3300	// centralPanel.setVisible(true);
2756	3301	// XYZPanel.setVisible(true);
2757	3302	bigThree.ClearUI();
2758		- bigThree.addComponent(centralPanel);
2759		- bigThree.addComponent(XYZPanel);
	3303	+ bigThree.add(scenePanel);
	3304	+ bigThree.add(centralPanel);
2760	3305	bigThree.FlushUI();
	3306	+
	3307	+ cameraView.requestFocusInWindow();
2761	3308	} else
2762	3309	if (source == fourButton)
2763	3310	{
2764	3311	radio.layout = fourButton;
	3312	+
	3313	+ if (CameraPane.FULLSCREEN)
	3314	+ fullscreenLayout = radio.layout;
2765	3315
2766	3316	// bigThree.remove(scenePanel);
2767	3317	// bigThree.remove(centralPanel);
..	..	@@ -2791,12 +3341,17 @@
2791	3341	// centralPanel.setVisible(false);
2792	3342	// XYZPanel.setVisible(false);
2793	3343	bigThree.ClearUI();
2794		- bigThree.addComponent(scenePanel);
	3344	+ bigThree.add(scenePanel);
2795	3345	bigThree.FlushUI();
	3346	+
	3347	+ cameraView.requestFocusInWindow();
2796	3348	} else
2797	3349	if (source == sixButton)
2798	3350	{
2799	3351	radio.layout = sixButton;
	3352	+
	3353	+ if (CameraPane.FULLSCREEN)
	3354	+ fullscreenLayout = radio.layout;
2800	3355
2801	3356	// bigThree.remove(scenePanel);
2802	3357	// bigThree.remove(centralPanel);
..	..	@@ -2826,13 +3381,18 @@
2826	3381	// centralPanel.setVisible(true);
2827	3382	// XYZPanel.setVisible(false);
2828	3383	bigThree.ClearUI();
2829		- bigThree.addComponent(scenePanel);
2830		- bigThree.addComponent(centralPanel);
	3384	+ bigThree.add(centralPanel);
	3385	+ bigThree.add(scenePanel);
2831	3386	bigThree.FlushUI();
	3387	+
	3388	+ cameraView.requestFocusInWindow();
2832	3389	} else
2833	3390	if (source == sevenButton)
2834	3391	{
2835	3392	radio.layout = sevenButton;
	3393	+
	3394	+ if (CameraPane.FULLSCREEN)
	3395	+ fullscreenLayout = radio.layout;
2836	3396
2837	3397	// bigThree.remove(scenePanel);
2838	3398	// bigThree.remove(centralPanel);
..	..	@@ -2862,10 +3422,12 @@
2862	3422	// centralPanel.setVisible(true);
2863	3423	// XYZPanel.setVisible(true);
2864	3424	bigThree.ClearUI();
2865		- bigThree.addComponent(scenePanel);
2866		- bigThree.addComponent(centralPanel);
2867		- bigThree.addComponent(XYZPanel);
	3425	+ bigThree.add(scenePanel);
	3426	+ bigThree.add(centralPanel);
	3427	+ bigThree.add(XYZPanel);
2868	3428	bigThree.FlushUI();
	3429	+
	3430	+ cameraView.requestFocusInWindow();
2869	3431	} else
2870	3432	if (source == rootButton)
2871	3433	{
..	..	@@ -2877,6 +3439,7 @@
2877	3439	EditObject(obj);
2878	3440	}
2879	3441
	3442	+ cameraView.requestFocusInWindow();
2880	3443	refreshContents(true);
2881	3444	} else
2882	3445	if (source == closeButton)
..	..	@@ -2886,22 +3449,37 @@
2886	3449	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2887	3450	{
2888	3451	ab = (cRadio)e.nextElement();
2889		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3452	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2890	3453	{
	3454	+ // Patch to avoid bug with transparency.
	3455	+ if (!ab.hadMaterial)
	3456	+ {
	3457	+ ab.object.material = null;
	3458	+ }
	3459	+
2891	3460	buttonGroup.remove(ab);
2892	3461	radioPanel.remove(ab);
2893	3462
2894		- ab.GetObject().editWindow = null;
	3463	+ //ab.GetObject().editWindow = null;
	3464	+ ab.GetObject().manipWindow = null;
2895	3465	// ab.GetObject().objectUI = null; // ?????????
2896	3466
2897	3467	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2898	3468	break;
2899	3469	}
2900	3470	}
	3471	+
	3472	+ cameraView.requestFocusInWindow();
2901	3473	refreshContents(true);
2902	3474	} else
2903	3475	if (source == editItem \|\| source == editButton)
2904	3476	{
	3477	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3478	+ {
	3479	+ Object3D child = (Object3D)e.nextElement();
	3480	+ child.pinned = true;
	3481	+ }
	3482	+
2905	3483	EditSelection(false);
2906	3484	} else
2907	3485	if (source == uneditButton)
..	..	@@ -2911,12 +3489,13 @@
2911	3489	Object3D child = (Object3D)e.nextElement();
2912	3490	if(child.editWindow != null)
2913	3491	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3492	+ child.pinned = false;
2914	3493	child.CloseUI();
2915	3494	listUI.remove(child);
2916	3495
2917		- child.editWindow = null; // ???????????
	3496	+ //child.editWindow = null; // ???????????
2918	3497	}
2919		- objEditor.ctrlPanel.revalidate();
	3498	+ objEditor.ctrlPanel.FlushUI();
2920	3499	//objEditor.jTree.clearSelection();
2921	3500	//objEditor.ResetSliders();
2922	3501	refreshContents(true);
..	..	@@ -2927,6 +3506,7 @@
2927	3506	//copy.ClearUI();
2928	3507	for (Object3D obj : listUI)
2929	3508	{
	3509	+ obj.pinned = false;
2930	3510	obj.CloseUI();
2931	3511	}
2932	3512	listUI.clear();
..	..	@@ -2936,7 +3516,7 @@
2936	3516	{
2937	3517	assert(copy == group);
2938	3518
2939		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3519	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2940	3520
2941	3521	for (Object3D obj : listUI)
2942	3522	{
..	..	@@ -2985,6 +3565,9 @@
2985	3565	}
2986	3566
2987	3567	copy = group;
	3568	+
	3569	+ SetUndoStates();
	3570	+
2988	3571	//Globals.theRenderer.object = group;
2989	3572	if(!useclient)
2990	3573	{
..	..	@@ -3000,20 +3583,46 @@
3000	3583	frontView.object = group;
3001	3584	sideView.object = group;
3002	3585	}
3003		- group.editWindow = this;
	3586	+
	3587	+// fix "+" issue
	3588	+ //group.editWindow = this;
	3589	+ group.manipWindow = this;
	3590	+
3004	3591	/*
3005	3592	currentLayout = radio.layout;
3006	3593	if (currentLayout == null)
3007	3594	currentLayout = sevenButton;
3008	3595	*/
3009	3596	radio.layout.doClick();
	3597	+
	3598	+ ClearUnpinned();
	3599	+ //Grafreed.Assert(group != null);
	3600	+ //Grafreed.Assert(group.selection != null);
	3601	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3602	+ if (group.selection == null \|\| group.selection.size() == 1)
	3603	+ EditSelection(false);
3010	3604	keepparent = group.parent;
3011	3605	// PARENT = NULL or not???
3012	3606	//group.parent = null; // ROOT
3013	3607	//group.attributes = -1;
3014	3608	ResetModel();
	3609	+
	3610	+ cameraView.requestFocusInWindow();
3015	3611	refreshContents(true);
3016		- }
	3612	+ } else if (event.getSource() == editCameraItem)
	3613	+ {
	3614	+ cameraView.ProtectCamera();
	3615	+ cameraView.repaint();
	3616	+ return;
	3617	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3618	+ {
	3619	+ cameraView.RevertCamera();
	3620	+ cameraView.repaint();
	3621	+ return;
	3622	+ // } else if (event.getSource() == textureButton)
	3623	+ // {
	3624	+ // return; // true;
	3625	+ }
3017	3626	else
3018	3627	{
3019	3628	//return super.action(event, arg);
..	..	@@ -3022,7 +3631,6 @@
3022	3631	}
3023	3632
3024	3633	boolean useclient = false;
3025		- cRadio radio;
3026	3634
3027	3635	void ToggleRoot()
3028	3636	{
..	..	@@ -3074,6 +3682,28 @@
3074	3682	refreshContents();
3075	3683	}
3076	3684
	3685	+ void TransformChildren()
	3686	+ {
	3687	+ Object3D obj;
	3688	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3689	+ {
	3690	+ obj = (Object3D)e.nextElement();
	3691	+ obj.KeepTextureMatrices();
	3692	+ obj.TransformChildren();
	3693	+ obj.RestoreTextureMatrices();
	3694	+
	3695	+// if (obj.parent == null)
	3696	+// {
	3697	+// System.out.println("NULL PARENT!");
	3698	+// new Exception().printStackTrace();
	3699	+// }
	3700	+// else
	3701	+// TouchTransform(obj);
	3702	+// //obj.parent.Touch();
	3703	+ }
	3704	+
	3705	+ refreshContents();
	3706	+ }
3077	3707
3078	3708	void ResetTransform()
3079	3709	{
..	..	@@ -3186,7 +3816,7 @@
3186	3816	refreshContents();
3187	3817	}
3188	3818
3189		- void ResetCentroid()
	3819	+ void ResetCentroid(boolean full)
3190	3820	{
3191	3821	Object3D obj;
3192	3822	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3201,12 +3831,16 @@
3201	3831	LA.matIdentity(Object3D.mat);
3202	3832	obj.getBounds(minima, maxima, false);
3203	3833	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3204		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3834	+ if (full)
	3835	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3205	3836	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3206	3837	obj.TransformMesh(Object3D.mat);
	3838	+
3207	3839	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3208		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3840	+ if (full)
	3841	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3209	3842	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3843	+
3210	3844	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3211	3845	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3212	3846	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3235,7 +3869,8 @@
3235	3869
3236	3870	int size = obj.MemorySize();
3237	3871
3238		- System.err.println((size/1024) + " KB is the size of " + obj);
	3872	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3873	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3239	3874	}
3240	3875	}
3241	3876	catch (Exception e)
..	..	@@ -3272,9 +3907,9 @@
3272	3907	obj = (Object3D)e.nextElement();
3273	3908
3274	3909	System.out.println("Object is: " + obj);
3275		- GrafreeD.AnalyzeObject(obj);
	3910	+ Grafreed.AnalyzeObject(obj);
3276	3911	System.out.println("Boundary rep: " + obj.bRep);
3277		- GrafreeD.AnalyzeObject(obj.bRep);
	3912	+ Grafreed.AnalyzeObject(obj.bRep);
3278	3913
3279	3914	// System.err.println((size/1024) + " KB is the size of " + obj);
3280	3915	}
..	..	@@ -3316,6 +3951,13 @@
3316	3951	void GenNormals(boolean crease)
3317	3952	{
3318	3953	group.GenNormalsS(crease);
	3954	+
	3955	+ refreshContents();
	3956	+ }
	3957	+
	3958	+ void GenNormalsMESH()
	3959	+ {
	3960	+ group.GenNormalsMeshS();
3319	3961
3320	3962	refreshContents();
3321	3963	}
..	..	@@ -3488,8 +4130,8 @@
3488	4130
3489	4131	void ParseVertices()
3490	4132	{
3491		- boolean epsequal = GrafreeD.epsequal;
3492		- GrafreeD.epsequal = true;
	4133	+ boolean epsequal = Grafreed.epsequal;
	4134	+ Grafreed.epsequal = true;
3493	4135
3494	4136	for (int i=0; i<group.selection.size(); i++)
3495	4137	{
..	..	@@ -3514,7 +4156,7 @@
3514	4156	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3515	4157	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3516	4158
3517		- g.add(GrafreeD.clipboard);
	4159	+ g.add(Grafreed.clipboard);
3518	4160
3519	4161	buffer.add(g);
3520	4162	}
..	..	@@ -3529,7 +4171,7 @@
3529	4171	makeSomething(buffer, i==group.selection.size()-1);
3530	4172	}
3531	4173
3532		- GrafreeD.epsequal = epsequal;
	4174	+ Grafreed.epsequal = epsequal;
3533	4175
3534	4176	refreshContents();
3535	4177	}
..	..	@@ -3547,7 +4189,16 @@
3547	4189	String pigment = Object3D.GetPigment(tex);
3548	4190	//String bump = Object3D.GetBump(tex);
3549	4191
3550		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4192	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4193	+
	4194	+ try
	4195	+ {
	4196	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4197	+ }
	4198	+ catch (Exception e)
	4199	+ {
	4200	+ System.err.println("FAIL: " + node);
	4201	+ }
3551	4202
3552	4203	double s = v.s;
3553	4204
..	..	@@ -3635,11 +4286,11 @@
3635	4286
3636	4287	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3637	4288
3638		- boolean random = CameraPane.RANDOM;
3639		- CameraPane.RANDOM = false; // parse all random nodes
	4289	+ boolean random = CameraPane.SWITCH;
	4290	+ CameraPane.SWITCH = false; // parse all random nodes
3640	4291	lowres.linkVerticesThis(null);
3641	4292	lowres.linkVerticesThis(sn);
3642		- CameraPane.RANDOM = random;
	4293	+ CameraPane.SWITCH = random;
3643	4294
3644	4295	System.err.flush();
3645	4296
..	..	@@ -3679,7 +4330,7 @@
3679	4330	return;
3680	4331
3681	4332	Object3D poses = group.selection.get(0);
3682		- Object3D ref = GrafreeD.clipboard.get(0);
	4333	+ Object3D ref = Grafreed.clipboard.get(0);
3683	4334
3684	4335	Object3D newgroup = new Object3D("Po:" + poses.name);
3685	4336
..	..	@@ -3873,9 +4524,9 @@
3873	4524
3874	4525	void ClipMesh()
3875	4526	{
3876		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4527	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3877	4528	{
3878		- Object3D content = GrafreeD.clipboard.get(0);
	4529	+ Object3D content = Grafreed.clipboard.get(0);
3879	4530
3880	4531	if (content instanceof cGroup && ((cGroup)content).transientlink )
3881	4532	content = ((cGroup)content).get(0);
..	..	@@ -3884,7 +4535,7 @@
3884	4535	// {
3885	4536	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3886	4537	// }
3887		- group.selection.ClipMesh(GrafreeD.clipboard);
	4538	+ group.selection.ClipMesh(Grafreed.clipboard);
3888	4539	}
3889	4540	// group.selection.ClipMesh(GrafreeD.clipboard);
3890	4541	System.out.println("DONE.");
..	..	@@ -3931,6 +4582,18 @@
3931	4582	void MarkLeaves(boolean hide)
3932	4583	{
3933	4584	group.selection.MarkLeaves(hide);
	4585	+ refreshContents();
	4586	+ }
	4587	+
	4588	+ void RewindLeaves(boolean hide)
	4589	+ {
	4590	+ group.selection.RewindLeaves(hide);
	4591	+ refreshContents();
	4592	+ }
	4593	+
	4594	+ void RandomLeaves(boolean hide)
	4595	+ {
	4596	+ group.selection.RandomLeaves(hide);
3934	4597	refreshContents();
3935	4598	}
3936	4599
..	..	@@ -4005,28 +4668,25 @@
4005	4668	// }
4006	4669	// }
4007	4670
4008		- static boolean allparams = true;
4009		-
4010		- static Vector<Object3D> listUI = new Vector<Object3D>();
4011		-
4012	4671	void EditSelection(boolean newWindow)
4013	4672	{
	4673	+ if (group.selection == null)
	4674	+ {
	4675	+ EditElement(group, newWindow); // ? new
	4676	+ return;
	4677	+ }
	4678	+
4014	4679	// aConstraints.gridy = 0;
4015	4680	for (int i=0; i<group.selection.size(); i++)
4016	4681	{
4017	4682	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4018	4683	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4019		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4684	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4020	4685
4021	4686	Object3D elem = (Object3D)group.selection.elementAt(i);
4022		- if(elem != group)
	4687	+ if(elem != group \|\| !newWindow)
4023	4688	{
4024		- // if (!(elem instanceof Composite))
4025		- // newWindow = false;
4026		- listUI.add(elem);
4027		- elem.openEditWindow(this, newWindow); //, false);
4028		- System.out.println("edit : " + elem);
4029		- elem.editWindow.refreshContents(true); // ? new
	4689	+ EditElement(elem, newWindow); // ? new
4030	4690	}
4031	4691	}
4032	4692	}
..	..	@@ -4101,7 +4761,8 @@
4101	4761	//new Exception().printStackTrace();
4102	4762
4103	4763	freezemodel = true;
4104		-
	4764	+ ClearUnpinned();
	4765	+
4105	4766	/**/
4106	4767	//switch (event.id)
4107	4768	{
..	..	@@ -4109,7 +4770,6 @@
4109	4770	//case 702: // Event.LIST_DESELECT
4110	4771	group.deselectAll();
4111	4772	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4112		- objEditor.ClearInfo(); // .GetMaterial());
4113	4773	if (tps != null)
4114	4774	{
4115	4775	for (int i=0; i < tps.length; i++)
..	..	@@ -4118,33 +4778,39 @@
4118	4778
4119	4779	//if (child.parent != null)
4120	4780	//child.parent.addSelectee(child);
	4781	+ objEditor.SetMaterial(child);
4121	4782	group.addSelectee(child);
4122		- objEditor.SetMaterial(child); // .GetMaterial());
4123		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4124		- System.err.println("info : " + child.GetPath());
4125	4783	}
4126	4784	}
4127		- else
4128		- {
4129		- objEditor.SetMaterial(group); // .GetMaterial());
4130		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4131		- System.err.println("info : " + group.GetPath());
4132		- }
	4785	+// else
	4786	+// {
	4787	+// objEditor.SetMaterial(group); // .GetMaterial());
	4788	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4789	+// System.err.println("info : " + group.GetPath());
	4790	+// }
4133	4791
4134		- objEditor.SetText(); // jan 2014
4135		-
4136		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4792	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4137	4793	CameraPane.flash = true;
4138	4794
4139		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4795	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4140	4796	// a camera
4141	4797	{
4142		- CameraPane.camerachangeframe = 0; // don't refuse it
4143		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4798	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4799	+ {
	4800	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4801	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4802	+ }
4144	4803	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4145	4804	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4146	4805	}
4147	4806
	4807	+ if (tps != null && tps.length == 1)
	4808	+ {
	4809	+ EditSelection(false);
	4810	+ }
	4811	+
	4812	+ SetPinStates(tps != null && tps.length > 0);
	4813	+
4148	4814	refreshContents();
4149	4815	//return true;
4150	4816	}
..	..	@@ -4153,6 +4819,35 @@
4153	4819
4154	4820	freezemodel = false;
4155	4821	}
	4822	+
	4823	+ void SetPinStates(boolean enabled)
	4824	+ {
	4825	+ editButton.setEnabled(enabled);
	4826	+ uneditButton.setEnabled(enabled);
	4827	+ unselectButton.setEnabled(enabled);
	4828	+ flashSelectionButton.setEnabled(enabled);
	4829	+ }
	4830	+
	4831	+ void refreshContents(boolean cp)
	4832	+ {
	4833	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	4834	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4835	+ {
	4836	+ objEditor.ClearInfo(); // .GetMaterial());
	4837	+
	4838	+ for (int i=0; i < group.selection.Size(); i++)
	4839	+ {
	4840	+ Object3D child = (Object3D) group.selection.get(i);
	4841	+
	4842	+ objEditor.AddInfo(child, this, true);
	4843	+ System.err.println("info : " + child.GetPath());
	4844	+ }
	4845	+
	4846	+ objEditor.SetText(); // jan 2014
	4847	+ }
	4848	+
	4849	+ super.refreshContents(cp);
	4850	+ }
4156	4851
4157	4852	void linkSomething(Object3D thing)
4158	4853	{
..	..	@@ -4224,16 +4919,19 @@
4224	4919	{
4225	4920	if (group.selection.isEmpty())
4226	4921	return;
4227		- GrafreeD.clipboardIsTempGroup = false;
	4922	+
	4923	+ Grafreed.clipboardIsTempGroup = false;
4228	4924	Composite tGroup = null;
4229	4925	if (group.selection.size() > 0) // 1)
4230	4926	{
4231	4927	tGroup = new cGroup();
4232		- GrafreeD.clipboardIsTempGroup = true;
	4928	+ Grafreed.clipboardIsTempGroup = true;
4233	4929	}
4234	4930
4235	4931	if (cut)
4236	4932	{
	4933	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4934	+// Save();
4237	4935	//int indices[] = jList.getSelectedIndices();
4238	4936	//for (int i = indices.length - 1; i >= 0; i--)
4239	4937	//jList.remove(indices[i]);
..	..	@@ -4269,16 +4967,16 @@
4269	4967	//System.out.println("cut " + child);
4270	4968	//System.out.println("parent = " + child.parent);
4271	4969	// tmp.addChild(child);
4272		- if (GrafreeD.clipboardIsTempGroup)
	4970	+ if (Grafreed.clipboardIsTempGroup)
4273	4971	tGroup.add/Child/(tmp);
4274	4972	else
4275		- GrafreeD.clipboard = tmp;
	4973	+ Grafreed.clipboard = tmp;
4276	4974	}
4277	4975	else
4278		- if (GrafreeD.clipboardIsTempGroup)
	4976	+ if (Grafreed.clipboardIsTempGroup)
4279	4977	tGroup.add/Child/(child);
4280	4978	else
4281		- GrafreeD.clipboard = child;
	4979	+ Grafreed.clipboard = child;
4282	4980	}
4283	4981
4284	4982	//ResetModel();
..	..	@@ -4310,21 +5008,23 @@
4310	5008	//System.out.println("cut " + elem);
4311	5009	//System.out.println("parent = " + elem.parent);
4312	5010	// tmp.addChild(elem);
4313		- if (GrafreeD.clipboardIsTempGroup)
	5011	+ if (Grafreed.clipboardIsTempGroup)
4314	5012	tGroup.add/Child/(tmp);
4315	5013	else
4316		- GrafreeD.clipboard = tmp;
	5014	+ Grafreed.clipboard = tmp;
4317	5015	}
4318	5016	else
4319		- if (GrafreeD.clipboardIsTempGroup)
	5017	+ if (Grafreed.clipboardIsTempGroup)
4320	5018	tGroup.add/Child/(child);
4321	5019	else
4322		- GrafreeD.clipboard = child;
	5020	+ Grafreed.clipboard = child;
4323	5021	}
4324	5022
4325	5023	}
4326		- if (GrafreeD.clipboardIsTempGroup)
4327		- GrafreeD.clipboard = tGroup;
	5024	+
	5025	+ if (Grafreed.clipboardIsTempGroup)
	5026	+ Grafreed.clipboard = tGroup;
	5027	+
4328	5028	if (cut)
4329	5029	{
4330	5030	ResetModel();
..	..	@@ -4334,11 +5034,15 @@
4334	5034
4335	5035	void paste(boolean expand)
4336	5036	{
	5037	+ if (Globals.REPLACEONMAKE)
	5038	+ Save();
	5039	+ boolean keep = Globals.REPLACEONMAKE;
	5040	+ Globals.REPLACEONMAKE = false;
4337	5041	// if (GrafreeD.clipboard == null)
4338	5042	// return;
4339	5043	boolean first = true;
4340	5044
4341		- if (GrafreeD.clipboardIsTempGroup)
	5045	+ if (Grafreed.clipboardIsTempGroup)
4342	5046	{
4343	5047	Composite temp;
4344	5048
..	..	@@ -4349,7 +5053,7 @@
4349	5053	temp = (Composite)Applet3D.clipboard.deepCopy();
4350	5054	*/
4351	5055	Object3D elem;
4352		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5056	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4353	5057	{
4354	5058	Object3D child = (Object3D)e.nextElement();
4355	5059
..	..	@@ -4383,21 +5087,22 @@
4383	5087	//Object3D cb = Applet3D.clipboard;
4384	5088	//temp.addChild(cb);
4385	5089	//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());
	5090	+ assert(Grafreed.clipboard.parent == null);
	5091	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5092	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5093	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5094	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4391	5095	else
4392		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4393		- GrafreeD.clipboard.get(0).parent = keepparent;
	5096	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5097	+ Grafreed.clipboard.get(0).parent = keepparent;
4394	5098	}
4395	5099
	5100	+ Globals.REPLACEONMAKE = keep;
4396	5101	ResetModel();
4397	5102	refreshContents();
4398	5103	}
4399	5104
4400		- void pasteInto(boolean copyit)
	5105	+ void pasteInto(boolean copyit, boolean clone)
4401	5106	{
4402	5107	// if (GrafreeD.clipboard == null)
4403	5108	// return;
..	..	@@ -4426,15 +5131,22 @@
4426	5131	if (copyit)
4427	5132	{
4428	5133	// paste(false);
4429		- CloneClipboard(false); // sept 2014
	5134	+ if (clone)
	5135	+ {
	5136	+ CloneClipboard(false); // sept 2014
	5137	+ }
	5138	+ else
	5139	+ {
	5140	+ paste(false);
	5141	+ }
4430	5142	}
4431	5143	else
4432	5144	{
4433	5145	boolean first = true;
4434	5146
4435		- if (GrafreeD.clipboardIsTempGroup)
	5147	+ if (Grafreed.clipboardIsTempGroup)
4436	5148	{
4437		- Composite temp = (Composite)GrafreeD.clipboard;
	5149	+ Composite temp = (Composite)Grafreed.clipboard;
4438	5150	Object3D copy;
4439	5151	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4440	5152	{
..	..	@@ -4444,7 +5156,7 @@
4444	5156	}
4445	5157	} else
4446	5158	{
4447		- linkSomething(GrafreeD.clipboard); //.get(0));
	5159	+ linkSomething(Grafreed.clipboard); //.get(0));
4448	5160	}
4449	5161	}
4450	5162	}
..	..	@@ -4521,6 +5233,10 @@
4521	5233
4522	5234	void group(Object3D csg, boolean grab)
4523	5235	{
	5236	+ if (Globals.REPLACEONMAKE)
	5237	+ Save();
	5238	+ boolean keep = Globals.REPLACEONMAKE;
	5239	+ Globals.REPLACEONMAKE = false;
4524	5240	if (//false) // why??
4525	5241	!group.selection.isEmpty())
4526	5242	{
..	..	@@ -4634,10 +5350,15 @@
4634	5350	//node.add(csg);
4635	5351	//makeSomething(node);
4636	5352	makeSomething(csg);
	5353	+ Globals.REPLACEONMAKE = keep;
4637	5354	}
4638	5355
4639	5356	void Ungroup(Object3D g)
4640	5357	{
	5358	+ if (Globals.REPLACEONMAKE)
	5359	+ Save();
	5360	+ boolean keep = Globals.REPLACEONMAKE;
	5361	+ Globals.REPLACEONMAKE = false;
4641	5362	if (g instanceof HiddenObject)
4642	5363	{
4643	5364	HiddenObject h = (HiddenObject) g;
..	..	@@ -4654,6 +5375,7 @@
4654	5375	objEditor.makeSomething(g.get(i), false);
4655	5376	}
4656	5377	}
	5378	+ Globals.REPLACEONMAKE = keep;
4657	5379	}
4658	5380
4659	5381	void ungroup()
..	..	@@ -4849,21 +5571,6 @@
4849	5571	}
4850	5572	*/
4851	5573
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	5574	/*
4868	5575	public void Callback(Object obj)
4869	5576	{
..	..	@@ -4887,26 +5594,9 @@
4887	5594	}
4888	5595	*/
4889	5596
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	5597	String GetFile(String dialogName)
4908	5598	{
4909		- if (GrafreeD.standAlone)
	5599	+ if (Grafreed.standAlone)
4910	5600	{
4911	5601	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4912	5602	browser.show();
..	..	@@ -4970,10 +5660,33 @@
4970	5660	cButton flashSelectionButton;
4971	5661	cButton editButton;
4972	5662	cButton uneditButton;
	5663	+ JCheckBox allParamsButton;
4973	5664	cButton clearpanelButton;
4974		- cButton allParamsButton;
4975	5665	cButton unselectButton;
4976	5666
	5667	+ cButton restoreCameraButton;
	5668	+
	5669	+ cButton saveButton;
	5670	+ cButton oneStepButton;
	5671	+
	5672	+ cButton groupButton;
	5673	+ cButton ungroupButton;
	5674	+ cButton compositeButton;
	5675	+ cButton switchButton;
	5676	+ cButton loopButton;
	5677	+ cButton textureButton;
	5678	+
	5679	+ cButton gridButton;
	5680	+ cButton boxButton;
	5681	+ cButton sphereButton;
	5682	+ cButton coneButton;
	5683	+ cButton torusButton;
	5684	+ cButton superButton;
	5685	+ cButton kleinButton;
	5686	+ cButton particlesButton;
	5687	+ cButton overlayButton;
	5688	+ cButton lightButton;
	5689	+
4977	5690	cButton screenfitButton;
4978	5691	cButton screenfitpointButton;
4979	5692	cButton snapobjectButton;
..	..	@@ -4985,14 +5698,6 @@
4985	5698
4986	5699	cButton setsupportButton;
4987	5700
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	5701	//
4997	5702	//Composite
4998	5703	Object3D // to do !!
..	..	@@ -5002,9 +5707,11 @@
5002	5707	//JTree jTree;
5003	5708	private MenuItem lookAtItem;
5004	5709	private MenuItem lookFromItem;
5005		- private MenuItem switchItem;
	5710	+ private MenuItem switchViewItem;
5006	5711	private MenuItem cutItem;
5007		- private MenuItem duplicateItem;
	5712	+ private MenuItem undoItem;
	5713	+ private MenuItem redoItem;
	5714	+ private JMenuItem duplicateItem;
5008	5715	private MenuItem cloneItem;
5009	5716	private MenuItem cloneSupportItem;
5010	5717	private MenuItem overwriteGeoItem;
..	..	@@ -5017,7 +5724,7 @@
5017	5724	private MenuItem linkverticesItem;
5018	5725	private MenuItem relinkverticesItem;
5019	5726	private MenuItem setMasterItem;
5020		- private MenuItem resetMeshItem;
	5727	+ private MenuItem resetAllItem;
5021	5728	private MenuItem stepAllItem;
5022	5729	private MenuItem revertMeshItem;
5023	5730	private MenuItem poseMeshItem;
..	..	@@ -5028,10 +5735,11 @@
5028	5735	private MenuItem mergeGeometriesItem;
5029	5736	private MenuItem copyItem;
5030	5737	private MenuItem pasteItem;
	5738	+ private MenuItem pasteIntoItem;
5031	5739	private MenuItem pasteLinkItem;
5032	5740	private MenuItem pasteCloneItem;
5033	5741	private MenuItem pasteExpandItem;
5034		- private MenuItem clearItem;
	5742	+ private MenuItem deleteItem;
5035	5743	private MenuItem clearAllItem;
5036	5744	private MenuItem genUVItem;
5037	5745	private MenuItem genNormalsMESHItem;
..	..	@@ -5066,6 +5774,10 @@
5066	5774	private MenuItem showleavesItem;
5067	5775	private MenuItem markleavesItem;
5068	5776	private MenuItem unmarkleavesItem;
	5777	+ private MenuItem rewindleavesItem;
	5778	+ private MenuItem unrewindleavesItem;
	5779	+ private MenuItem randomleavesItem;
	5780	+ private MenuItem unrandomleavesItem;
5069	5781
5070	5782	private MenuItem flipVItem;
5071	5783	private MenuItem unflipVItem;
..	..	@@ -5077,15 +5789,17 @@
5077	5789	private MenuItem panoTexturesItem;
5078	5790
5079	5791	private MenuItem resetCentroidItem;
5080		- private MenuItem transformgeometryItem;
	5792	+ private MenuItem resetCentroidXZItem;
5081	5793	private MenuItem resetTransformItem;
	5794	+ private MenuItem transformGeometryItem;
	5795	+ private MenuItem transformChildrenItem;
5082	5796	private MenuItem hideItem;
5083	5797	private MenuItem grabItem;
5084	5798	private MenuItem backItem;
5085	5799	private MenuItem frontItem;
5086	5800	private MenuItem cameraItem;
5087	5801	private MenuItem compositeItem;
5088		- private MenuItem randomItem;
	5802	+ private MenuItem switchItem;
5089	5803	private MenuItem physicsItem;
5090	5804	private MenuItem frameselectorItem;
5091	5805	private MenuItem scriptNodeItem;
..	..	@@ -5109,6 +5823,8 @@
5109	5823	private MenuItem attachBumpItem;
5110	5824	private MenuItem detachBumpItem;
5111	5825	private MenuItem pigmentBumpItem;
	5826	+ private MenuItem embedTexturesItem;
	5827	+ private MenuItem deEmbedTexturesItem;
5112	5828
5113	5829	private MenuItem particleItem;
5114	5830	private MenuItem ragdollItem;
..	..	@@ -5125,7 +5841,7 @@
5125	5841	private MenuItem blobItem;
5126	5842	private MenuItem latheItem;
5127	5843	private MenuItem bezierItem;
5128		- private MenuItem checkerItem;
	5844	+ private MenuItem overlayItem;
5129	5845	private MenuItem meshItem;
5130	5846	// private MenuItem meshGroupItem;
5131	5847	private MenuItem springItem;
..	..	@@ -5147,11 +5863,6 @@
5147	5863	private MenuItem doubleItem;
5148	5864	private MenuItem tripleItem;
5149	5865
5150		- private MenuItem importGFDItem;
5151		- private MenuItem importVRMLX3DItem;
5152		- private MenuItem import3DSItem;
5153		- private MenuItem importOBJItem;
5154		-
5155	5866	private MenuItem computeAOItem;
5156	5867	private MenuItem recompileItem;
5157	5868	private MenuItem editScriptItem;
..	..	@@ -5161,4 +5872,8 @@
5161	5872	private MenuItem analyzeItem;
5162	5873	private MenuItem dumpItem;
5163	5874	//boolean freezemodel = false;
	5875	+
	5876	+ Menu cameraMenu;
	5877	+ MenuItem editCameraItem;
	5878	+ MenuItem restoreCameraItem;
5164	5879	}