~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,
..	..	@@ -22,6 +23,31 @@
22	23	DragGestureListener, DragSourceListener, DropTargetListener,
23	24	ItemListener // ListSelectionListener
24	25	{
	26	+
	27	+ public void AddSkyboxButton(String f, String s, cGridBag row3)
	28	+ {
	29	+ cButton skyboxButton;
	30	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	31	+ row3.add(skyboxButton = GetButton(path + "/" + s + ".jpg", !Grafreed.NIMBUSLAF));
	32	+ skyboxButton.setToolTipText(s);
	33	+ skyboxButton.addActionListener(new ActionListener()
	34	+ {
	35	+ @Override
	36	+ public void actionPerformed(ActionEvent e)
	37	+ {
	38	+ ChangeSkybox(path);
	39	+ }
	40	+ });
	41	+ }
	42	+
	43	+ public void ChangeSkybox(String name)
	44	+ {
	45	+ cameraView.envyoff = false;
	46	+ cameraView.skyboxname = name;
	47	+ cameraView.skyboxext = "jpg";
	48	+ cameraView.repaint();
	49	+ }
	50	+
25	51	//ObjEditor objEditor;
26	52	public void closeUI2()
27	53	{
..	..	@@ -59,6 +85,12 @@
59	85	this.copy = this.group = group;
60	86	//selectees = this.group.selectees;
61	87
	88	+ if (copy.versions == null)
	89	+ {
	90	+ copy.versions = new byte[100][];
	91	+ copy.versionindex = -1;
	92	+ }
	93	+
62	94	if(ui)
63	95	SetupUI(objEditor);
64	96	}
..	..	@@ -73,16 +105,28 @@
73	105	this.copy = this.group = copy;
74	106	//selectees = this.group.selectees;
75	107
76		- SetupMenu2(objEditor);
	108	+ SetupMenu2(this); //objEditor);
77	109	SetupUI2(objEditor);
78	110	objEditor.SetupUI(true);
79	111	SetupViews(objEditor);
80	112
81	113	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	114	+
	115	+ if (copy.versions == null)
	116	+ {
	117	+ copy.versions = new byte[100][];
	118	+ copy.versionindex = -1;
	119	+
	120	+ Save(true);
	121	+ }
82	122	}
83	123
84	124	void CloneSelection(boolean supports)
85	125	{
	126	+ if (Globals.REPLACEONMAKE)
	127	+ Save();
	128	+ boolean keep = Globals.REPLACEONMAKE;
	129	+ Globals.REPLACEONMAKE = false;
86	130	// Object3D keep = GrafreeD.clipboard;
87	131	//Object3D obj;
88	132	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -93,18 +137,19 @@
93	137
94	138	makeSomething(clone, i==group.selection.size()-1);
95	139	}
	140	+ Globals.REPLACEONMAKE = keep;
96	141	}
97	142
98	143	void CloneClipboard(boolean supports)
99	144	{
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));
	145	+ assert(Grafreed.clipboard.parent == null);
	146	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	147	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	148	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	149	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	150	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	151	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	152	+ Grafreed.clipboard.get(0).parent = keepparent;
108	153	}
109	154
110	155	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +163,7 @@
118	163	// obj.support = null;
119	164	if (!supports)
120	165	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	166	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	167	obj.parent = parent;
123	168	// obj.support = support;
124	169	// clone.support = support; // aout 2013
..	..	@@ -147,30 +192,29 @@
147	192
148	193	//JTextField nameField;
149	194
150		- void SetupMenu2(ObjEditor oe)
	195	+ void SetupMenu2(GroupEditor oe)
151	196	{
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);
	197	+ oe.jTree = new cTree();
	198	+
163	199	Menu menu;
164	200	oe.menuBar.add(menu = new Menu("Edit"));
165	201	//editItem = menu.add(new MenuItem("Edit"));
166	202	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	203	+
	204	+// undoItem = menu.add(new MenuItem("Undo"));
	205	+// undoItem.addActionListener(this);
	206	+// redoItem = menu.add(new MenuItem("Redo"));
	207	+// redoItem.addActionListener(this);
	208	+// menu.add("-");
	209	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	210	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	211	cloneItem = menu.add(new MenuItem("Clone"));
171	212	cloneItem.addActionListener(this);
	213	+ if (Globals.ADVANCED)
	214	+ {
172	215	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	216	cloneSupportItem.addActionListener(this);
	217	+ }
174	218	menu.add("-");
175	219	cutItem = menu.add(new MenuItem("Cut"));
176	220	cutItem.addActionListener(this);
..	..	@@ -178,27 +222,123 @@
178	222	copyItem.addActionListener(this);
179	223	pasteItem = menu.add(new MenuItem("Paste"));
180	224	pasteItem.addActionListener(this);
	225	+
	226	+ menu.add("-");
	227	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	228	+ pasteIntoItem.addActionListener(this);
181	229	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	230	pasteLinkItem.addActionListener(this);
183	231	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	232	pasteCloneItem.addActionListener(this);
185	233	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	234	// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
	235	+ menu.add("-");
	236	+ deleteItem = menu.add(new MenuItem("Delete"));
	237	+ deleteItem.addActionListener(this);
	238	+
	239	+ if (Globals.ADVANCED)
	240	+ {
	241	+ // Deletes the cameras...
189	242	clearAllItem = menu.add(new MenuItem("Clear All"));
190	243	clearAllItem.addActionListener(this);
	244	+ }
	245	+
	246	+ menuBar.add(cameraMenu = new Menu("View"));
	247	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	248	+ //zBufferItem.addActionListener(this);
	249	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	250	+ //normalLensItem.addActionListener(this);
	251	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	252	+ restoreCameraItem.addActionListener(this);
	253	+
	254	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	255	+// toggleFullScreenItem.addItemListener(this);
	256	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	257	+// cameraMenu.add("-");
	258	+//
	259	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	260	+// toggleTextureItem.addItemListener(this);
	261	+// toggleTextureItem.setState(CameraPane.textureon);
	262	+//
	263	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	264	+// toggleSwitchItem.addItemListener(this);
	265	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	266	+
	267	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	268	+ toggleHandleItem.addItemListener(this);
	269	+ toggleHandleItem.setState(CameraPane.HANDLES);
	270	+
	271	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	272	+ togglePaintItem.addItemListener(this);
	273	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	274	+
	275	+ if (Globals.ADVANCED)
	276	+ {
	277	+ cameraMenu.add("-");
	278	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	279	+ toggleLiveItem.addItemListener(this);
	280	+ toggleLiveItem.setState(Globals.isLIVE());
191	281
	282	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	283	+ stepItem.addActionListener(this);
	284	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	285	+ // toggleDLItem.addItemListener(this);
	286	+ // toggleDLItem.setState(false);
	287	+
	288	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	289	+ toggleRenderItem.addItemListener(this);
	290	+ toggleRenderItem.setState(!CameraPane.frozen);
	291	+
	292	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	293	+ toggleDebugItem.addItemListener(this);
	294	+ toggleDebugItem.setState(Globals.DEBUG);
	295	+
	296	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	297	+ toggleFrustumItem.addItemListener(this);
	298	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	299	+
	300	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	301	+ toggleFootContactItem.addItemListener(this);
	302	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	303	+
	304	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	305	+ toggleTimelineItem.addItemListener(this);
	306	+ }
	307	+
	308	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	309	+// toggleRootItem.addItemListener(this);
	310	+// toggleRootItem.setState(false);
	311	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	312	+// animationItem.addItemListener(this);
	313	+// animationItem.setState(CameraPane.ANIMATION);
	314	+ cameraMenu.add("-");
	315	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	316	+ editCameraItem.addActionListener(this);
	317	+
	318	+ if (Globals.ADVANCED)
	319	+ {
	320	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	321	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	322	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	323	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	324	+ oe.cameraMenu.add("-");
	325	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	326	+ openWindowItem.addActionListener(this);
	327	+ editLeafItem.addActionListener(this);
	328	+ lookAtItem.addActionListener(this);
	329	+ //lookFromItem.addActinoListener(this);
	330	+ //switchViewItem.addActionListener(this);
	331	+ }
	332	+
192	333	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);
	334	+ if (Globals.ADVANCED)
	335	+ {
197	336	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	337	revertMeshItem.addActionListener(this);
199	338	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	339	resetreferencesItem.addActionListener(this);
201	340	menu.add("-");
	341	+ }
202	342	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	343	overwriteGeoItem.addActionListener(this);
204	344	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,79 +350,104 @@
210	350	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	351	overwriteUVItem.addActionListener(this);
212	352	menu.add("-");
	353	+ if (Globals.ADVANCED)
	354	+ {
213	355	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	356	generateMeshItem.addActionListener(this);
215	357	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	358	poseMeshItem.addActionListener(this);
217	359	menu.add("-");
	360	+ }
218	361	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	362	resetsupportItem.addActionListener(this);
220	363	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	364	linkverticesItem.addActionListener(this);
222	365	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	366	relinkverticesItem.addActionListener(this);
	367	+
	368	+ if (Globals.ADVANCED)
	369	+ {
224	370	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	371	setMasterItem.addActionListener(this);
	372	+ }
226	373
227	374	oe.menuBar.add(menu = new Menu("Group"));
228		- grabItem = menu.add(new MenuItem("Grab"));
229		- grabItem.addActionListener(this);
	375	+// grabItem = menu.add(new MenuItem("Grab"));
	376	+// grabItem.addActionListener(this);
230	377	backItem = menu.add(new MenuItem("Back"));
231	378	backItem.addActionListener(this);
232	379	frontItem = menu.add(new MenuItem("Front"));
233	380	frontItem.addActionListener(this);
234		- compositeItem = menu.add(new MenuItem("Composite"));
235		- compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	381	+// compositeItem = menu.add(new MenuItem("Composite"));
	382	+// compositeItem.addActionListener(this);
	383	+
	384	+ if (Globals.ADVANCED)
	385	+ {
	386	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	387	hideItem.addActionListener(this);
	388	+ }
238	389	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	390	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);
	391	+
	392	+// menu.add("-");
	393	+//
	394	+// switchItem = menu.add(new MenuItem("Switch node"));
	395	+// switchItem.addActionListener(this);
	396	+ if (Globals.ADVANCED)
	397	+ {
247	398	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	399	switchGeoItem.addActionListener(this);
249	400	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	401	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	402	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	403	morphItem.addActionListener(this);
	404	+
	405	+ menu.add("-");
	406	+ physicsItem = menu.add(new MenuItem("Physics"));
	407	+ physicsItem.addActionListener(this);
	408	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	409	+ frameselectorItem.addActionListener(this);
253	410	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	411	scriptNodeItem.addActionListener(this);
255		- cameraItem = menu.add(new MenuItem("Camera"));
256		- cameraItem.addActionListener(this);
	412	+ }
257	413
258	414	oe.menuBar.add(menu = new Menu("Object"));
259		- textureItem = menu.add(new MenuItem("Texture"));
260		- textureItem.addActionListener(this);
	415	+// textureItem = menu.add(new MenuItem("Texture"));
	416	+// textureItem.addActionListener(this);
261	417	billboardItem = menu.add(new MenuItem("Billboard"));
262	418	billboardItem.addActionListener(this);
263	419	csgItem = menu.add(new MenuItem("CSG"));
264	420	csgItem.addActionListener(this);
265		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	421	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266	422	shadowXItem.addActionListener(this);
267		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	423	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268	424	shadowYItem.addActionListener(this);
269		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	425	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270	426	shadowZItem.addActionListener(this);
	427	+ attributeItem = menu.add(new MenuItem("Attribute"));
	428	+ attributeItem.addActionListener(this);
	429	+
	430	+ if (Globals.ADVANCED)
	431	+ {
	432	+ menu.add("-");
271	433	linkerItem = menu.add(new MenuItem("Linker"));
272	434	linkerItem.addActionListener(this);
273	435	templateItem = menu.add(new MenuItem("Template"));
274	436	templateItem.addActionListener(this);
275		- attributeItem = menu.add(new MenuItem("Attribute"));
276		- attributeItem.addActionListener(this);
277	437	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	438	pointflowItem.addActionListener(this);
	439	+ }
279	440	menu.add("-");
280	441	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	442	resetTransformItem.addActionListener(this);
282	443	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	444	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	445	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	446	+ resetCentroidXZItem.addActionListener(this);
	447	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	448	+ transformGeometryItem.addActionListener(this);
	449	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	450	+ transformChildrenItem.addActionListener(this);
286	451
287	452	oe.menuBar.add(menu = new Menu("Geometry"));
288	453	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +458,11 @@
293	458	genNormalsCADItem.addActionListener(this);
294	459	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	460	genNormalsMESHItem.addActionListener(this);
296		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	461	+ if (Globals.ADVANCED)
	462	+ {
	463	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
297	464	genNormalsMINEItem.addActionListener(this);
	465	+ }
298	466	stripifyItem = menu.add(new MenuItem("Stripify"));
299	467	stripifyItem.addActionListener(this);
300	468	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +484,34 @@
316	484	reduce34MeshItem.addActionListener(this);
317	485	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	486	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	487	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	488	clipMeshItem.addActionListener(this);
	489	+
	490	+ if (Globals.ADVANCED)
	491	+ {
	492	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	493	+ smoothMeshItem.addActionListener(this);
	494	+ }
323	495
324	496	oe.menuBar.add(menu = new Menu("Attributes"));
325	497	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	498	clearMaterialsItem.addActionListener(this);
	499	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	500	+ resetAllItem.addActionListener(this);
	501	+ stepAllItem = menu.add(new MenuItem("Step All"));
	502	+ stepAllItem.addActionListener(this);
327	503	menu.add("-");
328	504	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	505	liveleavesItem.addActionListener(this);
330	506	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	507	unliveleavesItem.addActionListener(this);
	508	+ if (Globals.ADVANCED)
	509	+ {
332	510	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	511	supportleavesItem.addActionListener(this);
334	512	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	513	unsupportleavesItem.addActionListener(this);
	514	+ }
336	515	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	516	hideleavesItem.addActionListener(this);
338	517	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -341,6 +520,14 @@
341	520	markleavesItem.addActionListener(this);
342	521	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343	522	unmarkleavesItem.addActionListener(this);
	523	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	524	+ rewindleavesItem.addActionListener(this);
	525	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	526	+ unrewindleavesItem.addActionListener(this);
	527	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	528	+ randomleavesItem.addActionListener(this);
	529	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	530	+ unrandomleavesItem.addActionListener(this);
344	531	menu.add("-");
345	532	flipVItem = menu.add(new MenuItem("Flip V"));
346	533	flipVItem.addActionListener(this);
..	..	@@ -366,45 +553,56 @@
366	553	attachBumpItem.addActionListener(this);
367	554	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
368	555	pigmentBumpItem.addActionListener(this);
	556	+ //embedTexturesItem
369	557	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
370	558	detachPigmentItem.addActionListener(this);
371	559	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
372	560	detachBumpItem.addActionListener(this);
	561	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	562	+ embedTexturesItem.addActionListener(this);
	563	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	564	+ deEmbedTexturesItem.addActionListener(this);
373	565	menu.add("-");
374	566	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
375	567	sortbysizeItem.addActionListener(this);
376	568	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	569	sortbynameItem.addActionListener(this);
378	570	menu.add("-");
	571	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	572	+ shareGeometriesItem.addActionListener(this);
	573	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	574	+ mergeGeometriesItem.addActionListener(this);
	575	+ if (Globals.ADVANCED)
	576	+ {
	577	+ // Pretty much the same as duplicate and clone.
379	578	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	579	extractGeometriesItem.addActionListener(this);
381	580	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	581	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);
	582	+ }
387	583
388	584	oe.menuBar.add(menu = new Menu("Insert"));
389	585	buildCreateMenu(menu);
390	586
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	587	oe.menuBar.add(menu = new Menu("Tools"));
403	588	buildToolsMenu(menu);
404	589	}
405	590
	591	+
406	592	void SetupUI2(ObjEditor oe)
407	593	{
	594	+ // June 2019
	595	+ if (oe == null)
	596	+ {
	597	+ //super.SetupUI2(this);
	598	+ //return;
	599	+ }
	600	+
	601	+ if (copy != group)
	602	+ {
	603	+ //super.SetupUI2(this);
	604	+ }
	605	+
408	606	//new Exception().printStackTrace();
409	607
410	608	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -433,110 +631,327 @@
433	631	oe.radioPanel.add(dummyButton);
434	632	oe.buttonGroup.add(dummyButton);
435	633	*/
436		- aConstraints.gridy += 1;
	634	+ cGridBag copyOptionsPanel = new cGridBag();
	635	+
	636	+ copyOptionsPanel.preferredHeight = 2;
437	637
438	638	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	639
440		- oe.aConstraints.gridwidth = 1;
441		- oe.aConstraints.gridx = 0;
	640	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	641	+ //minButton.setToolTipText("Minimize window");
	642	+ //minButton.addActionListener(this);
442	643
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);
	644	+ if (Globals.ADVANCED)
	645	+ {
	646	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	647	+ maxButton.setToolTipText("Maximize window");
	648	+ maxButton.addActionListener(this);
	649	+ }
	650	+
	651	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	652	+ fullButton.setToolTipText("Full-screen window");
	653	+ fullButton.addActionListener(this);
	654	+
	655	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
454	656	screenfitButton.setToolTipText("Screen fit");
455	657	screenfitButton.addActionListener(this);
456		- oe.aConstraints.gridx += 1;
	658	+
	659	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	660	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	661	+ restoreCameraButton.addActionListener(this);
	662	+
	663	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	664	+ saveButton.setToolTipText("New version");
	665	+ saveButton.addActionListener(this);
	666	+
	667	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	668	+ undoButton.setToolTipText("Previous version");
	669	+ undoButton.addActionListener(this);
	670	+ undoButton.setEnabled(false);
	671	+
	672	+ cGridBag updown = new cGridBag().setVertical(true);
	673	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	674	+ restoreButton.setToolTipText("Restore current");
	675	+ restoreButton.addActionListener(this);
	676	+ restoreButton.setEnabled(false);
	677	+
	678	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	679	+ replaceButton.setToolTipText("Replace current");
	680	+ replaceButton.addActionListener(this);
	681	+ replaceButton.setEnabled(false);
	682	+
	683	+ copyOptionsPanel.add(updown);
	684	+
	685	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	686	+ redoButton.setToolTipText("Next version");
	687	+ redoButton.addActionListener(this);
	688	+ redoButton.setEnabled(false);
	689	+
	690	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	691	+ liveCB.setToolTipText("Enable animation");
	692	+ liveCB.addItemListener(this);
	693	+
	694	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	695	+ oneStepButton.setToolTipText("Animate one step forward");
	696	+ oneStepButton.addActionListener(this);
	697	+
	698	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	699	+ fastCB.setToolTipText("Fast mode");
	700	+ fastCB.addItemListener(this);
	701	+
	702	+ //oe.toolboxPanel.Return();
	703	+
	704	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	705	+// trackCB.setToolTipText("Enable tracking");
	706	+// trackCB.addItemListener(this);
	707	+
457	708	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
458	709	// 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	710
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);
	711	+ if (Globals.ADVANCED)
	712	+ {
	713	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	714	+ snapobjectButton.addActionListener(this);
	715	+ snapobjectButton.setToolTipText("Snap Object");
	716	+
	717	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	718	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");
	719	+ fourButton.setToolTipText("Show control panel only");
	720	+ }
	721	+
	722	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	723	+
	724	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	725	+ twoButton.setToolTipText("Show 3D view only");
	726	+ twoButton.addActionListener(this);
	727	+ this.fullscreenLayout = twoButton;
	728	+
	729	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	730	+ threeButton.setToolTipText("Show controls and 3D view");
492	731	threeButton.addActionListener(this);
493		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
494		- sevenButton.setToolTipText("3-column layout");
495		- sevenButton.addActionListener(this);
	732	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	733	+ sixButton.setToolTipText("Show 3D view and controls");
	734	+ sixButton.addActionListener(this);
	735	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	736	+// sevenButton.setToolTipText("3-column layout");
	737	+// sevenButton.addActionListener(this);
496	738	//
497	739
498		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
499		- rootButton.setToolTipText("Edit object in new tab");
	740	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	741	+ rootButton.setToolTipText("Open selection in new tab");
500	742	rootButton.addActionListener(this);
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	743	+
	744	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
503	745	closeButton.setToolTipText("Close tab");
504	746	closeButton.addActionListener(this);
505	747	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
506	748	//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	749
516		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	750	+ cGridBag row1 = new cGridBag();
	751	+
	752	+ // INSERT
	753	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	754	+ gridButton.setToolTipText("Create grid");
	755	+ gridButton.addActionListener(this);
	756	+
	757	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	758	+ boxButton.setToolTipText("Create box");
	759	+ boxButton.addActionListener(this);
	760	+
	761	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	762	+ sphereButton.setToolTipText("Create sphere");
	763	+ sphereButton.addActionListener(this);
	764	+
	765	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	766	+ coneButton.setToolTipText("Create cone");
	767	+ coneButton.addActionListener(this);
	768	+
	769	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	770	+ torusButton.setToolTipText("Create torus");
	771	+ torusButton.addActionListener(this);
	772	+
	773	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	774	+ superButton.setToolTipText("Create superellipsoid");
	775	+ superButton.addActionListener(this);
	776	+
	777	+ if (Globals.ADVANCED)
	778	+ {
	779	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	780	+ kleinButton.setToolTipText("Create Klein bottle");
	781	+ kleinButton.addActionListener(this);
	782	+ }
	783	+
	784	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	785	+ particlesButton.setToolTipText("Create particle system");
	786	+ particlesButton.addActionListener(this);
	787	+
	788	+ oe.toolboxPanel.add(row1);
	789	+
	790	+ cGridBag row2 = new cGridBag();
	791	+
	792	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	793	+ groupButton.setToolTipText("Create group");
	794	+ groupButton.addActionListener(this);
	795	+
	796	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	797	+ compositeButton.setToolTipText("Create composite");
	798	+ compositeButton.addActionListener(this);
	799	+
	800	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	801	+ switchButton.setToolTipText("Create item switcher");
	802	+ switchButton.addActionListener(this);
	803	+
	804	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	805	+ loopButton.setToolTipText("Create loop");
	806	+ loopButton.addActionListener(this);
	807	+
	808	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	809	+ textureButton.setToolTipText("Create texture");
	810	+ textureButton.addActionListener(this);
	811	+
	812	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	813	+ overlayButton.setToolTipText("Create overlay");
	814	+ overlayButton.addActionListener(this);
	815	+
	816	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	817	+ lightButton.setToolTipText("Create light");
	818	+ lightButton.addActionListener(this);
	819	+
	820	+ oe.toolboxPanel.add(row2);
	821	+
	822	+ // ENVYMAPS
	823	+ cGridBag row3 = new cGridBag();
	824	+ row3.preferredHeight = 20;
	825	+
	826	+ AddSkyboxButton("default", "rgb", row3);
	827	+ AddSkyboxButton("default", "cornell", row3);
	828	+ AddSkyboxButton("default", "uffizi", row3);
	829	+ AddSkyboxButton("default", "CloudyHills", row3);
	830	+ AddSkyboxButton("default", "skycube", row3);
	831	+
	832	+ oe.toolboxPanel.add(row3);
	833	+
	834	+ cGridBag row4 = new cGridBag();
	835	+ row4.preferredHeight = 20;
	836	+
	837	+ AddSkyboxButton("bridge", "Bridge2", row4);
	838	+ AddSkyboxButton("urban", "GamlaStan2", row4);
	839	+ AddSkyboxButton("urban", "Parliament", row4);
	840	+ AddSkyboxButton("urban", "Roundabout", row4);
	841	+
	842	+ oe.toolboxPanel.add(row4);
	843	+
	844	+ cGridBag row5 = new cGridBag();
	845	+ row5.preferredHeight = 20;
	846	+
	847	+ AddSkyboxButton("urban", "SaintLazarusChurch", row5);
	848	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row5);
	849	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row5);
	850	+ AddSkyboxButton("urban", "UnionSquare", row5);
	851	+
	852	+ oe.toolboxPanel.add(row5);
	853	+
	854	+ cGridBag row6 = new cGridBag();
	855	+ row6.preferredHeight = 20;
	856	+
	857	+ AddSkyboxButton("park", "BerzeliiPark", row6);
	858	+ AddSkyboxButton("park", "Buddha", row6);
	859	+ AddSkyboxButton("park", "CNTower2", row6);
	860	+ //AddSkyboxButton("park", "Fatbursparken", row6);
	861	+ AddSkyboxButton("park", "NiagaraFalls1", row6);
	862	+
	863	+ oe.toolboxPanel.add(row6);
	864	+
	865	+ cGridBag row7 = new cGridBag();
	866	+ row7.preferredHeight = 20;
	867	+
	868	+ AddSkyboxButton("park", "NiagaraFalls3", row7);
	869	+ AddSkyboxButton("park", "Park", row7);
	870	+ //AddSkyboxButton("park", "Park2", row6);
	871	+ //AddSkyboxButton("park", "Path", row6);
	872	+ AddSkyboxButton("park", "Pond", row7);
	873	+ AddSkyboxButton("park", "Skansen", row7);
	874	+
	875	+ oe.toolboxPanel.add(row7);
	876	+
	877	+ cGridBag row8 = new cGridBag();
	878	+ row8.preferredHeight = 20;
	879	+
	880	+ AddSkyboxButton("park", "Skansen2", row8);
	881	+ AddSkyboxButton("park", "Skansen3", row8);
	882	+ AddSkyboxButton("park", "Skansen4", row8);
	883	+ AddSkyboxButton("park", "Skansen5", row8);
	884	+
	885	+ oe.toolboxPanel.add(row8);
	886	+
	887	+ cGridBag row9 = new cGridBag();
	888	+ row9.preferredHeight = 20;
	889	+
	890	+ AddSkyboxButton("park", "Stairs", row9);
	891	+ //AddSkyboxButton("park", "Tantolunden", row6);
	892	+ //AddSkyboxButton("park", "Tantolunden3", row6);
	893	+ AddSkyboxButton("park", "Tantolunden4", row9);
	894	+
	895	+ oe.toolboxPanel.add(row9);
	896	+/*
	897	+BerzeliiPark
	898	+Buddha
	899	+CNTower2
	900	+Fatbursparken
	901	+NiagaraFalls1
	902	+NiagaraFalls3
	903	+Park
	904	+Park2
	905	+Path
	906	+Pond
	907	+Skansen
	908	+Skansen2
	909	+Skansen3
	910	+Skansen4
	911	+Skansen5
	912	+Stairs
	913	+Tantolunden
	914	+Tantolunden3
	915	+Tantolunden4
	916	+ */
	917	+
	918	+ for (int i=1; --i>=0;)
	919	+ {
	920	+ //oe.toolboxPanel.Return();
	921	+ oe.toolboxPanel.add(new cGridBag());
	922	+ }
	923	+
	924	+ // EDIT panel
	925	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	926	+ editButton.setToolTipText("Pin selection controls");
	927	+ editButton.addActionListener(this);
	928	+
	929	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	930	+ uneditButton.setToolTipText("Remove selection controls");
517	931	uneditButton.addActionListener(this);
518	932
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);
	933	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	934	+ allParamsButton.setToolTipText("Show all controle");
531	935	allParamsButton.addActionListener(this);
532	936
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);
	937	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	938	+ clearPanelButton.setToolTipText("Clear edit panel");
	939	+ clearPanelButton.addActionListener(this);
	940	+
	941	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	942	+ unselectButton.setToolTipText("Unselect");
538	943	unselectButton.addActionListener(this);
539	944
	945	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	946	+ flashSelectionButton.setToolTipText("Highlight selection");
	947	+ flashSelectionButton.addActionListener(this);
	948	+
	949	+ editCommandsPanel.preferredHeight = 1;
	950	+
	951	+ SetPinStates(false);
	952	+// oe.treePanel.add(commandsPanel);
	953	+// oe.treePanel.Return();
	954	+
540	955	// oe.aConstraints.gridx += 1;
541	956	// oe.aConstraints.weighty = 0;
542	957	// oe.aConstraints.gridwidth = 1;
..	..	@@ -548,47 +963,32 @@
548	963	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
549	964	// gcButton.addActionListener(this);
550	965
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;
	966	+ cGridBag jSPPanel = new cGridBag();
	967	+
	968	+ JScrollPane jSP;
562	969	//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);
	970	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
564	971	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	972
	973	+ oe.treePanel.add(jSPPanel);
	974	+ oe.treePanel.Return();
	975	+
	976	+ oe.treePanel.add(copyOptionsPanel);
	977	+ oe.treePanel.Return();
	978	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	979	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	980	+ sliderPane.preferredHeight = 1;
	981	+
	982	+// mainPanel.setDividerLocation(0.1); //1.0);
	983	+ mainPanel.setResizeWeight(0.4);
	984	+
585	985	//jList.addListSelectionListener(this);
586	986	oe.jTree.addTreeSelectionListener(this);
587	987	//jTree.setRootVisible(false);
588	988	//jTree.setEditable(true);
589	989	oe.jTree.setDragEnabled(true);
590	990	//jTree.setPreferredSize(new Dimension(10,10));
591		- jSP.setPreferredSize(new Dimension(100,200));
	991	+ //jSP.setPreferredSize(new Dimension(100,200));
592	992
593	993	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
594	994
..	..	@@ -600,97 +1000,160 @@
600	1000	dgr.addDragGestureListener(this);
601	1001	}catch(Exception e) {}
602	1002	*/
603		- radio.layout = sevenButton;
	1003	+ radio.layout = sixButton; // sevenButton;
604	1004	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
605	1005	}
606	1006
607		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	1007	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
608	1008	{
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);
	1009	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1010	+ colorCB.setToolTipText("Copy color when dropped");
	1011	+ colorCB.addItemListener(this);
618	1012
619		- // constraints.gridy += 1;
	1013	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1014	+ materialCB.setToolTipText("Copy material when dropped");
	1015	+ materialCB.addItemListener(this);
	1016	+
	1017	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1018	+ textureCB.setToolTipText("Copy texture when dropped");
	1019	+ textureCB.addItemListener(this);
	1020	+
	1021	+ panel.Return();
	1022	+
	1023	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1024	+ boxCB.setToolTipText("Display bounding boxes");
	1025	+ boxCB.addItemListener(this);
	1026	+
	1027	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1028	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1029	+ zoomBoxCB.addItemListener(this);
	1030	+
	1031	+ if (true) // Globals.ADVANCED)
	1032	+ {
	1033	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1034	+// supportCB.setToolTipText("Enable rigging");
	1035	+// supportCB.addItemListener(this);
	1036	+
	1037	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1038	+ freezeCB.setToolTipText("Fast moving camera");
	1039	+ freezeCB.addItemListener(this);
	1040	+
620	1041	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
621	1042	// localCB.addItemListener(this);
622	1043
623		- constraints.gridy += 1;
624		- panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), constraints);
	1044	+ panel.Return();
	1045	+
	1046	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
625	1047	crowdCB.setToolTipText("Used for crowds");
626	1048	crowdCB.addItemListener(this);
627	1049
628		- constraints.gridy += 1;
629		- panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), constraints);
	1050	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
630	1051	smoothCB.setToolTipText("Snapping delay");
631	1052	smoothCB.addItemListener(this);
632	1053
633		- constraints.gridy += 1;
634		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), constraints);
	1054	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
635	1055	slowCB.setToolTipText("Smooth interpolation");
636	1056	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		-
	1057	+
646	1058	// constraints.gridy += 1;
647	1059	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
648	1060	// speakerMocapCB.addItemListener(this);
649	1061
	1062	+ panel.Return();
	1063	+
650	1064	if (false)
651	1065	{
652	1066	// handled in scripts
653		- constraints.gridy += 1;
654		- panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), constraints);
	1067	+ //constraints.gridy += 1;
	1068	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
655	1069	speakerCameraCB.addItemListener(this);
656	1070
657		- constraints.gridy += 1;
658		- panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), constraints);
	1071	+ //constraints.gridy += 1;
	1072	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
659	1073	speakerFocusCB.addItemListener(this);
660	1074
661		- constraints.gridy += 1;
662		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), constraints);
	1075	+ //constraints.gridy += 1;
	1076	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
663	1077	smoothfocusCB.addItemListener(this);
	1078	+ panel.Return();
664	1079	}
665	1080
666	1081	//constraints.gridx += 1;
667	1082	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
668	1083	// debugCB.addItemListener(this);
669	1084
670		- constraints.gridy += 1;
671		- panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), constraints);
	1085	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1086	+ trackCB.setToolTipText("Enable tracking target");
	1087	+ trackCB.addItemListener(this);
	1088	+
	1089	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1090	+ oeilCB.setToolTipText("Move camera when tracking");
672	1091	oeilCB.addItemListener(this);
673	1092
674		- constraints.gridy += 1;
675		- panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), constraints);
	1093	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1094	+ shadowCB.setToolTipText("When live compute shadows");
	1095	+ shadowCB.addItemListener(this);
	1096	+
	1097	+ panel.Return();
	1098	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1099	+ toggleTextureCB.setToolTipText("Load textures");
	1100	+ toggleTextureCB.addItemListener(this);
	1101	+
	1102	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1103	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1104	+ toggleSwitchCB.addItemListener(this);
	1105	+
	1106	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1107	+ autokeepCB.setToolTipText("On structure change");
	1108	+ autokeepCB.addItemListener(this);
	1109	+
	1110	+ panel.Return();
	1111	+ if (Globals.ADVANCED)
	1112	+ {
	1113	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
676	1114	lookAtCB.setToolTipText("Look-at target");
677	1115	lookAtCB.addItemListener(this);
	1116	+ }
	1117	+
	1118	+ }
	1119	+
	1120	+ cGridBag fill = new cGridBag();
	1121	+ fill.preferredHeight = 200;
	1122	+ cGridBag fill2 = new cGridBag();
	1123	+ fill2.preferredHeight = 200;
	1124	+ cGridBag fill3 = new cGridBag();
	1125	+ fill3.preferredHeight = 200;
	1126	+
	1127	+ panel.add(fill);
	1128	+ panel.add(fill2);
	1129	+ panel.add(fill3);
678	1130
679	1131	}
680	1132
681	1133	void EditObject(Object3D obj)
682	1134	{
683	1135	cRadio radioButton = new cRadio(obj.name);
	1136	+
	1137	+ // June 2019. Patch to avoid bug with transparency.
	1138	+ radioButton.hadMaterial = obj.material != null;
	1139	+ if (!radioButton.hadMaterial)
	1140	+ {
	1141	+ obj.material = new cMaterial();
	1142	+ }
	1143	+
684	1144	radioButton.SetObject(obj);
685		- radioButton.layout = sevenButton;
	1145	+ radioButton.layout = sixButton; // sevenButton;
686	1146	radioButton.SetCamera(cameraView.renderCamera, false);
687	1147	radioButton.addActionListener(this);
688	1148	radioPanel.add(radioButton);
689	1149	buttonGroup.add(radioButton);
690	1150	radioButton.doClick();
691	1151	}
	1152	+
692	1153	void SetupViews(ObjEditor oe)
693	1154	{
	1155	+ theFrame = this;
	1156	+
694	1157	oe.SetupViews();
695	1158
696	1159	System.out.println("SetupViews");
..	..	@@ -699,23 +1162,28 @@
699	1162	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
700	1163	}
701	1164
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;
	1165	+ cToggleButton liveCB;
	1166	+ cCheckBox supportCB;
	1167	+ cCheckBox localCB;
	1168	+ cCheckBox crowdCB;
	1169	+ cCheckBox smoothCB;
	1170	+ cToggleButton fastCB;
	1171	+ cCheckBox slowCB;
	1172	+ cCheckBox boxCB;
	1173	+ cCheckBox zoomBoxCB;
	1174	+ cCheckBox freezeCB;
	1175	+ //cToggleButton trackCB;
	1176	+ cCheckBox trackCB;
	1177	+ cCheckBox smoothfocusCB;
713	1178	// JCheckBox speakerMocapCB;
714		- JCheckBox speakerCameraCB;
715		- JCheckBox speakerFocusCB;
716		- JCheckBox debugCB;
717		- JCheckBox oeilCB;
718		- JCheckBox lookAtCB;
	1179	+ cCheckBox speakerCameraCB;
	1180	+ cCheckBox speakerFocusCB;
	1181	+ cCheckBox debugCB;
	1182	+
	1183	+ cCheckBox oeilCB;
	1184	+ cCheckBox shadowCB;
	1185	+ cCheckBox autokeepCB;
	1186	+ cCheckBox lookAtCB;
719	1187
720	1188	// static int COLOR = 1;
721	1189	// static int MATERIAL = 2;
..	..	@@ -723,9 +1191,9 @@
723	1191
724	1192	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
725	1193
726		- JCheckBox colorCB;
727		- JCheckBox materialCB;
728		- JCheckBox textureCB;
	1194	+ cCheckBox colorCB;
	1195	+ cCheckBox materialCB;
	1196	+ cCheckBox textureCB;
729	1197
730	1198	public void itemStateChanged(ItemEvent e)
731	1199	{
..	..	@@ -753,6 +1221,7 @@
753	1221	} else if(e.getSource() == liveCB)
754	1222	{
755	1223	cameraView.ToggleLive();
	1224	+ refreshContents(false);
756	1225	}
757	1226	else if(e.getSource() == supportCB)
758	1227	{
..	..	@@ -817,6 +1286,18 @@
817	1286	{
818	1287	cameraView.ToggleOeil();
819	1288	}
	1289	+ else if(e.getSource() == shadowCB)
	1290	+ {
	1291	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1292	+ }
	1293	+ else if(e.getSource() == freezeCB)
	1294	+ {
	1295	+ Globals.FREEZEONMOVE ^= true;
	1296	+ }
	1297	+ else if(e.getSource() == autokeepCB)
	1298	+ {
	1299	+ Globals.REPLACEONMAKE ^= true;
	1300	+ }
820	1301	else if(e.getSource() == lookAtCB)
821	1302	{
822	1303	cameraView.ToggleLookAt();
..	..	@@ -833,7 +1314,8 @@
833	1314
834	1315	/**/
835	1316	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
836		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1317	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1318	+ TreePath path = objEditor.jTree.getSelectionPath();
837	1319	if ((path == null) \|\| (path.getPathCount() <= 1)) {
838	1320	// We can't move the root node or an empty selection
839	1321	return;
..	..	@@ -896,8 +1378,6 @@
896	1378	}
897	1379	}
898	1380
899		- String string = (String) object;
900		-
901	1381	System.out.println("Transfer = " + object + "; drop : " + target);
902	1382	// if( object instanceof java.io.File[])
903	1383	// {
..	..	@@ -905,7 +1385,11 @@
905	1385	// objEditor.DropFile((java.io.File[]) object, true);
906	1386	// return;
907	1387	// }
908		- if (string.charAt(0) == '/')
	1388	+
	1389	+ String string = object.toString();
	1390	+
	1391	+ // File path for Mac and Windows
	1392	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
909	1393	{
910	1394	// file(s)
911	1395	String[] names = string.split("\n");
..	..	@@ -932,7 +1416,7 @@
932	1416
933	1417	flashIt = false;
934	1418	CameraPane pane = (CameraPane) target;
935		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1419	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
936	1420	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
937	1421
938	1422	if (group.selection.size() == 1)
..	..	@@ -948,23 +1432,33 @@
948	1432
949	1433	assert target == objEditor.jTree;
950	1434	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1435	+ Object3D destinationLeaf;
951	1436	try {
952		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1437	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
953	1438	} catch (Exception e) {
954	1439	System.out.println("destinationPath : " + destinationPath);
955	1440	return;
956	1441	}
957	1442
958		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1443	+ for (int i=group.selection.size(); --i>=0;)
959	1444	{
	1445	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1446	+
	1447	+ // Cannot move into itself
	1448	+ if (child == destinationLeaf)
	1449	+ return;
	1450	+ }
	1451	+
	1452	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1453	+// {
960	1454	loadClipboard(true);
961	1455	objEditor.jTree.setSelectionPath(destinationPath);
962		- pasteInto(false);
963		- } else {
964		- loadClipboard(false);
965		- objEditor.jTree.setSelectionPath(destinationPath);
966		- pasteInto(false); // true); // ???
967		- }
	1456	+ pasteInto(false, false);
	1457	+// } else {
	1458	+// loadClipboard(false);
	1459	+// objEditor.jTree.setSelectionPath(destinationPath);
	1460	+// pasteInto(false, false); // true); // ???
	1461	+// }
968	1462	}
969	1463	public void dropActionChanged(DropTargetDragEvent dtde)
970	1464	// Called if the user has modified the current drop gesture
..	..	@@ -1069,85 +1563,107 @@
1069	1563	{
1070	1564	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1071	1565	//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);
	1566	+// gridItem = menu.add(new MenuItem("Grid"));
	1567	+// gridItem.addActionListener(this);
	1568	+// rectoidItem = menu.add(new MenuItem("Box"));
	1569	+// rectoidItem.addActionListener(this);
	1570	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1571	+// ellipsoidItem.addActionListener(this);
	1572	+// coneItem = menu.add(new MenuItem("Cone"));
	1573	+// coneItem.addActionListener(this);
	1574	+// torusItem = menu.add(new MenuItem("Torus"));
	1575	+// torusItem.addActionListener(this);
	1576	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1577	+// superItem.addActionListener(this);
	1578	+
	1579	+ cameraItem = menu.add(new MenuItem("Camera"));
	1580	+ cameraItem.addActionListener(this);
	1581	+
	1582	+ if (!Globals.ADVANCED)
	1583	+ {
1084	1584	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1085	1585	kleinItem.addActionListener(this);
1086		- particleItem = menu.add(new MenuItem("Particle system"));
1087		- particleItem.addActionListener(this);
	1586	+ }
	1587	+
	1588	+// particleItem = menu.add(new MenuItem("Particle system"));
	1589	+// particleItem.addActionListener(this);
	1590	+ if (Globals.ADVANCED)
	1591	+ {
1088	1592	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1089	1593	ragdollItem.addActionListener(this);
1090	1594	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1091	1595	ragdoll2Item.addActionListener(this);
	1596	+ }
1092	1597	menu.add("-");
1093		- meshItem = menu.add(new MenuItem("Mesh"));
	1598	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1094	1599	meshItem.addActionListener(this);
1095	1600	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1096	1601	// meshGroupItem.addActionListener(this);
	1602	+ if (Globals.ADVANCED)
	1603	+ {
1097	1604	springItem = menu.add(new MenuItem("Spring"));
1098	1605	springItem.addActionListener(this);
1099	1606	flagItem = menu.add(new MenuItem("Flag"));
1100	1607	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	1608	blobItem = menu.add(new MenuItem("Blob"));
1106	1609	blobItem.addActionListener(this);
1107	1610	latheItem = menu.add(new MenuItem("Lathe"));
1108	1611	latheItem.addActionListener(this);
1109		- lightItem = menu.add(new MenuItem("Light"));
1110		- lightItem.addActionListener(this);
	1612	+ }
	1613	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1614	+ bezierItem.addActionListener(this);
	1615	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1616	+// overlayItem.addActionListener(this);
	1617	+// lightItem = menu.add(new MenuItem("Light"));
	1618	+// lightItem.addActionListener(this);
1111	1619	menu.add("-");
1112	1620	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1113	1621	//superLoopItem.addActionListener(this);
1114		- loopItem = menu.add(new MenuItem("Loop"));
1115		- loopItem.addActionListener(this);
	1622	+// loopItem = menu.add(new MenuItem("Loop"));
	1623	+// loopItem.addActionListener(this);
1116	1624	doubleItem = menu.add(new MenuItem("Fork"));
1117	1625	doubleItem.addActionListener(this);
	1626	+ if (Globals.ADVANCED)
	1627	+ {
1118	1628	tripleItem = menu.add(new MenuItem("Trident"));
1119	1629	tripleItem.addActionListener(this);
	1630	+ }
1120	1631	}
1121	1632
1122	1633	void buildToolsMenu(Menu menu)
1123	1634	{
1124	1635	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1125	1636	animationItem.addItemListener(this);
1126		- animationItem.setState(CameraPane.ANIMATION);
	1637	+ animationItem.setState(Globals.ANIMATION);
	1638	+
	1639	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1640	+ archiveItem.addActionListener(this);
1127	1641
1128	1642	menu.add("-");
1129	1643	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1130	1644	parseverticesItem.addActionListener(this);
1131	1645	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1132	1646	textureFieldItem.addActionListener(this);
1133		- alignItem = menu.add(new MenuItem("Align"));
	1647	+ alignItem = menu.add(new MenuItem("Align Objects"));
1134	1648	alignItem.addActionListener(this);
1135		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1136		- mirrorItem.addActionListener(this);
1137	1649	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1138	1650	reduceMorphItem.addActionListener(this);
1139	1651	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1140	1652	reduce34MorphItem.addActionListener(this);
1141		-
1142		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1143		- computeAOItem.addActionListener(this);
1144	1653	menu.add("-");
1145		-
1146	1654	menu.add(memoryItem = new MenuItem("Memory Usage"));
1147	1655	memoryItem.addActionListener(this);
	1656	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	1657	+ computeAOItem.addActionListener(this);
	1658	+
	1659	+ if (Globals.ADVANCED)
	1660	+ {
	1661	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1662	+ mirrorItem.addActionListener(this);
	1663	+ menu.add("-");
1148	1664	menu.add(analyzeItem = new MenuItem("Analyze"));
1149	1665	analyzeItem.addActionListener(this);
1150		- menu.add(dumpItem = new MenuItem("Dump"));
	1666	+ menu.add(dumpItem = new MenuItem("Print"));
1151	1667	dumpItem.addActionListener(this);
1152	1668	// menu.add(pathItem = new MenuItem("From-to path"));
1153	1669	// pathItem.addActionListener(this);
..	..	@@ -1165,6 +1681,7 @@
1165	1681	menu.add("-");
1166	1682	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1167	1683	editScriptItem.addActionListener(this);
	1684	+ }
1168	1685	}
1169	1686
1170	1687	void ScreenFit()
..	..	@@ -1287,9 +1804,34 @@
1287	1804	shadow.material = new cMaterial(obj.material);
1288	1805	shadow.material.diffuse = 0.0001f;
1289	1806	shadow.material.specular = 0.0001f;
	1807	+ //shadow.projectedVertices[1].x = 300;
1290	1808
1291	1809	makeSomething(shadow);
1292	1810	}
	1811	+
	1812	+ private void ClearUnpinned()
	1813	+ {
	1814	+ //for (Object3D obj : listUI)
	1815	+ for (int i=listUI.size(); --i>=0;)
	1816	+ {
	1817	+ Object3D obj = listUI.elementAt(i);
	1818	+ if (!obj.pinned)
	1819	+ {
	1820	+ obj.CloseUI();
	1821	+ listUI.remove(i);
	1822	+ }
	1823	+ }
	1824	+ }
	1825	+
	1826	+ private void EditElement(Object3D elem, boolean newWindow)
	1827	+ {
	1828	+ // if (!(elem instanceof Composite))
	1829	+ // newWindow = false;
	1830	+ listUI.add(elem);
	1831	+ elem.openEditWindow(this, newWindow); //, false);
	1832	+ System.out.println("edit : " + elem);
	1833	+ elem.editWindow.refreshContents(true); // ? new
	1834	+ }
1293	1835
1294	1836	/**
1295	1837	* applyExample
..	..	@@ -1493,9 +2035,9 @@
1493	2035
1494	2036	void Overwrite(int mask)
1495	2037	{
1496		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2038	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1497	2039	{
1498		- Object3D content = GrafreeD.clipboard.get(0);
	2040	+ Object3D content = Grafreed.clipboard.get(0);
1499	2041
1500	2042	if (content instanceof cGroup && ((cGroup)content).transientlink )
1501	2043	content = ((cGroup)content).get(0);
..	..	@@ -1534,7 +2076,7 @@
1534	2076	{
1535	2077	ScreenFit();
1536	2078	} else
1537		- if (source == switchItem)
	2079	+ if (source == switchViewItem)
1538	2080	{
1539	2081	cVector v1 = new cVector();
1540	2082	cVector v2 = new cVector();
..	..	@@ -1543,11 +2085,11 @@
1543	2085	objEditor.cameraView.renderCamera.setAim(v2, v1);
1544	2086	objEditor.cameraView.repaint();
1545	2087	} else
1546		- if (source == rectoidItem)
	2088	+ if (source == rectoidItem \|\| source == boxButton)
1547	2089	{
1548	2090	makeSomething(new Box());
1549	2091	} else
1550		- if (source == particleItem)
	2092	+ if (source == particleItem \|\| source == particlesButton)
1551	2093	{
1552	2094	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1553	2095	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1626,27 +2168,27 @@
1626	2168
1627	2169	makeSomething(obj);
1628	2170	} else
1629		- if (source == gridItem)
	2171	+ if (source == gridItem \|\| source == gridButton)
1630	2172	{
1631	2173	makeSomething(new Grid());
1632	2174	} else
1633		- if (source == ellipsoidItem)
	2175	+ if (source == ellipsoidItem \|\| source == sphereButton)
1634	2176	{
1635	2177	makeSomething(new Sphere());
1636	2178	} else
1637		- if (source == coneItem)
	2179	+ if (source == coneItem \|\| source == coneButton)
1638	2180	{
1639	2181	makeSomething(new Cone());
1640	2182	} else
1641		- if (source == torusItem)
	2183	+ if (source == torusItem \|\| source == torusButton)
1642	2184	{
1643	2185	makeSomething(new Torus());
1644	2186	} else
1645		- if (source == superItem)
	2187	+ if (source == superItem \|\| source == superButton)
1646	2188	{
1647	2189	makeSomething(new Superellipsoid());
1648	2190	} else
1649		- if (source == kleinItem)
	2191	+ if (source == kleinItem \|\| source == kleinButton)
1650	2192	{
1651	2193	makeSomething(new Klein());
1652	2194	} else
..	..	@@ -1666,7 +2208,7 @@
1666	2208	{
1667	2209	makeSomething(new BezierSurface());
1668	2210	} else
1669		- if (source == checkerItem)
	2211	+ if (source == overlayItem \|\| source == overlayButton)
1670	2212	{
1671	2213	/*
1672	2214	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1714,10 +2256,27 @@
1714	2256	s.setup();
1715	2257	makeSomething(s);
1716	2258	} else
1717		- if (source == lightItem)
	2259	+ if (source == lightItem \|\| source == lightButton)
1718	2260	{
1719	2261	makeSomething(new Light());
1720	2262	} else
	2263	+// if (source == skybox1Button \|\|
	2264	+// source == skybox2Button \|\|
	2265	+// source == skybox3Button \|\|
	2266	+// source == skybox4Button \|\|
	2267	+// source == skybox5Button \|\|
	2268	+// source == skybox6Button \|\|
	2269	+// source == skybox7Button \|\|
	2270	+// source == skybox11Button \|\|
	2271	+// source == skybox12Button \|\|
	2272	+// source == skybox13Button \|\|
	2273	+// source == skybox14Button \|\|
	2274	+// source == skybox15Button \|\|
	2275	+// source == skybox16Button \|\|
	2276	+// source == skybox17Button)
	2277	+// {
	2278	+// ChangeSkybox(source);
	2279	+// } else
1721	2280	if (source == csgItem)
1722	2281	{
1723	2282	group(new CSG());
..	..	@@ -1764,30 +2323,30 @@
1764	2323
1765	2324	group(g);
1766	2325	} else
1767		- if (source == loopItem)
	2326	+ if (source == loopItem \|\| source == loopButton)
1768	2327	{
1769	2328	Composite csg = new GroupLeaf();
1770	2329	csg.count = 5;
1771	2330	group(csg);
1772		- Composite child = new cGroup();
	2331	+ Composite child = new cGroup("Branch");
1773	2332	csg.addChild(child);
1774	2333	child.addChild(csg);
1775	2334	} else
1776	2335	if (source == doubleItem)
1777	2336	{
1778		- Composite csg = new GroupLeaf();
	2337	+ Composite csg = new GroupLeaf("Fork");
1779	2338	csg.count = 5;
1780	2339	group(csg);
1781		- Composite child = new cGroup();
	2340	+ Composite child = new cGroup("Branch A");
1782	2341	csg.addChild(child);
1783	2342	child.addChild(csg);
1784		- child = new cGroup();
	2343	+ child = new cGroup("Branch B");
1785	2344	csg.addChild(child);
1786	2345	child.addChild(csg);
1787	2346	} else
1788	2347	if (source == tripleItem)
1789	2348	{
1790		- Composite csg = new GroupLeaf();
	2349	+ Composite csg = new GroupLeaf("Trident");
1791	2350	csg.count = 4;
1792	2351	group(csg);
1793	2352	Composite child = new cGroup();
..	..	@@ -1800,27 +2359,10 @@
1800	2359	csg.addChild(child);
1801	2360	child.addChild(csg);
1802	2361	} 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		- } else
1820	2362	if (source == computeAOItem)
1821	2363	{
1822	2364	Globals.drawMode = CameraPane.OCCLUSION;
1823		- Globals.theRenderer.repaint();
	2365	+ cameraView.repaint();
1824	2366	} else
1825	2367	if (source == recompileItem)
1826	2368	{
..	..	@@ -1835,7 +2377,7 @@
1835	2377	if (source == invariantsItem)
1836	2378	{
1837	2379	System.out.println("Invariants:");
1838		- GrafreeD.grafreeD.universe.invariants();
	2380	+ Grafreed.grafreeD.universe.invariants();
1839	2381	} else
1840	2382	if (source == memoryItem)
1841	2383	{
..	..	@@ -1854,19 +2396,61 @@
1854	2396	{
1855	2397	DumpObject();
1856	2398	} else
	2399	+ if (source == minButton)
	2400	+ {
	2401	+ Minimize();
	2402	+ } else
	2403	+ if (source == maxButton)
	2404	+ {
	2405	+ Maximize();
	2406	+ } else
	2407	+ if (source == fullButton)
	2408	+ {
	2409	+ ToggleFullScreen();
	2410	+ } else
	2411	+ if (source == undoButton)
	2412	+ {
	2413	+ // Go to previous version
	2414	+ //if (!Undo())
	2415	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2416	+ Undo();
	2417	+ } else
	2418	+ if (source == restoreButton)
	2419	+ {
	2420	+ // Restore current version
	2421	+ Restore();
	2422	+ } else
	2423	+ if (source == replaceButton)
	2424	+ {
	2425	+ // Overwrite current version
	2426	+ Replace();
	2427	+ } else
	2428	+ if (source == redoButton)
	2429	+ {
	2430	+ // Go to next version
	2431	+ Redo();
	2432	+ } else
	2433	+ if (source == saveButton)
	2434	+ {
	2435	+ // Save a new version
	2436	+ if (!Save(true))
	2437	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2438	+ } else
	2439	+ if (source == oneStepButton)
	2440	+ {
	2441	+ Globals.ONESTEP = true;
	2442	+ cameraView.repaint();
	2443	+ } else
1857	2444	if (source == screenfitButton)
1858	2445	{
1859		- //Reload(lastConverter, lastFilename, true);
1860	2446	ScreenFit();
1861	2447	} else
1862	2448	if (source == screenfitpointButton)
1863	2449	{
1864		- //Reload(lastConverter, lastFilename, true);
1865	2450	ScreenFitPoint();
1866	2451	} else
1867	2452	if (source == snapobjectButton)
1868	2453	{
1869		- //Reload(lastConverter, lastFilename, true);
1870	2454	SnapObject();
1871	2455	} else
1872	2456	// if (event.getSource() == recompileButton)
..	..	@@ -1903,12 +2487,20 @@
1903	2487	{
1904	2488	loadClipboard(true);
1905	2489	} else
	2490	+ if (source == undoItem)
	2491	+ {
	2492	+ Undo();
	2493	+ } else
	2494	+ if (source == redoItem)
	2495	+ {
	2496	+ Redo();
	2497	+ } else
1906	2498	if (source == duplicateItem)
1907	2499	{
1908		- Object3D keep = GrafreeD.clipboard;
	2500	+ Object3D keep = Grafreed.clipboard;
1909	2501	loadClipboard(false);
1910	2502	paste(false);
1911		- GrafreeD.clipboard = keep;
	2503	+ Grafreed.clipboard = keep;
1912	2504	} else
1913	2505	if (source == cloneItem)
1914	2506	{
..	..	@@ -1926,13 +2518,17 @@
1926	2518	{
1927	2519	paste(false);
1928	2520	} else
	2521	+ if (source == pasteIntoItem)
	2522	+ {
	2523	+ pasteInto(true, false);
	2524	+ } else
1929	2525	if (source == pasteLinkItem)
1930	2526	{
1931		- pasteInto(false);
	2527	+ pasteInto(false, false);
1932	2528	} else
1933	2529	if (source == pasteCloneItem)
1934	2530	{
1935		- pasteInto(true);
	2531	+ pasteInto(true, true);
1936	2532	} else
1937	2533	if (source == pasteExpandItem)
1938	2534	{
..	..	@@ -2124,9 +2720,9 @@
2124	2720	// group.selection.get(0).setMasterThis(content); // should be identity
2125	2721	// refreshContents();
2126	2722	// }
2127		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2723	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2128	2724	{
2129		- Object3D content = GrafreeD.clipboard.get(0);
	2725	+ Object3D content = Grafreed.clipboard.get(0);
2130	2726
2131	2727	if (content instanceof cGroup && ((cGroup)content).transientlink )
2132	2728	content = ((cGroup)content).get(0);
..	..	@@ -2134,11 +2730,11 @@
2134	2730	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2135	2731	for (int i=0; i<group.selection.size(); i++)
2136	2732	{
2137		- boolean random = CameraPane.RANDOM;
2138		- CameraPane.RANDOM = false; // parse all random nodes
	2733	+ boolean random = CameraPane.SWITCH;
	2734	+ CameraPane.SWITCH = false; // parse all random nodes
2139	2735	group.selection.get(i).linkVerticesThis(content);
2140	2736	// group.selection.get(i).setMasterThis(content); // should be identity
2141		- CameraPane.RANDOM = random;
	2737	+ CameraPane.SWITCH = random;
2142	2738	}
2143	2739	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2144	2740	refreshContents();
..	..	@@ -2148,20 +2744,20 @@
2148	2744	{
2149	2745	for (int i=0; i<group.selection.size(); i++)
2150	2746	{
2151		- boolean random = CameraPane.RANDOM;
2152		- CameraPane.RANDOM = false; // parse all random nodes
	2747	+ boolean random = CameraPane.SWITCH;
	2748	+ CameraPane.SWITCH = false; // parse all random nodes
2153	2749	group.selection.get(i).linkVerticesThis(null);
2154		- CameraPane.RANDOM = random;
	2750	+ CameraPane.SWITCH = random;
2155	2751	}
2156	2752
2157	2753	refreshContents();
2158	2754	} else
2159	2755	if (source == relinkverticesItem)
2160	2756	{
2161		- boolean random = CameraPane.RANDOM;
2162		- CameraPane.RANDOM = false; // parse all random nodes
	2757	+ boolean random = CameraPane.SWITCH;
	2758	+ CameraPane.SWITCH = false; // parse all random nodes
2163	2759	group.selection.RelinkToSupport();
2164		- CameraPane.RANDOM = random;
	2760	+ CameraPane.SWITCH = random;
2165	2761
2166	2762	refreshContents();
2167	2763	} else
..	..	@@ -2176,9 +2772,9 @@
2176	2772	} else
2177	2773	if (source == setMasterItem)
2178	2774	{
2179		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2775	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2180	2776	{
2181		- Object3D content = GrafreeD.clipboard.get(0);
	2777	+ Object3D content = Grafreed.clipboard.get(0);
2182	2778
2183	2779	if (content instanceof cGroup && ((cGroup)content).transientlink )
2184	2780	content = ((cGroup)content).get(0);
..	..	@@ -2191,9 +2787,9 @@
2191	2787	{
2192	2788	if (group.selection.size() == 1)
2193	2789	{
2194		- if (GrafreeD.clipboard.size() == 1)
	2790	+ if (Grafreed.clipboard.size() == 1)
2195	2791	{
2196		- Object3D content = GrafreeD.clipboard.get(0);
	2792	+ Object3D content = Grafreed.clipboard.get(0);
2197	2793
2198	2794	if (content instanceof cGroup && ((cGroup)content).transientlink )
2199	2795	content = ((cGroup)content).get(0);
..	..	@@ -2210,7 +2806,7 @@
2210	2806	{
2211	2807	RevertMeshes();
2212	2808	} else
2213		- if (source == resetMeshItem)
	2809	+ if (source == resetAllItem)
2214	2810	{
2215	2811	ResetAll();
2216	2812	} else
..	..	@@ -2218,7 +2814,7 @@
2218	2814	{
2219	2815	StepAll();
2220	2816	} else
2221		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2817	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2222	2818	{
2223	2819	//int indices[] = jList.getSelectedIndices();
2224	2820	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2230,9 +2826,9 @@
2230	2826	{
2231	2827	ClearSelection(true);
2232	2828	} else
2233		- if (source == grabItem)
	2829	+ if (source == grabItem \|\| source == groupButton)
2234	2830	{
2235		- group(new cGroup(), true);
	2831	+ group(new cGroup(), false); // true);
2236	2832	} else
2237	2833	if (source == hideItem)
2238	2834	{
..	..	@@ -2250,16 +2846,16 @@
2250	2846	{
2251	2847	makeSomething(new Camera());
2252	2848	} else
2253		- if (source == compositeItem)
	2849	+ if (source == compositeItem \|\| source == compositeButton)
2254	2850	{
2255	2851	group(new Composite());
2256	2852	} else
2257		- if (source == randomItem)
	2853	+ if (source == switchItem \|\| source == switchButton)
2258	2854	{
2259	2855	RandomNode random = new RandomNode();
2260	2856	group(random);
2261	2857	if (random.size() > 0)
2262		- random.name = random.get(0).name + "Rnd";
	2858	+ random.name = random.get(0).name + "Switch";
2263	2859	} else
2264	2860	if (source == physicsItem)
2265	2861	{
..	..	@@ -2356,7 +2952,7 @@
2356	2952	{
2357	2953	group(new cLinker());
2358	2954	} else
2359		- if (source == textureItem)
	2955	+ if (source == textureItem \|\| source == textureButton)
2360	2956	{
2361	2957	group(new TextureNode());
2362	2958	} else
..	..	@@ -2376,17 +2972,30 @@
2376	2972	{
2377	2973	CastShadow(2);
2378	2974	} else
2379		- if (source == ungroupItem)
	2975	+ if (source == ungroupItem \|\| source == ungroupButton)
2380	2976	{
2381		- //ungroup();
	2977	+ boolean hasRoot = false;
	2978	+
2382	2979	for (int i=0; i<group.selection.size(); i++)
2383	2980	{
2384		- Ungroup(group.selection.get(i));
	2981	+ if (group.selection.get(i) == group)
	2982	+ {
	2983	+ hasRoot = true;
	2984	+ break;
	2985	+ }
2385	2986	}
2386	2987
2387		- ClearSelection(false);
2388		-
2389		- refreshContents();
	2988	+ if (!hasRoot)
	2989	+ {
	2990	+ for (int i=0; i<group.selection.size(); i++)
	2991	+ {
	2992	+ Ungroup(group.selection.get(i));
	2993	+ }
	2994	+
	2995	+ ClearSelection(false);
	2996	+
	2997	+ refreshContents();
	2998	+ }
2390	2999	} else
2391	3000	if (source == genUVItem)
2392	3001	{
..	..	@@ -2398,7 +3007,7 @@
2398	3007	} else
2399	3008	if (source == genNormalsMESHItem)
2400	3009	{
2401		- GenNormals(true); // TODO
	3010	+ GenNormalsMESH();
2402	3011	} else
2403	3012	if (source == genNormalsORGANItem)
2404	3013	{
..	..	@@ -2463,6 +3072,22 @@
2463	3072	if (source == unmarkleavesItem)
2464	3073	{
2465	3074	MarkLeaves(false);
	3075	+ } else
	3076	+ if (source == rewindleavesItem)
	3077	+ {
	3078	+ RewindLeaves(true);
	3079	+ } else
	3080	+ if (source == unrewindleavesItem)
	3081	+ {
	3082	+ RewindLeaves(false);
	3083	+ } else
	3084	+ if (source == randomleavesItem)
	3085	+ {
	3086	+ RandomLeaves(true);
	3087	+ } else
	3088	+ if (source == unrandomleavesItem)
	3089	+ {
	3090	+ RandomLeaves(false);
2466	3091	} else
2467	3092	if (source == flipVItem)
2468	3093	{
..	..	@@ -2548,9 +3173,13 @@
2548	3173	{
2549	3174	SmoothMesh();
2550	3175	} else
2551		- if (source == transformgeometryItem)
	3176	+ if (source == transformGeometryItem)
2552	3177	{
2553	3178	TransformGeometry();
	3179	+ } else
	3180	+ if (source == transformChildrenItem)
	3181	+ {
	3182	+ TransformChildren();
2554	3183	} else
2555	3184	if (source == resetTransformItem)
2556	3185	{
..	..	@@ -2558,7 +3187,11 @@
2558	3187	} else
2559	3188	if (source == resetCentroidItem)
2560	3189	{
2561		- ResetCentroid();
	3190	+ ResetCentroid(true);
	3191	+ } else
	3192	+ if (source == resetCentroidXZItem)
	3193	+ {
	3194	+ ResetCentroid(false);
2562	3195	} else
2563	3196	if (source == resetParentItem)
2564	3197	{
..	..	@@ -2663,7 +3296,7 @@
2663	3296	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2664	3297	{
2665	3298	obj = (Object3D)e.nextElement();
2666		- obj.SetBumpTexture(null);
	3299	+ obj.ResetBumpTexture();
2667	3300	}
2668	3301
2669	3302	refreshContents();
..	..	@@ -2679,6 +3312,31 @@
2679	3312
2680	3313	refreshContents();
2681	3314	} else
	3315	+ if (source == embedTexturesItem)
	3316	+ {
	3317	+ Object3D obj;
	3318	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3319	+ {
	3320	+ obj = (Object3D)e.nextElement();
	3321	+ obj.EmbedTextures(true);
	3322	+ }
	3323	+
	3324	+ refreshContents();
	3325	+ } else
	3326	+ if (source == deEmbedTexturesItem)
	3327	+ {
	3328	+ Object3D obj;
	3329	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3330	+ {
	3331	+ obj = (Object3D)e.nextElement();
	3332	+ obj.EmbedTextures(false);
	3333	+ }
	3334	+
	3335	+ CameraPane.texturepigment.clear();
	3336	+ CameraPane.texturebump.clear();
	3337	+
	3338	+ refreshContents();
	3339	+ } else
2682	3340	if (source == flashSelectionButton)
2683	3341	{
2684	3342	CameraPane.flash = true;
..	..	@@ -2690,6 +3348,10 @@
2690	3348	if (source == twoButton)
2691	3349	{
2692	3350	radio.layout = twoButton;
	3351	+
	3352	+ if (CameraPane.FULLSCREEN)
	3353	+ fullscreenLayout = radio.layout;
	3354	+
2693	3355	// bug
2694	3356	//gridPanel.setDividerLocation(1.0);
2695	3357	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2722,10 +3384,31 @@
2722	3384	bigThree.ClearUI();
2723	3385	bigThree.add(centralPanel);
2724	3386	bigThree.FlushUI();
	3387	+
	3388	+ cameraView.requestFocusInWindow();
	3389	+
	3390	+// refreshContents(true);
	3391	+//
	3392	+// try
	3393	+// {
	3394	+// java.awt.Robot bot = new java.awt.Robot();
	3395	+// int mask = InputEvent.BUTTON1_MASK;
	3396	+// bot.mouseMove(100, 100);
	3397	+// bot.mousePress(mask);
	3398	+// bot.mouseRelease(mask);
	3399	+// }
	3400	+// catch (Exception e)
	3401	+// {
	3402	+//
	3403	+// }
	3404	+
2725	3405	} else
2726	3406	if (source == threeButton)
2727	3407	{
2728	3408	radio.layout = threeButton;
	3409	+
	3410	+ if (CameraPane.FULLSCREEN)
	3411	+ fullscreenLayout = radio.layout;
2729	3412
2730	3413	// bigThree.remove(scenePanel);
2731	3414	// bigThree.remove(centralPanel);
..	..	@@ -2755,13 +3438,18 @@
2755	3438	// centralPanel.setVisible(true);
2756	3439	// XYZPanel.setVisible(true);
2757	3440	bigThree.ClearUI();
	3441	+ bigThree.add(scenePanel);
2758	3442	bigThree.add(centralPanel);
2759		- bigThree.add(XYZPanel);
2760	3443	bigThree.FlushUI();
	3444	+
	3445	+ cameraView.requestFocusInWindow();
2761	3446	} else
2762	3447	if (source == fourButton)
2763	3448	{
2764	3449	radio.layout = fourButton;
	3450	+
	3451	+ if (CameraPane.FULLSCREEN)
	3452	+ fullscreenLayout = radio.layout;
2765	3453
2766	3454	// bigThree.remove(scenePanel);
2767	3455	// bigThree.remove(centralPanel);
..	..	@@ -2793,10 +3481,15 @@
2793	3481	bigThree.ClearUI();
2794	3482	bigThree.add(scenePanel);
2795	3483	bigThree.FlushUI();
	3484	+
	3485	+ cameraView.requestFocusInWindow();
2796	3486	} else
2797	3487	if (source == sixButton)
2798	3488	{
2799	3489	radio.layout = sixButton;
	3490	+
	3491	+ if (CameraPane.FULLSCREEN)
	3492	+ fullscreenLayout = radio.layout;
2800	3493
2801	3494	// bigThree.remove(scenePanel);
2802	3495	// bigThree.remove(centralPanel);
..	..	@@ -2826,13 +3519,18 @@
2826	3519	// centralPanel.setVisible(true);
2827	3520	// XYZPanel.setVisible(false);
2828	3521	bigThree.ClearUI();
2829		- bigThree.add(scenePanel);
2830	3522	bigThree.add(centralPanel);
	3523	+ bigThree.add(scenePanel);
2831	3524	bigThree.FlushUI();
	3525	+
	3526	+ cameraView.requestFocusInWindow();
2832	3527	} else
2833	3528	if (source == sevenButton)
2834	3529	{
2835	3530	radio.layout = sevenButton;
	3531	+
	3532	+ if (CameraPane.FULLSCREEN)
	3533	+ fullscreenLayout = radio.layout;
2836	3534
2837	3535	// bigThree.remove(scenePanel);
2838	3536	// bigThree.remove(centralPanel);
..	..	@@ -2866,6 +3564,8 @@
2866	3564	bigThree.add(centralPanel);
2867	3565	bigThree.add(XYZPanel);
2868	3566	bigThree.FlushUI();
	3567	+
	3568	+ cameraView.requestFocusInWindow();
2869	3569	} else
2870	3570	if (source == rootButton)
2871	3571	{
..	..	@@ -2877,6 +3577,7 @@
2877	3577	EditObject(obj);
2878	3578	}
2879	3579
	3580	+ cameraView.requestFocusInWindow();
2880	3581	refreshContents(true);
2881	3582	} else
2882	3583	if (source == closeButton)
..	..	@@ -2886,22 +3587,37 @@
2886	3587	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2887	3588	{
2888	3589	ab = (cRadio)e.nextElement();
2889		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3590	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2890	3591	{
	3592	+ // Patch to avoid bug with transparency.
	3593	+ if (!ab.hadMaterial)
	3594	+ {
	3595	+ ab.object.material = null;
	3596	+ }
	3597	+
2891	3598	buttonGroup.remove(ab);
2892	3599	radioPanel.remove(ab);
2893	3600
2894		- ab.GetObject().editWindow = null;
	3601	+ //ab.GetObject().editWindow = null;
	3602	+ ab.GetObject().manipWindow = null;
2895	3603	// ab.GetObject().objectUI = null; // ?????????
2896	3604
2897	3605	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2898	3606	break;
2899	3607	}
2900	3608	}
	3609	+
	3610	+ cameraView.requestFocusInWindow();
2901	3611	refreshContents(true);
2902	3612	} else
2903	3613	if (source == editItem \|\| source == editButton)
2904	3614	{
	3615	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3616	+ {
	3617	+ Object3D child = (Object3D)e.nextElement();
	3618	+ child.pinned = true;
	3619	+ }
	3620	+
2905	3621	EditSelection(false);
2906	3622	} else
2907	3623	if (source == uneditButton)
..	..	@@ -2911,12 +3627,13 @@
2911	3627	Object3D child = (Object3D)e.nextElement();
2912	3628	if(child.editWindow != null)
2913	3629	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3630	+ child.pinned = false;
2914	3631	child.CloseUI();
2915	3632	listUI.remove(child);
2916	3633
2917		- child.editWindow = null; // ???????????
	3634	+ //child.editWindow = null; // ???????????
2918	3635	}
2919		- objEditor.ctrlPanel.revalidate();
	3636	+ objEditor.ctrlPanel.FlushUI();
2920	3637	//objEditor.jTree.clearSelection();
2921	3638	//objEditor.ResetSliders();
2922	3639	refreshContents(true);
..	..	@@ -2927,6 +3644,7 @@
2927	3644	//copy.ClearUI();
2928	3645	for (Object3D obj : listUI)
2929	3646	{
	3647	+ obj.pinned = false;
2930	3648	obj.CloseUI();
2931	3649	}
2932	3650	listUI.clear();
..	..	@@ -2936,7 +3654,7 @@
2936	3654	{
2937	3655	assert(copy == group);
2938	3656
2939		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3657	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2940	3658
2941	3659	for (Object3D obj : listUI)
2942	3660	{
..	..	@@ -2985,6 +3703,9 @@
2985	3703	}
2986	3704
2987	3705	copy = group;
	3706	+
	3707	+ SetUndoStates();
	3708	+
2988	3709	//Globals.theRenderer.object = group;
2989	3710	if(!useclient)
2990	3711	{
..	..	@@ -3000,20 +3721,46 @@
3000	3721	frontView.object = group;
3001	3722	sideView.object = group;
3002	3723	}
3003		- group.editWindow = this;
	3724	+
	3725	+// fix "+" issue
	3726	+ //group.editWindow = this;
	3727	+ group.manipWindow = this;
	3728	+
3004	3729	/*
3005	3730	currentLayout = radio.layout;
3006	3731	if (currentLayout == null)
3007	3732	currentLayout = sevenButton;
3008	3733	*/
3009	3734	radio.layout.doClick();
	3735	+
	3736	+ ClearUnpinned();
	3737	+ //Grafreed.Assert(group != null);
	3738	+ //Grafreed.Assert(group.selection != null);
	3739	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3740	+ if (group.selection == null \|\| group.selection.size() == 1)
	3741	+ EditSelection(false);
3010	3742	keepparent = group.parent;
3011	3743	// PARENT = NULL or not???
3012	3744	//group.parent = null; // ROOT
3013	3745	//group.attributes = -1;
3014	3746	ResetModel();
	3747	+
	3748	+ cameraView.requestFocusInWindow();
3015	3749	refreshContents(true);
3016		- }
	3750	+ } else if (event.getSource() == editCameraItem)
	3751	+ {
	3752	+ cameraView.ProtectCamera();
	3753	+ cameraView.repaint();
	3754	+ return;
	3755	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3756	+ {
	3757	+ cameraView.RevertCamera();
	3758	+ cameraView.repaint();
	3759	+ return;
	3760	+ // } else if (event.getSource() == textureButton)
	3761	+ // {
	3762	+ // return; // true;
	3763	+ }
3017	3764	else
3018	3765	{
3019	3766	//return super.action(event, arg);
..	..	@@ -3022,7 +3769,6 @@
3022	3769	}
3023	3770
3024	3771	boolean useclient = false;
3025		- cRadio radio;
3026	3772
3027	3773	void ToggleRoot()
3028	3774	{
..	..	@@ -3074,6 +3820,28 @@
3074	3820	refreshContents();
3075	3821	}
3076	3822
	3823	+ void TransformChildren()
	3824	+ {
	3825	+ Object3D obj;
	3826	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3827	+ {
	3828	+ obj = (Object3D)e.nextElement();
	3829	+ obj.KeepTextureMatrices();
	3830	+ obj.TransformChildren();
	3831	+ obj.RestoreTextureMatrices();
	3832	+
	3833	+// if (obj.parent == null)
	3834	+// {
	3835	+// System.out.println("NULL PARENT!");
	3836	+// new Exception().printStackTrace();
	3837	+// }
	3838	+// else
	3839	+// TouchTransform(obj);
	3840	+// //obj.parent.Touch();
	3841	+ }
	3842	+
	3843	+ refreshContents();
	3844	+ }
3077	3845
3078	3846	void ResetTransform()
3079	3847	{
..	..	@@ -3186,7 +3954,7 @@
3186	3954	refreshContents();
3187	3955	}
3188	3956
3189		- void ResetCentroid()
	3957	+ void ResetCentroid(boolean full)
3190	3958	{
3191	3959	Object3D obj;
3192	3960	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3201,12 +3969,16 @@
3201	3969	LA.matIdentity(Object3D.mat);
3202	3970	obj.getBounds(minima, maxima, false);
3203	3971	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3204		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3972	+ if (full)
	3973	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3205	3974	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3206	3975	obj.TransformMesh(Object3D.mat);
	3976	+
3207	3977	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3208		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3978	+ if (full)
	3979	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3209	3980	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3981	+
3210	3982	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3211	3983	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3212	3984	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3235,7 +4007,8 @@
3235	4007
3236	4008	int size = obj.MemorySize();
3237	4009
3238		- System.err.println((size/1024) + " KB is the size of " + obj);
	4010	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4011	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3239	4012	}
3240	4013	}
3241	4014	catch (Exception e)
..	..	@@ -3272,9 +4045,9 @@
3272	4045	obj = (Object3D)e.nextElement();
3273	4046
3274	4047	System.out.println("Object is: " + obj);
3275		- GrafreeD.AnalyzeObject(obj);
	4048	+ Grafreed.AnalyzeObject(obj);
3276	4049	System.out.println("Boundary rep: " + obj.bRep);
3277		- GrafreeD.AnalyzeObject(obj.bRep);
	4050	+ Grafreed.AnalyzeObject(obj.bRep);
3278	4051
3279	4052	// System.err.println((size/1024) + " KB is the size of " + obj);
3280	4053	}
..	..	@@ -3316,6 +4089,13 @@
3316	4089	void GenNormals(boolean crease)
3317	4090	{
3318	4091	group.GenNormalsS(crease);
	4092	+
	4093	+ refreshContents();
	4094	+ }
	4095	+
	4096	+ void GenNormalsMESH()
	4097	+ {
	4098	+ group.GenNormalsMeshS();
3319	4099
3320	4100	refreshContents();
3321	4101	}
..	..	@@ -3488,8 +4268,8 @@
3488	4268
3489	4269	void ParseVertices()
3490	4270	{
3491		- boolean epsequal = GrafreeD.epsequal;
3492		- GrafreeD.epsequal = true;
	4271	+ boolean epsequal = Grafreed.epsequal;
	4272	+ Grafreed.epsequal = true;
3493	4273
3494	4274	for (int i=0; i<group.selection.size(); i++)
3495	4275	{
..	..	@@ -3514,7 +4294,7 @@
3514	4294	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3515	4295	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3516	4296
3517		- g.add(GrafreeD.clipboard);
	4297	+ g.add(Grafreed.clipboard);
3518	4298
3519	4299	buffer.add(g);
3520	4300	}
..	..	@@ -3529,7 +4309,7 @@
3529	4309	makeSomething(buffer, i==group.selection.size()-1);
3530	4310	}
3531	4311
3532		- GrafreeD.epsequal = epsequal;
	4312	+ Grafreed.epsequal = epsequal;
3533	4313
3534	4314	refreshContents();
3535	4315	}
..	..	@@ -3547,7 +4327,16 @@
3547	4327	String pigment = Object3D.GetPigment(tex);
3548	4328	//String bump = Object3D.GetBump(tex);
3549	4329
3550		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4330	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4331	+
	4332	+ try
	4333	+ {
	4334	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4335	+ }
	4336	+ catch (Exception e)
	4337	+ {
	4338	+ System.err.println("FAIL: " + node);
	4339	+ }
3551	4340
3552	4341	double s = v.s;
3553	4342
..	..	@@ -3635,11 +4424,11 @@
3635	4424
3636	4425	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3637	4426
3638		- boolean random = CameraPane.RANDOM;
3639		- CameraPane.RANDOM = false; // parse all random nodes
	4427	+ boolean random = CameraPane.SWITCH;
	4428	+ CameraPane.SWITCH = false; // parse all random nodes
3640	4429	lowres.linkVerticesThis(null);
3641	4430	lowres.linkVerticesThis(sn);
3642		- CameraPane.RANDOM = random;
	4431	+ CameraPane.SWITCH = random;
3643	4432
3644	4433	System.err.flush();
3645	4434
..	..	@@ -3679,7 +4468,7 @@
3679	4468	return;
3680	4469
3681	4470	Object3D poses = group.selection.get(0);
3682		- Object3D ref = GrafreeD.clipboard.get(0);
	4471	+ Object3D ref = Grafreed.clipboard.get(0);
3683	4472
3684	4473	Object3D newgroup = new Object3D("Po:" + poses.name);
3685	4474
..	..	@@ -3873,9 +4662,9 @@
3873	4662
3874	4663	void ClipMesh()
3875	4664	{
3876		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4665	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3877	4666	{
3878		- Object3D content = GrafreeD.clipboard.get(0);
	4667	+ Object3D content = Grafreed.clipboard.get(0);
3879	4668
3880	4669	if (content instanceof cGroup && ((cGroup)content).transientlink )
3881	4670	content = ((cGroup)content).get(0);
..	..	@@ -3884,7 +4673,7 @@
3884	4673	// {
3885	4674	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3886	4675	// }
3887		- group.selection.ClipMesh(GrafreeD.clipboard);
	4676	+ group.selection.ClipMesh(Grafreed.clipboard);
3888	4677	}
3889	4678	// group.selection.ClipMesh(GrafreeD.clipboard);
3890	4679	System.out.println("DONE.");
..	..	@@ -3931,6 +4720,18 @@
3931	4720	void MarkLeaves(boolean hide)
3932	4721	{
3933	4722	group.selection.MarkLeaves(hide);
	4723	+ refreshContents();
	4724	+ }
	4725	+
	4726	+ void RewindLeaves(boolean hide)
	4727	+ {
	4728	+ group.selection.RewindLeaves(hide);
	4729	+ refreshContents();
	4730	+ }
	4731	+
	4732	+ void RandomLeaves(boolean hide)
	4733	+ {
	4734	+ group.selection.RandomLeaves(hide);
3934	4735	refreshContents();
3935	4736	}
3936	4737
..	..	@@ -4005,28 +4806,25 @@
4005	4806	// }
4006	4807	// }
4007	4808
4008		- static boolean allparams = true;
4009		-
4010		- static Vector<Object3D> listUI = new Vector<Object3D>();
4011		-
4012	4809	void EditSelection(boolean newWindow)
4013	4810	{
	4811	+ if (group.selection == null)
	4812	+ {
	4813	+ EditElement(group, newWindow); // ? new
	4814	+ return;
	4815	+ }
	4816	+
4014	4817	// aConstraints.gridy = 0;
4015	4818	for (int i=0; i<group.selection.size(); i++)
4016	4819	{
4017	4820	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4018	4821	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4019		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4822	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4020	4823
4021	4824	Object3D elem = (Object3D)group.selection.elementAt(i);
4022		- if(elem != group)
	4825	+ if(elem != group \|\| !newWindow)
4023	4826	{
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
	4827	+ EditElement(elem, newWindow); // ? new
4030	4828	}
4031	4829	}
4032	4830	}
..	..	@@ -4101,7 +4899,8 @@
4101	4899	//new Exception().printStackTrace();
4102	4900
4103	4901	freezemodel = true;
4104		-
	4902	+ ClearUnpinned();
	4903	+
4105	4904	/**/
4106	4905	//switch (event.id)
4107	4906	{
..	..	@@ -4109,7 +4908,6 @@
4109	4908	//case 702: // Event.LIST_DESELECT
4110	4909	group.deselectAll();
4111	4910	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4112		- objEditor.ClearInfo(); // .GetMaterial());
4113	4911	if (tps != null)
4114	4912	{
4115	4913	for (int i=0; i < tps.length; i++)
..	..	@@ -4118,33 +4916,39 @@
4118	4916
4119	4917	//if (child.parent != null)
4120	4918	//child.parent.addSelectee(child);
	4919	+ objEditor.SetMaterial(child);
4121	4920	group.addSelectee(child);
4122		- objEditor.SetMaterial(child); // .GetMaterial());
4123		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4124		- System.err.println("info : " + child.GetPath());
4125	4921	}
4126	4922	}
4127		- else
4128		- {
4129		- objEditor.SetMaterial(group); // .GetMaterial());
4130		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4131		- System.err.println("info : " + group.GetPath());
4132		- }
	4923	+// else
	4924	+// {
	4925	+// objEditor.SetMaterial(group); // .GetMaterial());
	4926	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4927	+// System.err.println("info : " + group.GetPath());
	4928	+// }
4133	4929
4134		- objEditor.SetText(); // jan 2014
4135		-
4136		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4930	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4137	4931	CameraPane.flash = true;
4138	4932
4139		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4933	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4140	4934	// a camera
4141	4935	{
4142		- CameraPane.camerachangeframe = 0; // don't refuse it
4143		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4936	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4937	+ {
	4938	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4939	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4940	+ }
4144	4941	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4145	4942	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4146	4943	}
4147	4944
	4945	+ if (tps != null && tps.length == 1)
	4946	+ {
	4947	+ EditSelection(false);
	4948	+ }
	4949	+
	4950	+ SetPinStates(tps != null && tps.length > 0);
	4951	+
4148	4952	refreshContents();
4149	4953	//return true;
4150	4954	}
..	..	@@ -4153,6 +4957,35 @@
4153	4957
4154	4958	freezemodel = false;
4155	4959	}
	4960	+
	4961	+ void SetPinStates(boolean enabled)
	4962	+ {
	4963	+ editButton.setEnabled(enabled);
	4964	+ uneditButton.setEnabled(enabled);
	4965	+ unselectButton.setEnabled(enabled);
	4966	+ flashSelectionButton.setEnabled(enabled);
	4967	+ }
	4968	+
	4969	+ void refreshContents(boolean cp)
	4970	+ {
	4971	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	4972	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4973	+ {
	4974	+ objEditor.ClearInfo(); // .GetMaterial());
	4975	+
	4976	+ for (int i=0; i < group.selection.Size(); i++)
	4977	+ {
	4978	+ Object3D child = (Object3D) group.selection.get(i);
	4979	+
	4980	+ objEditor.AddInfo(child, this, true);
	4981	+ System.err.println("info : " + child.GetPath());
	4982	+ }
	4983	+
	4984	+ objEditor.SetText(); // jan 2014
	4985	+ }
	4986	+
	4987	+ super.refreshContents(cp);
	4988	+ }
4156	4989
4157	4990	void linkSomething(Object3D thing)
4158	4991	{
..	..	@@ -4224,16 +5057,19 @@
4224	5057	{
4225	5058	if (group.selection.isEmpty())
4226	5059	return;
4227		- GrafreeD.clipboardIsTempGroup = false;
	5060	+
	5061	+ Grafreed.clipboardIsTempGroup = false;
4228	5062	Composite tGroup = null;
4229	5063	if (group.selection.size() > 0) // 1)
4230	5064	{
4231	5065	tGroup = new cGroup();
4232		- GrafreeD.clipboardIsTempGroup = true;
	5066	+ Grafreed.clipboardIsTempGroup = true;
4233	5067	}
4234	5068
4235	5069	if (cut)
4236	5070	{
	5071	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5072	+// Save();
4237	5073	//int indices[] = jList.getSelectedIndices();
4238	5074	//for (int i = indices.length - 1; i >= 0; i--)
4239	5075	//jList.remove(indices[i]);
..	..	@@ -4269,16 +5105,16 @@
4269	5105	//System.out.println("cut " + child);
4270	5106	//System.out.println("parent = " + child.parent);
4271	5107	// tmp.addChild(child);
4272		- if (GrafreeD.clipboardIsTempGroup)
	5108	+ if (Grafreed.clipboardIsTempGroup)
4273	5109	tGroup.add/Child/(tmp);
4274	5110	else
4275		- GrafreeD.clipboard = tmp;
	5111	+ Grafreed.clipboard = tmp;
4276	5112	}
4277	5113	else
4278		- if (GrafreeD.clipboardIsTempGroup)
	5114	+ if (Grafreed.clipboardIsTempGroup)
4279	5115	tGroup.add/Child/(child);
4280	5116	else
4281		- GrafreeD.clipboard = child;
	5117	+ Grafreed.clipboard = child;
4282	5118	}
4283	5119
4284	5120	//ResetModel();
..	..	@@ -4310,21 +5146,23 @@
4310	5146	//System.out.println("cut " + elem);
4311	5147	//System.out.println("parent = " + elem.parent);
4312	5148	// tmp.addChild(elem);
4313		- if (GrafreeD.clipboardIsTempGroup)
	5149	+ if (Grafreed.clipboardIsTempGroup)
4314	5150	tGroup.add/Child/(tmp);
4315	5151	else
4316		- GrafreeD.clipboard = tmp;
	5152	+ Grafreed.clipboard = tmp;
4317	5153	}
4318	5154	else
4319		- if (GrafreeD.clipboardIsTempGroup)
	5155	+ if (Grafreed.clipboardIsTempGroup)
4320	5156	tGroup.add/Child/(child);
4321	5157	else
4322		- GrafreeD.clipboard = child;
	5158	+ Grafreed.clipboard = child;
4323	5159	}
4324	5160
4325	5161	}
4326		- if (GrafreeD.clipboardIsTempGroup)
4327		- GrafreeD.clipboard = tGroup;
	5162	+
	5163	+ if (Grafreed.clipboardIsTempGroup)
	5164	+ Grafreed.clipboard = tGroup;
	5165	+
4328	5166	if (cut)
4329	5167	{
4330	5168	ResetModel();
..	..	@@ -4334,11 +5172,15 @@
4334	5172
4335	5173	void paste(boolean expand)
4336	5174	{
	5175	+ if (Globals.REPLACEONMAKE)
	5176	+ Save();
	5177	+ boolean keep = Globals.REPLACEONMAKE;
	5178	+ Globals.REPLACEONMAKE = false;
4337	5179	// if (GrafreeD.clipboard == null)
4338	5180	// return;
4339	5181	boolean first = true;
4340	5182
4341		- if (GrafreeD.clipboardIsTempGroup)
	5183	+ if (Grafreed.clipboardIsTempGroup)
4342	5184	{
4343	5185	Composite temp;
4344	5186
..	..	@@ -4349,7 +5191,7 @@
4349	5191	temp = (Composite)Applet3D.clipboard.deepCopy();
4350	5192	*/
4351	5193	Object3D elem;
4352		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5194	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4353	5195	{
4354	5196	Object3D child = (Object3D)e.nextElement();
4355	5197
..	..	@@ -4383,21 +5225,22 @@
4383	5225	//Object3D cb = Applet3D.clipboard;
4384	5226	//temp.addChild(cb);
4385	5227	//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());
	5228	+ assert(Grafreed.clipboard.parent == null);
	5229	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5230	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5231	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5232	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4391	5233	else
4392		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4393		- GrafreeD.clipboard.get(0).parent = keepparent;
	5234	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5235	+ Grafreed.clipboard.get(0).parent = keepparent;
4394	5236	}
4395	5237
	5238	+ Globals.REPLACEONMAKE = keep;
4396	5239	ResetModel();
4397	5240	refreshContents();
4398	5241	}
4399	5242
4400		- void pasteInto(boolean copyit)
	5243	+ void pasteInto(boolean copyit, boolean clone)
4401	5244	{
4402	5245	// if (GrafreeD.clipboard == null)
4403	5246	// return;
..	..	@@ -4426,15 +5269,22 @@
4426	5269	if (copyit)
4427	5270	{
4428	5271	// paste(false);
4429		- CloneClipboard(false); // sept 2014
	5272	+ if (clone)
	5273	+ {
	5274	+ CloneClipboard(false); // sept 2014
	5275	+ }
	5276	+ else
	5277	+ {
	5278	+ paste(false);
	5279	+ }
4430	5280	}
4431	5281	else
4432	5282	{
4433	5283	boolean first = true;
4434	5284
4435		- if (GrafreeD.clipboardIsTempGroup)
	5285	+ if (Grafreed.clipboardIsTempGroup)
4436	5286	{
4437		- Composite temp = (Composite)GrafreeD.clipboard;
	5287	+ Composite temp = (Composite)Grafreed.clipboard;
4438	5288	Object3D copy;
4439	5289	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4440	5290	{
..	..	@@ -4444,7 +5294,7 @@
4444	5294	}
4445	5295	} else
4446	5296	{
4447		- linkSomething(GrafreeD.clipboard); //.get(0));
	5297	+ linkSomething(Grafreed.clipboard); //.get(0));
4448	5298	}
4449	5299	}
4450	5300	}
..	..	@@ -4521,6 +5371,10 @@
4521	5371
4522	5372	void group(Object3D csg, boolean grab)
4523	5373	{
	5374	+ if (Globals.REPLACEONMAKE)
	5375	+ Save();
	5376	+ boolean keep = Globals.REPLACEONMAKE;
	5377	+ Globals.REPLACEONMAKE = false;
4524	5378	if (//false) // why??
4525	5379	!group.selection.isEmpty())
4526	5380	{
..	..	@@ -4634,10 +5488,15 @@
4634	5488	//node.add(csg);
4635	5489	//makeSomething(node);
4636	5490	makeSomething(csg);
	5491	+ Globals.REPLACEONMAKE = keep;
4637	5492	}
4638	5493
4639	5494	void Ungroup(Object3D g)
4640	5495	{
	5496	+ if (Globals.REPLACEONMAKE)
	5497	+ Save();
	5498	+ boolean keep = Globals.REPLACEONMAKE;
	5499	+ Globals.REPLACEONMAKE = false;
4641	5500	if (g instanceof HiddenObject)
4642	5501	{
4643	5502	HiddenObject h = (HiddenObject) g;
..	..	@@ -4654,6 +5513,7 @@
4654	5513	objEditor.makeSomething(g.get(i), false);
4655	5514	}
4656	5515	}
	5516	+ Globals.REPLACEONMAKE = keep;
4657	5517	}
4658	5518
4659	5519	void ungroup()
..	..	@@ -4849,21 +5709,6 @@
4849	5709	}
4850	5710	*/
4851	5711
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	5712	/*
4868	5713	public void Callback(Object obj)
4869	5714	{
..	..	@@ -4887,26 +5732,9 @@
4887	5732	}
4888	5733	*/
4889	5734
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	5735	String GetFile(String dialogName)
4908	5736	{
4909		- if (GrafreeD.standAlone)
	5737	+ if (Grafreed.standAlone)
4910	5738	{
4911	5739	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4912	5740	browser.show();
..	..	@@ -4970,10 +5798,49 @@
4970	5798	cButton flashSelectionButton;
4971	5799	cButton editButton;
4972	5800	cButton uneditButton;
	5801	+ JCheckBox allParamsButton;
4973	5802	cButton clearpanelButton;
4974		- cButton allParamsButton;
4975	5803	cButton unselectButton;
4976	5804
	5805	+ cButton restoreCameraButton;
	5806	+
	5807	+ cButton saveButton;
	5808	+ cButton oneStepButton;
	5809	+
	5810	+ cButton groupButton;
	5811	+ cButton ungroupButton;
	5812	+ cButton compositeButton;
	5813	+ cButton switchButton;
	5814	+ cButton loopButton;
	5815	+ cButton textureButton;
	5816	+
	5817	+ cButton skybox1Button;
	5818	+ cButton skybox2Button;
	5819	+ cButton skybox3Button;
	5820	+ cButton skybox4Button;
	5821	+ cButton skybox5Button;
	5822	+ cButton skybox6Button;
	5823	+ cButton skybox7Button;
	5824	+
	5825	+ cButton skybox11Button;
	5826	+ cButton skybox12Button;
	5827	+ cButton skybox13Button;
	5828	+ cButton skybox14Button;
	5829	+ cButton skybox15Button;
	5830	+ cButton skybox16Button;
	5831	+ cButton skybox17Button;
	5832	+
	5833	+ cButton gridButton;
	5834	+ cButton boxButton;
	5835	+ cButton sphereButton;
	5836	+ cButton coneButton;
	5837	+ cButton torusButton;
	5838	+ cButton superButton;
	5839	+ cButton kleinButton;
	5840	+ cButton particlesButton;
	5841	+ cButton overlayButton;
	5842	+ cButton lightButton;
	5843	+
4977	5844	cButton screenfitButton;
4978	5845	cButton screenfitpointButton;
4979	5846	cButton snapobjectButton;
..	..	@@ -4985,14 +5852,6 @@
4985	5852
4986	5853	cButton setsupportButton;
4987	5854
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	5855	//
4997	5856	//Composite
4998	5857	Object3D // to do !!
..	..	@@ -5002,9 +5861,11 @@
5002	5861	//JTree jTree;
5003	5862	private MenuItem lookAtItem;
5004	5863	private MenuItem lookFromItem;
5005		- private MenuItem switchItem;
	5864	+ private MenuItem switchViewItem;
5006	5865	private MenuItem cutItem;
5007		- private MenuItem duplicateItem;
	5866	+ private MenuItem undoItem;
	5867	+ private MenuItem redoItem;
	5868	+ private JMenuItem duplicateItem;
5008	5869	private MenuItem cloneItem;
5009	5870	private MenuItem cloneSupportItem;
5010	5871	private MenuItem overwriteGeoItem;
..	..	@@ -5017,7 +5878,7 @@
5017	5878	private MenuItem linkverticesItem;
5018	5879	private MenuItem relinkverticesItem;
5019	5880	private MenuItem setMasterItem;
5020		- private MenuItem resetMeshItem;
	5881	+ private MenuItem resetAllItem;
5021	5882	private MenuItem stepAllItem;
5022	5883	private MenuItem revertMeshItem;
5023	5884	private MenuItem poseMeshItem;
..	..	@@ -5028,10 +5889,11 @@
5028	5889	private MenuItem mergeGeometriesItem;
5029	5890	private MenuItem copyItem;
5030	5891	private MenuItem pasteItem;
	5892	+ private MenuItem pasteIntoItem;
5031	5893	private MenuItem pasteLinkItem;
5032	5894	private MenuItem pasteCloneItem;
5033	5895	private MenuItem pasteExpandItem;
5034		- private MenuItem clearItem;
	5896	+ private MenuItem deleteItem;
5035	5897	private MenuItem clearAllItem;
5036	5898	private MenuItem genUVItem;
5037	5899	private MenuItem genNormalsMESHItem;
..	..	@@ -5066,6 +5928,10 @@
5066	5928	private MenuItem showleavesItem;
5067	5929	private MenuItem markleavesItem;
5068	5930	private MenuItem unmarkleavesItem;
	5931	+ private MenuItem rewindleavesItem;
	5932	+ private MenuItem unrewindleavesItem;
	5933	+ private MenuItem randomleavesItem;
	5934	+ private MenuItem unrandomleavesItem;
5069	5935
5070	5936	private MenuItem flipVItem;
5071	5937	private MenuItem unflipVItem;
..	..	@@ -5077,15 +5943,17 @@
5077	5943	private MenuItem panoTexturesItem;
5078	5944
5079	5945	private MenuItem resetCentroidItem;
5080		- private MenuItem transformgeometryItem;
	5946	+ private MenuItem resetCentroidXZItem;
5081	5947	private MenuItem resetTransformItem;
	5948	+ private MenuItem transformGeometryItem;
	5949	+ private MenuItem transformChildrenItem;
5082	5950	private MenuItem hideItem;
5083	5951	private MenuItem grabItem;
5084	5952	private MenuItem backItem;
5085	5953	private MenuItem frontItem;
5086	5954	private MenuItem cameraItem;
5087	5955	private MenuItem compositeItem;
5088		- private MenuItem randomItem;
	5956	+ private MenuItem switchItem;
5089	5957	private MenuItem physicsItem;
5090	5958	private MenuItem frameselectorItem;
5091	5959	private MenuItem scriptNodeItem;
..	..	@@ -5109,6 +5977,8 @@
5109	5977	private MenuItem attachBumpItem;
5110	5978	private MenuItem detachBumpItem;
5111	5979	private MenuItem pigmentBumpItem;
	5980	+ private MenuItem embedTexturesItem;
	5981	+ private MenuItem deEmbedTexturesItem;
5112	5982
5113	5983	private MenuItem particleItem;
5114	5984	private MenuItem ragdollItem;
..	..	@@ -5125,7 +5995,7 @@
5125	5995	private MenuItem blobItem;
5126	5996	private MenuItem latheItem;
5127	5997	private MenuItem bezierItem;
5128		- private MenuItem checkerItem;
	5998	+ private MenuItem overlayItem;
5129	5999	private MenuItem meshItem;
5130	6000	// private MenuItem meshGroupItem;
5131	6001	private MenuItem springItem;
..	..	@@ -5147,11 +6017,6 @@
5147	6017	private MenuItem doubleItem;
5148	6018	private MenuItem tripleItem;
5149	6019
5150		- private MenuItem importGFDItem;
5151		- private MenuItem importVRMLX3DItem;
5152		- private MenuItem import3DSItem;
5153		- private MenuItem importOBJItem;
5154		-
5155	6020	private MenuItem computeAOItem;
5156	6021	private MenuItem recompileItem;
5157	6022	private MenuItem editScriptItem;
..	..	@@ -5161,4 +6026,8 @@
5161	6026	private MenuItem analyzeItem;
5162	6027	private MenuItem dumpItem;
5163	6028	//boolean freezemodel = false;
	6029	+
	6030	+ Menu cameraMenu;
	6031	+ MenuItem editCameraItem;
	6032	+ MenuItem restoreCameraItem;
5164	6033	}