~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -23,6 +23,31 @@
23	23	DragGestureListener, DragSourceListener, DropTargetListener,
24	24	ItemListener // ListSelectionListener
25	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	+
26	51	//ObjEditor objEditor;
27	52	public void closeUI2()
28	53	{
..	..	@@ -60,6 +85,12 @@
60	85	this.copy = this.group = group;
61	86	//selectees = this.group.selectees;
62	87
	88	+ if (copy.versions == null)
	89	+ {
	90	+ copy.versions = new byte[100][];
	91	+ copy.versionindex = -1;
	92	+ }
	93	+
63	94	if(ui)
64	95	SetupUI(objEditor);
65	96	}
..	..	@@ -74,16 +105,28 @@
74	105	this.copy = this.group = copy;
75	106	//selectees = this.group.selectees;
76	107
77		- SetupMenu2(objEditor);
	108	+ SetupMenu2(this); //objEditor);
78	109	SetupUI2(objEditor);
79	110	objEditor.SetupUI(true);
80	111	SetupViews(objEditor);
81	112
82	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	+ }
83	122	}
84	123
85	124	void CloneSelection(boolean supports)
86	125	{
	126	+ if (Globals.REPLACEONMAKE)
	127	+ Save();
	128	+ boolean keep = Globals.REPLACEONMAKE;
	129	+ Globals.REPLACEONMAKE = false;
87	130	// Object3D keep = GrafreeD.clipboard;
88	131	//Object3D obj;
89	132	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +137,19 @@
94	137
95	138	makeSomething(clone, i==group.selection.size()-1);
96	139	}
	140	+ Globals.REPLACEONMAKE = keep;
97	141	}
98	142
99	143	void CloneClipboard(boolean supports)
100	144	{
101		- assert(GrafreeD.clipboard.parent == null);
102		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
103		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
104		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
105		- 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));
106	150	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	151	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	152	+ Grafreed.clipboard.get(0).parent = keepparent;
109	153	}
110	154
111	155	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +163,7 @@
119	163	// obj.support = null;
120	164	if (!supports)
121	165	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	166	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	167	obj.parent = parent;
124	168	// obj.support = support;
125	169	// clone.support = support; // aout 2013
..	..	@@ -148,28 +192,21 @@
148	192
149	193	//JTextField nameField;
150	194
151		- void SetupMenu2(ObjEditor oe)
	195	+ void SetupMenu2(GroupEditor oe)
152	196	{
153		- if (Globals.ADVANCED)
154		- {
155		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
156		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
157		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
158		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
159		- oe.cameraMenu.add("-");
160		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
161		- openWindowItem.addActionListener(this);
162		- editLeafItem.addActionListener(this);
163		- lookAtItem.addActionListener(this);
164		- //lookFromItem.addActinoListener(this);
165		- //switchItem.addActionListener(this);
166		- }
167		-
	197	+ oe.jTree = new cTree();
	198	+
168	199	Menu menu;
169	200	oe.menuBar.add(menu = new Menu("Edit"));
170	201	//editItem = menu.add(new MenuItem("Edit"));
171	202	//editItem.addActionListener(this);
172		- 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"));
173	210	duplicateItem.addActionListener(this);
174	211	cloneItem = menu.add(new MenuItem("Clone"));
175	212	cloneItem.addActionListener(this);
..	..	@@ -185,7 +222,6 @@
185	222	copyItem.addActionListener(this);
186	223	pasteItem = menu.add(new MenuItem("Paste"));
187	224	pasteItem.addActionListener(this);
188		- menu.add("-");
189	225
190	226	menu.add("-");
191	227	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -197,8 +233,8 @@
197	233	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
198	234	// pasteExpandItem.addActionListener(this);
199	235	menu.add("-");
200		- clearItem = menu.add(new MenuItem("Clear"));
201		- clearItem.addActionListener(this);
	236	+ deleteItem = menu.add(new MenuItem("Delete"));
	237	+ deleteItem.addActionListener(this);
202	238
203	239	if (Globals.ADVANCED)
204	240	{
..	..	@@ -206,14 +242,97 @@
206	242	clearAllItem = menu.add(new MenuItem("Clear All"));
207	243	clearAllItem.addActionListener(this);
208	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());
209	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	+
210	333	oe.menuBar.add(menu = new Menu("Setting"));
211	334	if (Globals.ADVANCED)
212	335	{
213		- resetMeshItem = menu.add(new MenuItem("Reset All"));
214		- resetMeshItem.addActionListener(this);
215		- stepAllItem = menu.add(new MenuItem("Step All"));
216		- stepAllItem.addActionListener(this);
217	336	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218	337	revertMeshItem.addActionListener(this);
219	338	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -253,21 +372,29 @@
253	372	}
254	373
255	374	oe.menuBar.add(menu = new Menu("Group"));
256		- grabItem = menu.add(new MenuItem("Grab"));
257		- grabItem.addActionListener(this);
	375	+// grabItem = menu.add(new MenuItem("Grab"));
	376	+// grabItem.addActionListener(this);
258	377	backItem = menu.add(new MenuItem("Back"));
259	378	backItem.addActionListener(this);
260	379	frontItem = menu.add(new MenuItem("Front"));
261	380	frontItem.addActionListener(this);
262		- compositeItem = menu.add(new MenuItem("Composite"));
263		- compositeItem.addActionListener(this);
	381	+// compositeItem = menu.add(new MenuItem("Composite"));
	382	+// compositeItem.addActionListener(this);
	383	+
	384	+ if (Globals.ADVANCED)
	385	+ {
264	386	hideItem = menu.add(new MenuItem("Hidden Group"));
265	387	hideItem.addActionListener(this);
	388	+ }
266	389	ungroupItem = menu.add(new MenuItem("Ungroup"));
267	390	ungroupItem.addActionListener(this);
268		- menu.add("-");
269		- randomItem = menu.add(new MenuItem("Switch node"));
270		- randomItem.addActionListener(this);
	391	+
	392	+// menu.add("-");
	393	+//
	394	+// switchItem = menu.add(new MenuItem("Switch node"));
	395	+// switchItem.addActionListener(this);
	396	+ if (Globals.ADVANCED)
	397	+ {
271	398	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
272	399	switchGeoItem.addActionListener(this);
273	400	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -275,8 +402,6 @@
275	402	morphItem = menu.add(new MenuItem("Morph Group"));
276	403	morphItem.addActionListener(this);
277	404
278		- if (Globals.ADVANCED)
279		- {
280	405	menu.add("-");
281	406	physicsItem = menu.add(new MenuItem("Physics"));
282	407	physicsItem.addActionListener(this);
..	..	@@ -284,30 +409,29 @@
284	409	frameselectorItem.addActionListener(this);
285	410	scriptNodeItem = menu.add(new MenuItem("Script Node"));
286	411	scriptNodeItem.addActionListener(this);
287		- cameraItem = menu.add(new MenuItem("Camera"));
288		- cameraItem.addActionListener(this);
289	412	}
290	413
291	414	oe.menuBar.add(menu = new Menu("Object"));
292		- textureItem = menu.add(new MenuItem("Texture"));
293		- textureItem.addActionListener(this);
	415	+// textureItem = menu.add(new MenuItem("Texture"));
	416	+// textureItem.addActionListener(this);
294	417	billboardItem = menu.add(new MenuItem("Billboard"));
295	418	billboardItem.addActionListener(this);
296	419	csgItem = menu.add(new MenuItem("CSG"));
297	420	csgItem.addActionListener(this);
298		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	421	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
299	422	shadowXItem.addActionListener(this);
300		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	423	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
301	424	shadowYItem.addActionListener(this);
302		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	425	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
303	426	shadowZItem.addActionListener(this);
	427	+ attributeItem = menu.add(new MenuItem("Attribute"));
	428	+ attributeItem.addActionListener(this);
	429	+
304	430	if (Globals.ADVANCED)
305	431	{
306	432	menu.add("-");
307	433	linkerItem = menu.add(new MenuItem("Linker"));
308	434	linkerItem.addActionListener(this);
309		- attributeItem = menu.add(new MenuItem("Attribute"));
310		- attributeItem.addActionListener(this);
311	435	templateItem = menu.add(new MenuItem("Template"));
312	436	templateItem.addActionListener(this);
313	437	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -318,8 +442,12 @@
318	442	resetTransformItem.addActionListener(this);
319	443	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
320	444	resetCentroidItem.addActionListener(this);
321		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
322		- 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);
323	451
324	452	oe.menuBar.add(menu = new Menu("Geometry"));
325	453	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -332,7 +460,7 @@
332	460	genNormalsMESHItem.addActionListener(this);
333	461	if (Globals.ADVANCED)
334	462	{
335		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	463	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
336	464	genNormalsMINEItem.addActionListener(this);
337	465	}
338	466	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -368,6 +496,10 @@
368	496	oe.menuBar.add(menu = new Menu("Attributes"));
369	497	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
370	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);
371	503	menu.add("-");
372	504	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
373	505	liveleavesItem.addActionListener(this);
..	..	@@ -388,6 +520,14 @@
388	520	markleavesItem.addActionListener(this);
389	521	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
390	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);
391	531	menu.add("-");
392	532	flipVItem = menu.add(new MenuItem("Flip V"));
393	533	flipVItem.addActionListener(this);
..	..	@@ -413,47 +553,56 @@
413	553	attachBumpItem.addActionListener(this);
414	554	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
415	555	pigmentBumpItem.addActionListener(this);
	556	+ //embedTexturesItem
416	557	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
417	558	detachPigmentItem.addActionListener(this);
418	559	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
419	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);
420	565	menu.add("-");
421	566	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
422	567	sortbysizeItem.addActionListener(this);
423	568	sortbynameItem = menu.add(new MenuItem("Sort by name"));
424	569	sortbynameItem.addActionListener(this);
	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);
425	575	if (Globals.ADVANCED)
426	576	{
427		- menu.add("-");
	577	+ // Pretty much the same as duplicate and clone.
428	578	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
429	579	extractGeometriesItem.addActionListener(this);
430	580	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
431	581	cloneGeometriesItem.addActionListener(this);
432		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
433		- shareGeometriesItem.addActionListener(this);
434		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
435		- mergeGeometriesItem.addActionListener(this);
436	582	}
437	583
438	584	oe.menuBar.add(menu = new Menu("Insert"));
439	585	buildCreateMenu(menu);
440	586
441		- oe.menuBar.add(menu = new Menu("Include"));
442		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
443		- importGFDItem.addActionListener(this);
444		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
445		- importVRMLX3DItem.addActionListener(this);
446		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
447		- importOBJItem.addActionListener(this);
448		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
449		- import3DSItem.addActionListener(this);
450		-
451	587	oe.menuBar.add(menu = new Menu("Tools"));
452	588	buildToolsMenu(menu);
453	589	}
454	590
	591	+
455	592	void SetupUI2(ObjEditor oe)
456	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	+
457	606	//new Exception().printStackTrace();
458	607
459	608	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -482,97 +631,326 @@
482	631	oe.radioPanel.add(dummyButton);
483	632	oe.buttonGroup.add(dummyButton);
484	633	*/
	634	+ cGridBag copyOptionsPanel = new cGridBag();
	635	+
	636	+ copyOptionsPanel.preferredHeight = 2;
	637	+
485	638	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
486	639
487		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
488		- liveCB.setToolTipText("Enabled animation");
	640	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	641	+ //minButton.setToolTipText("Minimize window");
	642	+ //minButton.addActionListener(this);
	643	+
	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);
	656	+ screenfitButton.setToolTipText("Screen fit");
	657	+ screenfitButton.addActionListener(this);
	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");
489	692	liveCB.addItemListener(this);
490	693
491		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	694	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492	695	oneStepButton.setToolTipText("Animate one step forward");
493	696	oneStepButton.addActionListener(this);
494	697
495		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	698	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
496	699	fastCB.setToolTipText("Fast mode");
497	700	fastCB.addItemListener(this);
498	701
499		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
500		- trackCB.setToolTipText("Enable tracking");
501		- trackCB.addItemListener(this);
502		-
503		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
504		- screenfitButton.setToolTipText("Screen fit");
505		- screenfitButton.addActionListener(this);
	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);
506	707
507	708	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
508	709	// screenfitpointButton.addActionListener(this);
509	710
510	711	if (Globals.ADVANCED)
511	712	{
512		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	713	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
513	714	snapobjectButton.addActionListener(this);
514	715	snapobjectButton.setToolTipText("Snap Object");
	716	+
	717	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	718	+ fourButton.addActionListener(this);
	719	+ fourButton.setToolTipText("Show control panel only");
515	720	}
516	721
517		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
518		- flashSelectionButton.setToolTipText("Show selection");
519		- flashSelectionButton.addActionListener(this);
	722	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
520	723
521		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
522		-
523		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
524		- twoButton.setToolTipText("Show center view only");
	724	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	725	+ twoButton.setToolTipText("Show 3D view only");
525	726	twoButton.addActionListener(this);
526		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
527		- fourButton.addActionListener(this);
528		- fourButton.setToolTipText("Show left panel only");
529		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
530		- sixButton.setToolTipText("2-column layout left");
531		- sixButton.addActionListener(this);
532		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
533		- threeButton.setToolTipText("2-column layout right");
	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");
534	731	threeButton.addActionListener(this);
535		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
536		- sevenButton.setToolTipText("3-column layout");
537		- 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);
538	738	//
539	739
540		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
541		- rootButton.setToolTipText("Edit selection in new tab");
	740	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	741	+ rootButton.setToolTipText("Open selection in new tab");
542	742	rootButton.addActionListener(this);
543	743
544		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	744	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
545	745	closeButton.setToolTipText("Close tab");
546	746	closeButton.addActionListener(this);
547	747	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
548	748	//clearButton.addActionListener(this);
549		-
550		- cGridBag commandsPanel = new cGridBag();
	749	+
	750	+ cGridBag row1 = new cGridBag();
551	751
552		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
553		- editButton.setToolTipText("Edit selection");
	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");
554	927	editButton.addActionListener(this);
555	928
556		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
557		- uneditButton.setToolTipText("Unedit selection");
	929	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	930	+ uneditButton.setToolTipText("Remove selection controls");
558	931	uneditButton.addActionListener(this);
559	932
560		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
561		- allParamsButton.setToolTipText("Edit all params");
	933	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	934	+ allParamsButton.setToolTipText("Show all controle");
562	935	allParamsButton.addActionListener(this);
563	936
564		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	937	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565	938	clearPanelButton.setToolTipText("Clear edit panel");
566	939	clearPanelButton.addActionListener(this);
567	940
568		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	941	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569	942	unselectButton.setToolTipText("Unselect");
570	943	unselectButton.addActionListener(this);
571	944
572		- commandsPanel.preferredHeight = 1;
	945	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	946	+ flashSelectionButton.setToolTipText("Highlight selection");
	947	+ flashSelectionButton.addActionListener(this);
573	948
574		- oe.treePanel.add(commandsPanel);
575		- oe.treePanel.Return();
	949	+ editCommandsPanel.preferredHeight = 1;
	950	+
	951	+ SetPinStates(false);
	952	+// oe.treePanel.add(commandsPanel);
	953	+// oe.treePanel.Return();
576	954
577	955	// oe.aConstraints.gridx += 1;
578	956	// oe.aConstraints.weighty = 0;
..	..	@@ -589,32 +967,20 @@
589	967
590	968	JScrollPane jSP;
591	969	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
592		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	970	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
593	971	ResetModel();
594	972
595	973	oe.treePanel.add(jSPPanel);
596	974	oe.treePanel.Return();
597	975
598		- cGridBag copyOptionsPanel = new cGridBag();
599		-
600		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
601		- colorCB.setToolTipText("Copy color when dropped");
602		- colorCB.addItemListener(this);
603		-
604		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
605		- materialCB.setToolTipText("Copy material when dropped");
606		- materialCB.addItemListener(this);
607		-
608		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
609		- textureCB.setToolTipText("Copy texture when dropped");
610		- textureCB.addItemListener(this);
611		-
612		- copyOptionsPanel.preferredHeight = 1;
613	976	oe.treePanel.add(copyOptionsPanel);
614	977	oe.treePanel.Return();
	978	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	979	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	980	+ sliderPane.preferredHeight = 1;
615	981
616		-// mainPanel.setDividerLocation(0.5); //1.0);
617		-// mainPanel.setResizeWeight(0.5);
	982	+// mainPanel.setDividerLocation(0.1); //1.0);
	983	+ mainPanel.setResizeWeight(0.4);
618	984
619	985	//jList.addListSelectionListener(this);
620	986	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -622,7 +988,7 @@
622	988	//jTree.setEditable(true);
623	989	oe.jTree.setDragEnabled(true);
624	990	//jTree.setPreferredSize(new Dimension(10,10));
625		- jSP.setPreferredSize(new Dimension(100,200));
	991	+ //jSP.setPreferredSize(new Dimension(100,200));
626	992
627	993	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
628	994
..	..	@@ -634,29 +1000,49 @@
634	1000	dgr.addDragGestureListener(this);
635	1001	}catch(Exception e) {}
636	1002	*/
637		- radio.layout = sevenButton;
	1003	+ radio.layout = sixButton; // sevenButton;
638	1004	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
639	1005	}
640	1006
641	1007	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
642	1008	{
	1009	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1010	+ colorCB.setToolTipText("Copy color when dropped");
	1011	+ colorCB.addItemListener(this);
	1012	+
	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	+
643	1023	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
644	1024	boxCB.setToolTipText("Display bounding boxes");
645	1025	boxCB.addItemListener(this);
646	1026
647	1027	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
648		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1028	+ zoomBoxCB.setToolTipText("Display only for wheel");
649	1029	zoomBoxCB.addItemListener(this);
650	1030
651		- if (Globals.ADVANCED)
	1031	+ if (true) // Globals.ADVANCED)
652	1032	{
653		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
654		- supportCB.setToolTipText("Enable rigging");
655		- supportCB.addItemListener(this);
	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);
656	1040
657	1041	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
658	1042	// localCB.addItemListener(this);
659	1043
	1044	+ panel.Return();
	1045	+
660	1046	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
661	1047	crowdCB.setToolTipText("Used for crowds");
662	1048	crowdCB.addItemListener(this);
..	..	@@ -673,6 +1059,8 @@
673	1059	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
674	1060	// speakerMocapCB.addItemListener(this);
675	1061
	1062	+ panel.Return();
	1063	+
676	1064	if (false)
677	1065	{
678	1066	// handled in scripts
..	..	@@ -687,42 +1075,85 @@
687	1075	//constraints.gridy += 1;
688	1076	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
689	1077	smoothfocusCB.addItemListener(this);
	1078	+ panel.Return();
690	1079	}
691	1080
692	1081	//constraints.gridx += 1;
693	1082	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
694	1083	// debugCB.addItemListener(this);
695	1084
	1085	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1086	+ trackCB.setToolTipText("Enable tracking target");
	1087	+ trackCB.addItemListener(this);
	1088	+
696	1089	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1090	+ oeilCB.setToolTipText("Move camera when tracking");
697	1091	oeilCB.addItemListener(this);
698	1092
	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	+ {
699	1113	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
700	1114	lookAtCB.setToolTipText("Look-at target");
701	1115	lookAtCB.addItemListener(this);
	1116	+ }
702	1117
703	1118	}
704	1119
705	1120	cGridBag fill = new cGridBag();
706		-
707	1121	fill.preferredHeight = 200;
	1122	+ cGridBag fill2 = new cGridBag();
	1123	+ fill2.preferredHeight = 200;
	1124	+ cGridBag fill3 = new cGridBag();
	1125	+ fill3.preferredHeight = 200;
708	1126
709	1127	panel.add(fill);
	1128	+ panel.add(fill2);
	1129	+ panel.add(fill3);
710	1130
711	1131	}
712	1132
713	1133	void EditObject(Object3D obj)
714	1134	{
715	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	+
716	1144	radioButton.SetObject(obj);
717		- radioButton.layout = sevenButton;
	1145	+ radioButton.layout = sixButton; // sevenButton;
718	1146	radioButton.SetCamera(cameraView.renderCamera, false);
719	1147	radioButton.addActionListener(this);
720	1148	radioPanel.add(radioButton);
721	1149	buttonGroup.add(radioButton);
722	1150	radioButton.doClick();
723	1151	}
	1152	+
724	1153	void SetupViews(ObjEditor oe)
725	1154	{
	1155	+ theFrame = this;
	1156	+
726	1157	oe.SetupViews();
727	1158
728	1159	System.out.println("SetupViews");
..	..	@@ -731,23 +1162,28 @@
731	1162	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
732	1163	}
733	1164
734		- JCheckBox liveCB;
735		- JCheckBox supportCB;
736		- JCheckBox localCB;
737		- JCheckBox crowdCB;
738		- JCheckBox smoothCB;
739		- JCheckBox fastCB;
740		- JCheckBox slowCB;
741		- JCheckBox boxCB;
742		- JCheckBox zoomBoxCB;
743		- JCheckBox trackCB;
744		- 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;
745	1178	// JCheckBox speakerMocapCB;
746		- JCheckBox speakerCameraCB;
747		- JCheckBox speakerFocusCB;
748		- JCheckBox debugCB;
749		- JCheckBox oeilCB;
750		- JCheckBox lookAtCB;
	1179	+ cCheckBox speakerCameraCB;
	1180	+ cCheckBox speakerFocusCB;
	1181	+ cCheckBox debugCB;
	1182	+
	1183	+ cCheckBox oeilCB;
	1184	+ cCheckBox shadowCB;
	1185	+ cCheckBox autokeepCB;
	1186	+ cCheckBox lookAtCB;
751	1187
752	1188	// static int COLOR = 1;
753	1189	// static int MATERIAL = 2;
..	..	@@ -755,9 +1191,9 @@
755	1191
756	1192	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
757	1193
758		- JCheckBox colorCB;
759		- JCheckBox materialCB;
760		- JCheckBox textureCB;
	1194	+ cCheckBox colorCB;
	1195	+ cCheckBox materialCB;
	1196	+ cCheckBox textureCB;
761	1197
762	1198	public void itemStateChanged(ItemEvent e)
763	1199	{
..	..	@@ -785,6 +1221,7 @@
785	1221	} else if(e.getSource() == liveCB)
786	1222	{
787	1223	cameraView.ToggleLive();
	1224	+ refreshContents(false);
788	1225	}
789	1226	else if(e.getSource() == supportCB)
790	1227	{
..	..	@@ -849,6 +1286,18 @@
849	1286	{
850	1287	cameraView.ToggleOeil();
851	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	+ }
852	1301	else if(e.getSource() == lookAtCB)
853	1302	{
854	1303	cameraView.ToggleLookAt();
..	..	@@ -865,7 +1314,8 @@
865	1314
866	1315	/**/
867	1316	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
868		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1317	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1318	+ TreePath path = objEditor.jTree.getSelectionPath();
869	1319	if ((path == null) \|\| (path.getPathCount() <= 1)) {
870	1320	// We can't move the root node or an empty selection
871	1321	return;
..	..	@@ -928,8 +1378,6 @@
928	1378	}
929	1379	}
930	1380
931		- String string = (String) object;
932		-
933	1381	System.out.println("Transfer = " + object + "; drop : " + target);
934	1382	// if( object instanceof java.io.File[])
935	1383	// {
..	..	@@ -937,7 +1385,11 @@
937	1385	// objEditor.DropFile((java.io.File[]) object, true);
938	1386	// return;
939	1387	// }
940		- 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) == ':')
941	1393	{
942	1394	// file(s)
943	1395	String[] names = string.split("\n");
..	..	@@ -964,7 +1416,7 @@
964	1416
965	1417	flashIt = false;
966	1418	CameraPane pane = (CameraPane) target;
967		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1419	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
968	1420	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
969	1421
970	1422	if (group.selection.size() == 1)
..	..	@@ -980,23 +1432,33 @@
980	1432
981	1433	assert target == objEditor.jTree;
982	1434	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1435	+ Object3D destinationLeaf;
983	1436	try {
984		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1437	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
985	1438	} catch (Exception e) {
986	1439	System.out.println("destinationPath : " + destinationPath);
987	1440	return;
988	1441	}
989	1442
990		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1443	+ for (int i=group.selection.size(); --i>=0;)
991	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	+// {
992	1454	loadClipboard(true);
993	1455	objEditor.jTree.setSelectionPath(destinationPath);
994	1456	pasteInto(false, false);
995		- } else {
996		- loadClipboard(false);
997		- objEditor.jTree.setSelectionPath(destinationPath);
998		- pasteInto(false, false); // true); // ???
999		- }
	1457	+// } else {
	1458	+// loadClipboard(false);
	1459	+// objEditor.jTree.setSelectionPath(destinationPath);
	1460	+// pasteInto(false, false); // true); // ???
	1461	+// }
1000	1462	}
1001	1463	public void dropActionChanged(DropTargetDragEvent dtde)
1002	1464	// Called if the user has modified the current drop gesture
..	..	@@ -1101,22 +1563,30 @@
1101	1563	{
1102	1564	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1103	1565	//heightFieldItem.addActionListener(this);
1104		- gridItem = menu.add(new MenuItem("Grid"));
1105		- gridItem.addActionListener(this);
1106		- rectoidItem = menu.add(new MenuItem("Box"));
1107		- rectoidItem.addActionListener(this);
1108		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1109		- ellipsoidItem.addActionListener(this);
1110		- coneItem = menu.add(new MenuItem("Cone"));
1111		- coneItem.addActionListener(this);
1112		- torusItem = menu.add(new MenuItem("Torus"));
1113		- torusItem.addActionListener(this);
1114		- superItem = menu.add(new MenuItem("Superellipsoid"));
1115		- 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	+ {
1116	1584	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1117	1585	kleinItem.addActionListener(this);
1118		- particleItem = menu.add(new MenuItem("Particle system"));
1119		- particleItem.addActionListener(this);
	1586	+ }
	1587	+
	1588	+// particleItem = menu.add(new MenuItem("Particle system"));
	1589	+// particleItem.addActionListener(this);
1120	1590	if (Globals.ADVANCED)
1121	1591	{
1122	1592	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1142,15 +1612,15 @@
1142	1612	}
1143	1613	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1144	1614	bezierItem.addActionListener(this);
1145		- overlayItem = menu.add(new MenuItem("Overlay"));
1146		- overlayItem.addActionListener(this);
1147		- lightItem = menu.add(new MenuItem("Light"));
1148		- lightItem.addActionListener(this);
	1615	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1616	+// overlayItem.addActionListener(this);
	1617	+// lightItem = menu.add(new MenuItem("Light"));
	1618	+// lightItem.addActionListener(this);
1149	1619	menu.add("-");
1150	1620	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1151	1621	//superLoopItem.addActionListener(this);
1152		- loopItem = menu.add(new MenuItem("Loop"));
1153		- loopItem.addActionListener(this);
	1622	+// loopItem = menu.add(new MenuItem("Loop"));
	1623	+// loopItem.addActionListener(this);
1154	1624	doubleItem = menu.add(new MenuItem("Fork"));
1155	1625	doubleItem.addActionListener(this);
1156	1626	if (Globals.ADVANCED)
..	..	@@ -1166,6 +1636,9 @@
1166	1636	animationItem.addItemListener(this);
1167	1637	animationItem.setState(Globals.ANIMATION);
1168	1638
	1639	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1640	+ archiveItem.addActionListener(this);
	1641	+
1169	1642	menu.add("-");
1170	1643	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1171	1644	parseverticesItem.addActionListener(this);
..	..	@@ -1178,6 +1651,8 @@
1178	1651	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1179	1652	reduce34MorphItem.addActionListener(this);
1180	1653	menu.add("-");
	1654	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1655	+ memoryItem.addActionListener(this);
1181	1656	menu.add(computeAOItem = new MenuItem("Compute AO"));
1182	1657	computeAOItem.addActionListener(this);
1183	1658
..	..	@@ -1186,11 +1661,9 @@
1186	1661	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1187	1662	mirrorItem.addActionListener(this);
1188	1663	menu.add("-");
1189		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1190		- memoryItem.addActionListener(this);
1191	1664	menu.add(analyzeItem = new MenuItem("Analyze"));
1192	1665	analyzeItem.addActionListener(this);
1193		- menu.add(dumpItem = new MenuItem("Dump"));
	1666	+ menu.add(dumpItem = new MenuItem("Print"));
1194	1667	dumpItem.addActionListener(this);
1195	1668	// menu.add(pathItem = new MenuItem("From-to path"));
1196	1669	// pathItem.addActionListener(this);
..	..	@@ -1331,9 +1804,34 @@
1331	1804	shadow.material = new cMaterial(obj.material);
1332	1805	shadow.material.diffuse = 0.0001f;
1333	1806	shadow.material.specular = 0.0001f;
	1807	+ //shadow.projectedVertices[1].x = 300;
1334	1808
1335	1809	makeSomething(shadow);
1336	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	+ }
1337	1835
1338	1836	/**
1339	1837	* applyExample
..	..	@@ -1537,9 +2035,9 @@
1537	2035
1538	2036	void Overwrite(int mask)
1539	2037	{
1540		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2038	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1541	2039	{
1542		- Object3D content = GrafreeD.clipboard.get(0);
	2040	+ Object3D content = Grafreed.clipboard.get(0);
1543	2041
1544	2042	if (content instanceof cGroup && ((cGroup)content).transientlink )
1545	2043	content = ((cGroup)content).get(0);
..	..	@@ -1578,7 +2076,7 @@
1578	2076	{
1579	2077	ScreenFit();
1580	2078	} else
1581		- if (source == switchItem)
	2079	+ if (source == switchViewItem)
1582	2080	{
1583	2081	cVector v1 = new cVector();
1584	2082	cVector v2 = new cVector();
..	..	@@ -1587,11 +2085,11 @@
1587	2085	objEditor.cameraView.renderCamera.setAim(v2, v1);
1588	2086	objEditor.cameraView.repaint();
1589	2087	} else
1590		- if (source == rectoidItem)
	2088	+ if (source == rectoidItem \|\| source == boxButton)
1591	2089	{
1592	2090	makeSomething(new Box());
1593	2091	} else
1594		- if (source == particleItem)
	2092	+ if (source == particleItem \|\| source == particlesButton)
1595	2093	{
1596	2094	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1597	2095	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1670,27 +2168,27 @@
1670	2168
1671	2169	makeSomething(obj);
1672	2170	} else
1673		- if (source == gridItem)
	2171	+ if (source == gridItem \|\| source == gridButton)
1674	2172	{
1675	2173	makeSomething(new Grid());
1676	2174	} else
1677		- if (source == ellipsoidItem)
	2175	+ if (source == ellipsoidItem \|\| source == sphereButton)
1678	2176	{
1679	2177	makeSomething(new Sphere());
1680	2178	} else
1681		- if (source == coneItem)
	2179	+ if (source == coneItem \|\| source == coneButton)
1682	2180	{
1683	2181	makeSomething(new Cone());
1684	2182	} else
1685		- if (source == torusItem)
	2183	+ if (source == torusItem \|\| source == torusButton)
1686	2184	{
1687	2185	makeSomething(new Torus());
1688	2186	} else
1689		- if (source == superItem)
	2187	+ if (source == superItem \|\| source == superButton)
1690	2188	{
1691	2189	makeSomething(new Superellipsoid());
1692	2190	} else
1693		- if (source == kleinItem)
	2191	+ if (source == kleinItem \|\| source == kleinButton)
1694	2192	{
1695	2193	makeSomething(new Klein());
1696	2194	} else
..	..	@@ -1710,7 +2208,7 @@
1710	2208	{
1711	2209	makeSomething(new BezierSurface());
1712	2210	} else
1713		- if (source == overlayItem)
	2211	+ if (source == overlayItem \|\| source == overlayButton)
1714	2212	{
1715	2213	/*
1716	2214	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1758,10 +2256,27 @@
1758	2256	s.setup();
1759	2257	makeSomething(s);
1760	2258	} else
1761		- if (source == lightItem)
	2259	+ if (source == lightItem \|\| source == lightButton)
1762	2260	{
1763	2261	makeSomething(new Light());
1764	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
1765	2280	if (source == csgItem)
1766	2281	{
1767	2282	group(new CSG());
..	..	@@ -1808,30 +2323,30 @@
1808	2323
1809	2324	group(g);
1810	2325	} else
1811		- if (source == loopItem)
	2326	+ if (source == loopItem \|\| source == loopButton)
1812	2327	{
1813	2328	Composite csg = new GroupLeaf();
1814	2329	csg.count = 5;
1815	2330	group(csg);
1816		- Composite child = new cGroup();
	2331	+ Composite child = new cGroup("Branch");
1817	2332	csg.addChild(child);
1818	2333	child.addChild(csg);
1819	2334	} else
1820	2335	if (source == doubleItem)
1821	2336	{
1822		- Composite csg = new GroupLeaf();
	2337	+ Composite csg = new GroupLeaf("Fork");
1823	2338	csg.count = 5;
1824	2339	group(csg);
1825		- Composite child = new cGroup();
	2340	+ Composite child = new cGroup("Branch A");
1826	2341	csg.addChild(child);
1827	2342	child.addChild(csg);
1828		- child = new cGroup();
	2343	+ child = new cGroup("Branch B");
1829	2344	csg.addChild(child);
1830	2345	child.addChild(csg);
1831	2346	} else
1832	2347	if (source == tripleItem)
1833	2348	{
1834		- Composite csg = new GroupLeaf();
	2349	+ Composite csg = new GroupLeaf("Trident");
1835	2350	csg.count = 4;
1836	2351	group(csg);
1837	2352	Composite child = new cGroup();
..	..	@@ -1844,27 +2359,10 @@
1844	2359	csg.addChild(child);
1845	2360	child.addChild(csg);
1846	2361	} else
1847		-
1848		- if (source == importGFDItem)
1849		- {
1850		- ImportGFD();
1851		- } else
1852		- if (source == importVRMLX3DItem)
1853		- {
1854		- ImportVRMLX3D();
1855		- } else
1856		- if (source == import3DSItem)
1857		- {
1858		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1859		- } else
1860		- if (source == importOBJItem)
1861		- {
1862		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1863		- } else
1864	2362	if (source == computeAOItem)
1865	2363	{
1866	2364	Globals.drawMode = CameraPane.OCCLUSION;
1867		- Globals.theRenderer.repaint();
	2365	+ cameraView.repaint();
1868	2366	} else
1869	2367	if (source == recompileItem)
1870	2368	{
..	..	@@ -1879,7 +2377,7 @@
1879	2377	if (source == invariantsItem)
1880	2378	{
1881	2379	System.out.println("Invariants:");
1882		- GrafreeD.grafreeD.universe.invariants();
	2380	+ Grafreed.grafreeD.universe.invariants();
1883	2381	} else
1884	2382	if (source == memoryItem)
1885	2383	{
..	..	@@ -1898,6 +2396,46 @@
1898	2396	{
1899	2397	DumpObject();
1900	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
1901	2439	if (source == oneStepButton)
1902	2440	{
1903	2441	Globals.ONESTEP = true;
..	..	@@ -1905,17 +2443,14 @@
1905	2443	} else
1906	2444	if (source == screenfitButton)
1907	2445	{
1908		- //Reload(lastConverter, lastFilename, true);
1909	2446	ScreenFit();
1910	2447	} else
1911	2448	if (source == screenfitpointButton)
1912	2449	{
1913		- //Reload(lastConverter, lastFilename, true);
1914	2450	ScreenFitPoint();
1915	2451	} else
1916	2452	if (source == snapobjectButton)
1917	2453	{
1918		- //Reload(lastConverter, lastFilename, true);
1919	2454	SnapObject();
1920	2455	} else
1921	2456	// if (event.getSource() == recompileButton)
..	..	@@ -1952,12 +2487,20 @@
1952	2487	{
1953	2488	loadClipboard(true);
1954	2489	} else
	2490	+ if (source == undoItem)
	2491	+ {
	2492	+ Undo();
	2493	+ } else
	2494	+ if (source == redoItem)
	2495	+ {
	2496	+ Redo();
	2497	+ } else
1955	2498	if (source == duplicateItem)
1956	2499	{
1957		- Object3D keep = GrafreeD.clipboard;
	2500	+ Object3D keep = Grafreed.clipboard;
1958	2501	loadClipboard(false);
1959	2502	paste(false);
1960		- GrafreeD.clipboard = keep;
	2503	+ Grafreed.clipboard = keep;
1961	2504	} else
1962	2505	if (source == cloneItem)
1963	2506	{
..	..	@@ -2177,9 +2720,9 @@
2177	2720	// group.selection.get(0).setMasterThis(content); // should be identity
2178	2721	// refreshContents();
2179	2722	// }
2180		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2723	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2181	2724	{
2182		- Object3D content = GrafreeD.clipboard.get(0);
	2725	+ Object3D content = Grafreed.clipboard.get(0);
2183	2726
2184	2727	if (content instanceof cGroup && ((cGroup)content).transientlink )
2185	2728	content = ((cGroup)content).get(0);
..	..	@@ -2229,9 +2772,9 @@
2229	2772	} else
2230	2773	if (source == setMasterItem)
2231	2774	{
2232		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2775	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2233	2776	{
2234		- Object3D content = GrafreeD.clipboard.get(0);
	2777	+ Object3D content = Grafreed.clipboard.get(0);
2235	2778
2236	2779	if (content instanceof cGroup && ((cGroup)content).transientlink )
2237	2780	content = ((cGroup)content).get(0);
..	..	@@ -2244,9 +2787,9 @@
2244	2787	{
2245	2788	if (group.selection.size() == 1)
2246	2789	{
2247		- if (GrafreeD.clipboard.size() == 1)
	2790	+ if (Grafreed.clipboard.size() == 1)
2248	2791	{
2249		- Object3D content = GrafreeD.clipboard.get(0);
	2792	+ Object3D content = Grafreed.clipboard.get(0);
2250	2793
2251	2794	if (content instanceof cGroup && ((cGroup)content).transientlink )
2252	2795	content = ((cGroup)content).get(0);
..	..	@@ -2263,7 +2806,7 @@
2263	2806	{
2264	2807	RevertMeshes();
2265	2808	} else
2266		- if (source == resetMeshItem)
	2809	+ if (source == resetAllItem)
2267	2810	{
2268	2811	ResetAll();
2269	2812	} else
..	..	@@ -2271,7 +2814,7 @@
2271	2814	{
2272	2815	StepAll();
2273	2816	} else
2274		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2817	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2275	2818	{
2276	2819	//int indices[] = jList.getSelectedIndices();
2277	2820	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2283,9 +2826,9 @@
2283	2826	{
2284	2827	ClearSelection(true);
2285	2828	} else
2286		- if (source == grabItem)
	2829	+ if (source == grabItem \|\| source == groupButton)
2287	2830	{
2288		- group(new cGroup(), true);
	2831	+ group(new cGroup(), false); // true);
2289	2832	} else
2290	2833	if (source == hideItem)
2291	2834	{
..	..	@@ -2303,11 +2846,11 @@
2303	2846	{
2304	2847	makeSomething(new Camera());
2305	2848	} else
2306		- if (source == compositeItem)
	2849	+ if (source == compositeItem \|\| source == compositeButton)
2307	2850	{
2308	2851	group(new Composite());
2309	2852	} else
2310		- if (source == randomItem)
	2853	+ if (source == switchItem \|\| source == switchButton)
2311	2854	{
2312	2855	RandomNode random = new RandomNode();
2313	2856	group(random);
..	..	@@ -2409,7 +2952,7 @@
2409	2952	{
2410	2953	group(new cLinker());
2411	2954	} else
2412		- if (source == textureItem)
	2955	+ if (source == textureItem \|\| source == textureButton)
2413	2956	{
2414	2957	group(new TextureNode());
2415	2958	} else
..	..	@@ -2429,17 +2972,30 @@
2429	2972	{
2430	2973	CastShadow(2);
2431	2974	} else
2432		- if (source == ungroupItem)
	2975	+ if (source == ungroupItem \|\| source == ungroupButton)
2433	2976	{
2434		- //ungroup();
	2977	+ boolean hasRoot = false;
	2978	+
2435	2979	for (int i=0; i<group.selection.size(); i++)
2436	2980	{
2437		- Ungroup(group.selection.get(i));
	2981	+ if (group.selection.get(i) == group)
	2982	+ {
	2983	+ hasRoot = true;
	2984	+ break;
	2985	+ }
2438	2986	}
2439	2987
2440		- ClearSelection(false);
2441		-
2442		- 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	+ }
2443	2999	} else
2444	3000	if (source == genUVItem)
2445	3001	{
..	..	@@ -2451,7 +3007,7 @@
2451	3007	} else
2452	3008	if (source == genNormalsMESHItem)
2453	3009	{
2454		- GenNormals(true); // TODO
	3010	+ GenNormalsMESH();
2455	3011	} else
2456	3012	if (source == genNormalsORGANItem)
2457	3013	{
..	..	@@ -2516,6 +3072,22 @@
2516	3072	if (source == unmarkleavesItem)
2517	3073	{
2518	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);
2519	3091	} else
2520	3092	if (source == flipVItem)
2521	3093	{
..	..	@@ -2601,9 +3173,13 @@
2601	3173	{
2602	3174	SmoothMesh();
2603	3175	} else
2604		- if (source == transformgeometryItem)
	3176	+ if (source == transformGeometryItem)
2605	3177	{
2606	3178	TransformGeometry();
	3179	+ } else
	3180	+ if (source == transformChildrenItem)
	3181	+ {
	3182	+ TransformChildren();
2607	3183	} else
2608	3184	if (source == resetTransformItem)
2609	3185	{
..	..	@@ -2611,7 +3187,11 @@
2611	3187	} else
2612	3188	if (source == resetCentroidItem)
2613	3189	{
2614		- ResetCentroid();
	3190	+ ResetCentroid(true);
	3191	+ } else
	3192	+ if (source == resetCentroidXZItem)
	3193	+ {
	3194	+ ResetCentroid(false);
2615	3195	} else
2616	3196	if (source == resetParentItem)
2617	3197	{
..	..	@@ -2716,7 +3296,7 @@
2716	3296	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2717	3297	{
2718	3298	obj = (Object3D)e.nextElement();
2719		- obj.SetBumpTexture(null);
	3299	+ obj.ResetBumpTexture();
2720	3300	}
2721	3301
2722	3302	refreshContents();
..	..	@@ -2732,6 +3312,31 @@
2732	3312
2733	3313	refreshContents();
2734	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
2735	3340	if (source == flashSelectionButton)
2736	3341	{
2737	3342	CameraPane.flash = true;
..	..	@@ -2743,6 +3348,10 @@
2743	3348	if (source == twoButton)
2744	3349	{
2745	3350	radio.layout = twoButton;
	3351	+
	3352	+ if (CameraPane.FULLSCREEN)
	3353	+ fullscreenLayout = radio.layout;
	3354	+
2746	3355	// bug
2747	3356	//gridPanel.setDividerLocation(1.0);
2748	3357	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2775,10 +3384,31 @@
2775	3384	bigThree.ClearUI();
2776	3385	bigThree.add(centralPanel);
2777	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	+
2778	3405	} else
2779	3406	if (source == threeButton)
2780	3407	{
2781	3408	radio.layout = threeButton;
	3409	+
	3410	+ if (CameraPane.FULLSCREEN)
	3411	+ fullscreenLayout = radio.layout;
2782	3412
2783	3413	// bigThree.remove(scenePanel);
2784	3414	// bigThree.remove(centralPanel);
..	..	@@ -2808,13 +3438,18 @@
2808	3438	// centralPanel.setVisible(true);
2809	3439	// XYZPanel.setVisible(true);
2810	3440	bigThree.ClearUI();
	3441	+ bigThree.add(scenePanel);
2811	3442	bigThree.add(centralPanel);
2812		- bigThree.add(XYZPanel);
2813	3443	bigThree.FlushUI();
	3444	+
	3445	+ cameraView.requestFocusInWindow();
2814	3446	} else
2815	3447	if (source == fourButton)
2816	3448	{
2817	3449	radio.layout = fourButton;
	3450	+
	3451	+ if (CameraPane.FULLSCREEN)
	3452	+ fullscreenLayout = radio.layout;
2818	3453
2819	3454	// bigThree.remove(scenePanel);
2820	3455	// bigThree.remove(centralPanel);
..	..	@@ -2846,10 +3481,15 @@
2846	3481	bigThree.ClearUI();
2847	3482	bigThree.add(scenePanel);
2848	3483	bigThree.FlushUI();
	3484	+
	3485	+ cameraView.requestFocusInWindow();
2849	3486	} else
2850	3487	if (source == sixButton)
2851	3488	{
2852	3489	radio.layout = sixButton;
	3490	+
	3491	+ if (CameraPane.FULLSCREEN)
	3492	+ fullscreenLayout = radio.layout;
2853	3493
2854	3494	// bigThree.remove(scenePanel);
2855	3495	// bigThree.remove(centralPanel);
..	..	@@ -2879,13 +3519,18 @@
2879	3519	// centralPanel.setVisible(true);
2880	3520	// XYZPanel.setVisible(false);
2881	3521	bigThree.ClearUI();
2882		- bigThree.add(scenePanel);
2883	3522	bigThree.add(centralPanel);
	3523	+ bigThree.add(scenePanel);
2884	3524	bigThree.FlushUI();
	3525	+
	3526	+ cameraView.requestFocusInWindow();
2885	3527	} else
2886	3528	if (source == sevenButton)
2887	3529	{
2888	3530	radio.layout = sevenButton;
	3531	+
	3532	+ if (CameraPane.FULLSCREEN)
	3533	+ fullscreenLayout = radio.layout;
2889	3534
2890	3535	// bigThree.remove(scenePanel);
2891	3536	// bigThree.remove(centralPanel);
..	..	@@ -2919,6 +3564,8 @@
2919	3564	bigThree.add(centralPanel);
2920	3565	bigThree.add(XYZPanel);
2921	3566	bigThree.FlushUI();
	3567	+
	3568	+ cameraView.requestFocusInWindow();
2922	3569	} else
2923	3570	if (source == rootButton)
2924	3571	{
..	..	@@ -2930,6 +3577,7 @@
2930	3577	EditObject(obj);
2931	3578	}
2932	3579
	3580	+ cameraView.requestFocusInWindow();
2933	3581	refreshContents(true);
2934	3582	} else
2935	3583	if (source == closeButton)
..	..	@@ -2939,22 +3587,37 @@
2939	3587	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2940	3588	{
2941	3589	ab = (cRadio)e.nextElement();
2942		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3590	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2943	3591	{
	3592	+ // Patch to avoid bug with transparency.
	3593	+ if (!ab.hadMaterial)
	3594	+ {
	3595	+ ab.object.material = null;
	3596	+ }
	3597	+
2944	3598	buttonGroup.remove(ab);
2945	3599	radioPanel.remove(ab);
2946	3600
2947		- ab.GetObject().editWindow = null;
	3601	+ //ab.GetObject().editWindow = null;
	3602	+ ab.GetObject().manipWindow = null;
2948	3603	// ab.GetObject().objectUI = null; // ?????????
2949	3604
2950	3605	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2951	3606	break;
2952	3607	}
2953	3608	}
	3609	+
	3610	+ cameraView.requestFocusInWindow();
2954	3611	refreshContents(true);
2955	3612	} else
2956	3613	if (source == editItem \|\| source == editButton)
2957	3614	{
	3615	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3616	+ {
	3617	+ Object3D child = (Object3D)e.nextElement();
	3618	+ child.pinned = true;
	3619	+ }
	3620	+
2958	3621	EditSelection(false);
2959	3622	} else
2960	3623	if (source == uneditButton)
..	..	@@ -2964,10 +3627,11 @@
2964	3627	Object3D child = (Object3D)e.nextElement();
2965	3628	if(child.editWindow != null)
2966	3629	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3630	+ child.pinned = false;
2967	3631	child.CloseUI();
2968	3632	listUI.remove(child);
2969	3633
2970		- child.editWindow = null; // ???????????
	3634	+ //child.editWindow = null; // ???????????
2971	3635	}
2972	3636	objEditor.ctrlPanel.FlushUI();
2973	3637	//objEditor.jTree.clearSelection();
..	..	@@ -2980,6 +3644,7 @@
2980	3644	//copy.ClearUI();
2981	3645	for (Object3D obj : listUI)
2982	3646	{
	3647	+ obj.pinned = false;
2983	3648	obj.CloseUI();
2984	3649	}
2985	3650	listUI.clear();
..	..	@@ -2989,7 +3654,7 @@
2989	3654	{
2990	3655	assert(copy == group);
2991	3656
2992		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3657	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2993	3658
2994	3659	for (Object3D obj : listUI)
2995	3660	{
..	..	@@ -3038,6 +3703,9 @@
3038	3703	}
3039	3704
3040	3705	copy = group;
	3706	+
	3707	+ SetUndoStates();
	3708	+
3041	3709	//Globals.theRenderer.object = group;
3042	3710	if(!useclient)
3043	3711	{
..	..	@@ -3053,20 +3721,46 @@
3053	3721	frontView.object = group;
3054	3722	sideView.object = group;
3055	3723	}
3056		- group.editWindow = this;
	3724	+
	3725	+// fix "+" issue
	3726	+ //group.editWindow = this;
	3727	+ group.manipWindow = this;
	3728	+
3057	3729	/*
3058	3730	currentLayout = radio.layout;
3059	3731	if (currentLayout == null)
3060	3732	currentLayout = sevenButton;
3061	3733	*/
3062	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);
3063	3742	keepparent = group.parent;
3064	3743	// PARENT = NULL or not???
3065	3744	//group.parent = null; // ROOT
3066	3745	//group.attributes = -1;
3067	3746	ResetModel();
	3747	+
	3748	+ cameraView.requestFocusInWindow();
3068	3749	refreshContents(true);
3069		- }
	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	+ }
3070	3764	else
3071	3765	{
3072	3766	//return super.action(event, arg);
..	..	@@ -3075,7 +3769,6 @@
3075	3769	}
3076	3770
3077	3771	boolean useclient = false;
3078		- cRadio radio;
3079	3772
3080	3773	void ToggleRoot()
3081	3774	{
..	..	@@ -3127,6 +3820,28 @@
3127	3820	refreshContents();
3128	3821	}
3129	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	+ }
3130	3845
3131	3846	void ResetTransform()
3132	3847	{
..	..	@@ -3239,7 +3954,7 @@
3239	3954	refreshContents();
3240	3955	}
3241	3956
3242		- void ResetCentroid()
	3957	+ void ResetCentroid(boolean full)
3243	3958	{
3244	3959	Object3D obj;
3245	3960	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3254,12 +3969,16 @@
3254	3969	LA.matIdentity(Object3D.mat);
3255	3970	obj.getBounds(minima, maxima, false);
3256	3971	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3257		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3972	+ if (full)
	3973	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3258	3974	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3259	3975	obj.TransformMesh(Object3D.mat);
	3976	+
3260	3977	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3261		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3978	+ if (full)
	3979	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3262	3980	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3981	+
3263	3982	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3264	3983	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3265	3984	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3288,7 +4007,8 @@
3288	4007
3289	4008	int size = obj.MemorySize();
3290	4009
3291		- 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)");
3292	4012	}
3293	4013	}
3294	4014	catch (Exception e)
..	..	@@ -3325,9 +4045,9 @@
3325	4045	obj = (Object3D)e.nextElement();
3326	4046
3327	4047	System.out.println("Object is: " + obj);
3328		- GrafreeD.AnalyzeObject(obj);
	4048	+ Grafreed.AnalyzeObject(obj);
3329	4049	System.out.println("Boundary rep: " + obj.bRep);
3330		- GrafreeD.AnalyzeObject(obj.bRep);
	4050	+ Grafreed.AnalyzeObject(obj.bRep);
3331	4051
3332	4052	// System.err.println((size/1024) + " KB is the size of " + obj);
3333	4053	}
..	..	@@ -3369,6 +4089,13 @@
3369	4089	void GenNormals(boolean crease)
3370	4090	{
3371	4091	group.GenNormalsS(crease);
	4092	+
	4093	+ refreshContents();
	4094	+ }
	4095	+
	4096	+ void GenNormalsMESH()
	4097	+ {
	4098	+ group.GenNormalsMeshS();
3372	4099
3373	4100	refreshContents();
3374	4101	}
..	..	@@ -3541,8 +4268,8 @@
3541	4268
3542	4269	void ParseVertices()
3543	4270	{
3544		- boolean epsequal = GrafreeD.epsequal;
3545		- GrafreeD.epsequal = true;
	4271	+ boolean epsequal = Grafreed.epsequal;
	4272	+ Grafreed.epsequal = true;
3546	4273
3547	4274	for (int i=0; i<group.selection.size(); i++)
3548	4275	{
..	..	@@ -3567,7 +4294,7 @@
3567	4294	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3568	4295	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3569	4296
3570		- g.add(GrafreeD.clipboard);
	4297	+ g.add(Grafreed.clipboard);
3571	4298
3572	4299	buffer.add(g);
3573	4300	}
..	..	@@ -3582,7 +4309,7 @@
3582	4309	makeSomething(buffer, i==group.selection.size()-1);
3583	4310	}
3584	4311
3585		- GrafreeD.epsequal = epsequal;
	4312	+ Grafreed.epsequal = epsequal;
3586	4313
3587	4314	refreshContents();
3588	4315	}
..	..	@@ -3600,7 +4327,16 @@
3600	4327	String pigment = Object3D.GetPigment(tex);
3601	4328	//String bump = Object3D.GetBump(tex);
3602	4329
3603		- 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	+ }
3604	4340
3605	4341	double s = v.s;
3606	4342
..	..	@@ -3732,7 +4468,7 @@
3732	4468	return;
3733	4469
3734	4470	Object3D poses = group.selection.get(0);
3735		- Object3D ref = GrafreeD.clipboard.get(0);
	4471	+ Object3D ref = Grafreed.clipboard.get(0);
3736	4472
3737	4473	Object3D newgroup = new Object3D("Po:" + poses.name);
3738	4474
..	..	@@ -3926,9 +4662,9 @@
3926	4662
3927	4663	void ClipMesh()
3928	4664	{
3929		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4665	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3930	4666	{
3931		- Object3D content = GrafreeD.clipboard.get(0);
	4667	+ Object3D content = Grafreed.clipboard.get(0);
3932	4668
3933	4669	if (content instanceof cGroup && ((cGroup)content).transientlink )
3934	4670	content = ((cGroup)content).get(0);
..	..	@@ -3937,7 +4673,7 @@
3937	4673	// {
3938	4674	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3939	4675	// }
3940		- group.selection.ClipMesh(GrafreeD.clipboard);
	4676	+ group.selection.ClipMesh(Grafreed.clipboard);
3941	4677	}
3942	4678	// group.selection.ClipMesh(GrafreeD.clipboard);
3943	4679	System.out.println("DONE.");
..	..	@@ -3984,6 +4720,18 @@
3984	4720	void MarkLeaves(boolean hide)
3985	4721	{
3986	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);
3987	4735	refreshContents();
3988	4736	}
3989	4737
..	..	@@ -4058,28 +4806,25 @@
4058	4806	// }
4059	4807	// }
4060	4808
4061		- static boolean allparams = true;
4062		-
4063		- static Vector<Object3D> listUI = new Vector<Object3D>();
4064		-
4065	4809	void EditSelection(boolean newWindow)
4066	4810	{
	4811	+ if (group.selection == null)
	4812	+ {
	4813	+ EditElement(group, newWindow); // ? new
	4814	+ return;
	4815	+ }
	4816	+
4067	4817	// aConstraints.gridy = 0;
4068	4818	for (int i=0; i<group.selection.size(); i++)
4069	4819	{
4070	4820	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4071	4821	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4072		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4822	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4073	4823
4074	4824	Object3D elem = (Object3D)group.selection.elementAt(i);
4075		- if(elem != group)
	4825	+ if(elem != group \|\| !newWindow)
4076	4826	{
4077		- // if (!(elem instanceof Composite))
4078		- // newWindow = false;
4079		- listUI.add(elem);
4080		- elem.openEditWindow(this, newWindow); //, false);
4081		- System.out.println("edit : " + elem);
4082		- elem.editWindow.refreshContents(true); // ? new
	4827	+ EditElement(elem, newWindow); // ? new
4083	4828	}
4084	4829	}
4085	4830	}
..	..	@@ -4154,7 +4899,8 @@
4154	4899	//new Exception().printStackTrace();
4155	4900
4156	4901	freezemodel = true;
4157		-
	4902	+ ClearUnpinned();
	4903	+
4158	4904	/**/
4159	4905	//switch (event.id)
4160	4906	{
..	..	@@ -4162,7 +4908,6 @@
4162	4908	//case 702: // Event.LIST_DESELECT
4163	4909	group.deselectAll();
4164	4910	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4165		- objEditor.ClearInfo(); // .GetMaterial());
4166	4911	if (tps != null)
4167	4912	{
4168	4913	for (int i=0; i < tps.length; i++)
..	..	@@ -4171,10 +4916,8 @@
4171	4916
4172	4917	//if (child.parent != null)
4173	4918	//child.parent.addSelectee(child);
	4919	+ objEditor.SetMaterial(child);
4174	4920	group.addSelectee(child);
4175		- objEditor.SetMaterial(child); // .GetMaterial());
4176		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4177		- System.err.println("info : " + child.GetPath());
4178	4921	}
4179	4922	}
4180	4923	// else
..	..	@@ -4184,20 +4927,28 @@
4184	4927	// System.err.println("info : " + group.GetPath());
4185	4928	// }
4186	4929
4187		- objEditor.SetText(); // jan 2014
4188		-
4189		- 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))
4190	4931	CameraPane.flash = true;
4191	4932
4192		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4933	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4193	4934	// a camera
4194	4935	{
4195		- CameraPane.camerachangeframe = 0; // don't refuse it
4196		- 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	+ }
4197	4941	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4198	4942	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4199	4943	}
4200	4944
	4945	+ if (tps != null && tps.length == 1)
	4946	+ {
	4947	+ EditSelection(false);
	4948	+ }
	4949	+
	4950	+ SetPinStates(tps != null && tps.length > 0);
	4951	+
4201	4952	refreshContents();
4202	4953	//return true;
4203	4954	}
..	..	@@ -4206,6 +4957,35 @@
4206	4957
4207	4958	freezemodel = false;
4208	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	+ }
4209	4989
4210	4990	void linkSomething(Object3D thing)
4211	4991	{
..	..	@@ -4277,16 +5057,19 @@
4277	5057	{
4278	5058	if (group.selection.isEmpty())
4279	5059	return;
4280		- GrafreeD.clipboardIsTempGroup = false;
	5060	+
	5061	+ Grafreed.clipboardIsTempGroup = false;
4281	5062	Composite tGroup = null;
4282	5063	if (group.selection.size() > 0) // 1)
4283	5064	{
4284	5065	tGroup = new cGroup();
4285		- GrafreeD.clipboardIsTempGroup = true;
	5066	+ Grafreed.clipboardIsTempGroup = true;
4286	5067	}
4287	5068
4288	5069	if (cut)
4289	5070	{
	5071	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5072	+// Save();
4290	5073	//int indices[] = jList.getSelectedIndices();
4291	5074	//for (int i = indices.length - 1; i >= 0; i--)
4292	5075	//jList.remove(indices[i]);
..	..	@@ -4322,16 +5105,16 @@
4322	5105	//System.out.println("cut " + child);
4323	5106	//System.out.println("parent = " + child.parent);
4324	5107	// tmp.addChild(child);
4325		- if (GrafreeD.clipboardIsTempGroup)
	5108	+ if (Grafreed.clipboardIsTempGroup)
4326	5109	tGroup.add/Child/(tmp);
4327	5110	else
4328		- GrafreeD.clipboard = tmp;
	5111	+ Grafreed.clipboard = tmp;
4329	5112	}
4330	5113	else
4331		- if (GrafreeD.clipboardIsTempGroup)
	5114	+ if (Grafreed.clipboardIsTempGroup)
4332	5115	tGroup.add/Child/(child);
4333	5116	else
4334		- GrafreeD.clipboard = child;
	5117	+ Grafreed.clipboard = child;
4335	5118	}
4336	5119
4337	5120	//ResetModel();
..	..	@@ -4363,21 +5146,23 @@
4363	5146	//System.out.println("cut " + elem);
4364	5147	//System.out.println("parent = " + elem.parent);
4365	5148	// tmp.addChild(elem);
4366		- if (GrafreeD.clipboardIsTempGroup)
	5149	+ if (Grafreed.clipboardIsTempGroup)
4367	5150	tGroup.add/Child/(tmp);
4368	5151	else
4369		- GrafreeD.clipboard = tmp;
	5152	+ Grafreed.clipboard = tmp;
4370	5153	}
4371	5154	else
4372		- if (GrafreeD.clipboardIsTempGroup)
	5155	+ if (Grafreed.clipboardIsTempGroup)
4373	5156	tGroup.add/Child/(child);
4374	5157	else
4375		- GrafreeD.clipboard = child;
	5158	+ Grafreed.clipboard = child;
4376	5159	}
4377	5160
4378	5161	}
4379		- if (GrafreeD.clipboardIsTempGroup)
4380		- GrafreeD.clipboard = tGroup;
	5162	+
	5163	+ if (Grafreed.clipboardIsTempGroup)
	5164	+ Grafreed.clipboard = tGroup;
	5165	+
4381	5166	if (cut)
4382	5167	{
4383	5168	ResetModel();
..	..	@@ -4387,11 +5172,15 @@
4387	5172
4388	5173	void paste(boolean expand)
4389	5174	{
	5175	+ if (Globals.REPLACEONMAKE)
	5176	+ Save();
	5177	+ boolean keep = Globals.REPLACEONMAKE;
	5178	+ Globals.REPLACEONMAKE = false;
4390	5179	// if (GrafreeD.clipboard == null)
4391	5180	// return;
4392	5181	boolean first = true;
4393	5182
4394		- if (GrafreeD.clipboardIsTempGroup)
	5183	+ if (Grafreed.clipboardIsTempGroup)
4395	5184	{
4396	5185	Composite temp;
4397	5186
..	..	@@ -4402,7 +5191,7 @@
4402	5191	temp = (Composite)Applet3D.clipboard.deepCopy();
4403	5192	*/
4404	5193	Object3D elem;
4405		- 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))
4406	5195	{
4407	5196	Object3D child = (Object3D)e.nextElement();
4408	5197
..	..	@@ -4436,16 +5225,17 @@
4436	5225	//Object3D cb = Applet3D.clipboard;
4437	5226	//temp.addChild(cb);
4438	5227	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4439		- assert(GrafreeD.clipboard.parent == null);
4440		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4441		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4442		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4443		- 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());
4444	5233	else
4445		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4446		- GrafreeD.clipboard.get(0).parent = keepparent;
	5234	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5235	+ Grafreed.clipboard.get(0).parent = keepparent;
4447	5236	}
4448	5237
	5238	+ Globals.REPLACEONMAKE = keep;
4449	5239	ResetModel();
4450	5240	refreshContents();
4451	5241	}
..	..	@@ -4492,9 +5282,9 @@
4492	5282	{
4493	5283	boolean first = true;
4494	5284
4495		- if (GrafreeD.clipboardIsTempGroup)
	5285	+ if (Grafreed.clipboardIsTempGroup)
4496	5286	{
4497		- Composite temp = (Composite)GrafreeD.clipboard;
	5287	+ Composite temp = (Composite)Grafreed.clipboard;
4498	5288	Object3D copy;
4499	5289	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4500	5290	{
..	..	@@ -4504,7 +5294,7 @@
4504	5294	}
4505	5295	} else
4506	5296	{
4507		- linkSomething(GrafreeD.clipboard); //.get(0));
	5297	+ linkSomething(Grafreed.clipboard); //.get(0));
4508	5298	}
4509	5299	}
4510	5300	}
..	..	@@ -4581,6 +5371,10 @@
4581	5371
4582	5372	void group(Object3D csg, boolean grab)
4583	5373	{
	5374	+ if (Globals.REPLACEONMAKE)
	5375	+ Save();
	5376	+ boolean keep = Globals.REPLACEONMAKE;
	5377	+ Globals.REPLACEONMAKE = false;
4584	5378	if (//false) // why??
4585	5379	!group.selection.isEmpty())
4586	5380	{
..	..	@@ -4694,10 +5488,15 @@
4694	5488	//node.add(csg);
4695	5489	//makeSomething(node);
4696	5490	makeSomething(csg);
	5491	+ Globals.REPLACEONMAKE = keep;
4697	5492	}
4698	5493
4699	5494	void Ungroup(Object3D g)
4700	5495	{
	5496	+ if (Globals.REPLACEONMAKE)
	5497	+ Save();
	5498	+ boolean keep = Globals.REPLACEONMAKE;
	5499	+ Globals.REPLACEONMAKE = false;
4701	5500	if (g instanceof HiddenObject)
4702	5501	{
4703	5502	HiddenObject h = (HiddenObject) g;
..	..	@@ -4714,6 +5513,7 @@
4714	5513	objEditor.makeSomething(g.get(i), false);
4715	5514	}
4716	5515	}
	5516	+ Globals.REPLACEONMAKE = keep;
4717	5517	}
4718	5518
4719	5519	void ungroup()
..	..	@@ -4909,21 +5709,6 @@
4909	5709	}
4910	5710	*/
4911	5711
4912		- void ImportGFD()
4913		- {
4914		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4915		- browser.show();
4916		- String filename = browser.getFile();
4917		- if (filename != null && filename.length() > 0)
4918		- {
4919		- String fullname = browser.getDirectory() + filename;
4920		-
4921		- //Object3D readobj =
4922		- objEditor.ReadGFD(fullname, objEditor);
4923		- //makeSomething(readobj);
4924		- }
4925		- }
4926		-
4927	5712	/*
4928	5713	public void Callback(Object obj)
4929	5714	{
..	..	@@ -4947,26 +5732,9 @@
4947	5732	}
4948	5733	*/
4949	5734
4950		- void ImportVRMLX3D()
4951		- {
4952		- if (GrafreeD.standAlone)
4953		- {
4954		- /**/
4955		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4956		- browser.show();
4957		- String filename = browser.getFile();
4958		- if (filename != null && filename.length() > 0)
4959		- {
4960		- String fullname = browser.getDirectory() + filename;
4961		- LoadVRMLX3D(fullname);
4962		- }
4963		- /**/
4964		- }
4965		- }
4966		-
4967	5735	String GetFile(String dialogName)
4968	5736	{
4969		- if (GrafreeD.standAlone)
	5737	+ if (Grafreed.standAlone)
4970	5738	{
4971	5739	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4972	5740	browser.show();
..	..	@@ -5034,7 +5802,44 @@
5034	5802	cButton clearpanelButton;
5035	5803	cButton unselectButton;
5036	5804
	5805	+ cButton restoreCameraButton;
	5806	+
	5807	+ cButton saveButton;
5037	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;
5038	5843
5039	5844	cButton screenfitButton;
5040	5845	cButton screenfitpointButton;
..	..	@@ -5047,14 +5852,6 @@
5047	5852
5048	5853	cButton setsupportButton;
5049	5854
5050		- cButton twoButton;
5051		- cButton sixButton;
5052		- cButton threeButton;
5053		- cButton sevenButton;
5054		- cButton fourButton; // full panel
5055		- cButton oneButton; // full XYZ
5056		- //cButton currentLayout;
5057		-
5058	5855	//
5059	5856	//Composite
5060	5857	Object3D // to do !!
..	..	@@ -5064,9 +5861,11 @@
5064	5861	//JTree jTree;
5065	5862	private MenuItem lookAtItem;
5066	5863	private MenuItem lookFromItem;
5067		- private MenuItem switchItem;
	5864	+ private MenuItem switchViewItem;
5068	5865	private MenuItem cutItem;
5069		- private MenuItem duplicateItem;
	5866	+ private MenuItem undoItem;
	5867	+ private MenuItem redoItem;
	5868	+ private JMenuItem duplicateItem;
5070	5869	private MenuItem cloneItem;
5071	5870	private MenuItem cloneSupportItem;
5072	5871	private MenuItem overwriteGeoItem;
..	..	@@ -5079,7 +5878,7 @@
5079	5878	private MenuItem linkverticesItem;
5080	5879	private MenuItem relinkverticesItem;
5081	5880	private MenuItem setMasterItem;
5082		- private MenuItem resetMeshItem;
	5881	+ private MenuItem resetAllItem;
5083	5882	private MenuItem stepAllItem;
5084	5883	private MenuItem revertMeshItem;
5085	5884	private MenuItem poseMeshItem;
..	..	@@ -5094,7 +5893,7 @@
5094	5893	private MenuItem pasteLinkItem;
5095	5894	private MenuItem pasteCloneItem;
5096	5895	private MenuItem pasteExpandItem;
5097		- private MenuItem clearItem;
	5896	+ private MenuItem deleteItem;
5098	5897	private MenuItem clearAllItem;
5099	5898	private MenuItem genUVItem;
5100	5899	private MenuItem genNormalsMESHItem;
..	..	@@ -5129,6 +5928,10 @@
5129	5928	private MenuItem showleavesItem;
5130	5929	private MenuItem markleavesItem;
5131	5930	private MenuItem unmarkleavesItem;
	5931	+ private MenuItem rewindleavesItem;
	5932	+ private MenuItem unrewindleavesItem;
	5933	+ private MenuItem randomleavesItem;
	5934	+ private MenuItem unrandomleavesItem;
5132	5935
5133	5936	private MenuItem flipVItem;
5134	5937	private MenuItem unflipVItem;
..	..	@@ -5140,15 +5943,17 @@
5140	5943	private MenuItem panoTexturesItem;
5141	5944
5142	5945	private MenuItem resetCentroidItem;
5143		- private MenuItem transformgeometryItem;
	5946	+ private MenuItem resetCentroidXZItem;
5144	5947	private MenuItem resetTransformItem;
	5948	+ private MenuItem transformGeometryItem;
	5949	+ private MenuItem transformChildrenItem;
5145	5950	private MenuItem hideItem;
5146	5951	private MenuItem grabItem;
5147	5952	private MenuItem backItem;
5148	5953	private MenuItem frontItem;
5149	5954	private MenuItem cameraItem;
5150	5955	private MenuItem compositeItem;
5151		- private MenuItem randomItem;
	5956	+ private MenuItem switchItem;
5152	5957	private MenuItem physicsItem;
5153	5958	private MenuItem frameselectorItem;
5154	5959	private MenuItem scriptNodeItem;
..	..	@@ -5172,6 +5977,8 @@
5172	5977	private MenuItem attachBumpItem;
5173	5978	private MenuItem detachBumpItem;
5174	5979	private MenuItem pigmentBumpItem;
	5980	+ private MenuItem embedTexturesItem;
	5981	+ private MenuItem deEmbedTexturesItem;
5175	5982
5176	5983	private MenuItem particleItem;
5177	5984	private MenuItem ragdollItem;
..	..	@@ -5210,11 +6017,6 @@
5210	6017	private MenuItem doubleItem;
5211	6018	private MenuItem tripleItem;
5212	6019
5213		- private MenuItem importGFDItem;
5214		- private MenuItem importVRMLX3DItem;
5215		- private MenuItem import3DSItem;
5216		- private MenuItem importOBJItem;
5217		-
5218	6020	private MenuItem computeAOItem;
5219	6021	private MenuItem recompileItem;
5220	6022	private MenuItem editScriptItem;
..	..	@@ -5224,4 +6026,8 @@
5224	6026	private MenuItem analyzeItem;
5225	6027	private MenuItem dumpItem;
5226	6028	//boolean freezemodel = false;
	6029	+
	6030	+ Menu cameraMenu;
	6031	+ MenuItem editCameraItem;
	6032	+ MenuItem restoreCameraItem;
5227	6033	}