~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,9 +12,11 @@
12	12	import com.jme.math.Vector3f;
13	13	import com.jme.renderer.ColorRGBA;
14	14
	15	+import grafeme.ui.*;
15	16	//import buoy.widget.BFileChooser;
16	17
17	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
18	20	ObjectUI,
19	21	Runnable,
20	22	ActionListener,
..	..	@@ -22,6 +24,350 @@
22	24	DragGestureListener, DragSourceListener, DropTargetListener,
23	25	ItemListener // ListSelectionListener
24	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Globals.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Globals.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane(JTabbedPane.LEFT);
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
	358	+ }
	359	+
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
25	371	//ObjEditor objEditor;
26	372	public void closeUI2()
27	373	{
..	..	@@ -59,6 +405,16 @@
59	405	this.copy = this.group = group;
60	406	//selectees = this.group.selectees;
61	407
	408	+ assert(false);
	409	+
	410	+// if (copy.versionlist == null)
	411	+// {
	412	+// copy.versionlist = new Object3D[100];
	413	+// copy.versionindex = -1;
	414	+//
	415	+// //Save(true);
	416	+// }
	417	+
62	418	if(ui)
63	419	SetupUI(objEditor);
64	420	}
..	..	@@ -73,16 +429,28 @@
73	429	this.copy = this.group = copy;
74	430	//selectees = this.group.selectees;
75	431
76		- SetupMenu2(objEditor);
	432	+ SetupMenu2(this); //objEditor);
77	433	SetupUI2(objEditor);
78	434	objEditor.SetupUI(true);
79	435	SetupViews(objEditor);
80	436
81	437	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	438	+
	439	+// if (copy.versionlist == null)
	440	+// {
	441	+// copy.versionlist = new Object3D[100];
	442	+// copy.versionindex = -1;
	443	+//
	444	+// //Save(true);
	445	+// }
82	446	}
83	447
84	448	void CloneSelection(boolean supports)
85	449	{
	450	+ if (Globals.REPLACEONMAKE)
	451	+ Save();
	452	+ boolean keep = Globals.REPLACEONMAKE;
	453	+ Globals.REPLACEONMAKE = false;
86	454	// Object3D keep = GrafreeD.clipboard;
87	455	//Object3D obj;
88	456	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -93,18 +461,19 @@
93	461
94	462	makeSomething(clone, i==group.selection.size()-1);
95	463	}
	464	+ Globals.REPLACEONMAKE = keep;
96	465	}
97	466
98	467	void CloneClipboard(boolean supports)
99	468	{
100		- assert(GrafreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
102		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	469	+ assert(Grafreed.clipboard.parent == null);
	470	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	471	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	472	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	473	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	474	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	475	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	476	+ Grafreed.clipboard.get(0).parent = keepparent;
108	477	}
109	478
110	479	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +487,7 @@
118	487	// obj.support = null;
119	488	if (!supports)
120	489	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	490	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	491	obj.parent = parent;
123	492	// obj.support = support;
124	493	// clone.support = support; // aout 2013
..	..	@@ -147,58 +516,153 @@
147	516
148	517	//JTextField nameField;
149	518
150		- void SetupMenu2(ObjEditor oe)
	519	+ void SetupMenu2(GroupEditor oe)
151	520	{
152		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
155		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
156		- oe.cameraMenu.add("-");
157		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
158		- openWindowItem.addActionListener(this);
159		- editLeafItem.addActionListener(this);
160		- lookAtItem.addActionListener(this);
161		- //lookFromItem.addActinoListener(this);
162		- //switchItem.addActionListener(this);
	521	+ oe.jTree = new cTree();
	522	+
163	523	Menu menu;
164	524	oe.menuBar.add(menu = new Menu("Edit"));
165	525	//editItem = menu.add(new MenuItem("Edit"));
166	526	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	527	+
	528	+// undoItem = menu.add(new MenuItem("Undo"));
	529	+// undoItem.addActionListener(this);
	530	+// redoItem = menu.add(new MenuItem("Redo"));
	531	+// redoItem.addActionListener(this);
	532	+// menu.add("-");
	533	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	534	duplicateItem.addActionListener(this);
169		- menu.add("-");
170		- cloneItem = menu.add(new MenuItem("Clone"));
	535	+
	536	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
171	537	cloneItem.addActionListener(this);
	538	+ //if (Globals.ADVANCED)
	539	+ {
172	540	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	541	cloneSupportItem.addActionListener(this);
	542	+ }
	543	+ oe.jTree.popup.addSeparator();
174	544	menu.add("-");
175		- cutItem = menu.add(new MenuItem("Cut"));
	545	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
176	546	cutItem.addActionListener(this);
177		- copyItem = menu.add(new MenuItem("Copy"));
	547	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
178	548	copyItem.addActionListener(this);
179	549	pasteItem = menu.add(new MenuItem("Paste"));
180	550	pasteItem.addActionListener(this);
181		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	551	+
	552	+ oe.jTree.popup.addSeparator();
	553	+ //menu.add("-");
	554	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
	555	+ pasteIntoItem.addActionListener(this);
	556	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
182	557	pasteLinkItem.addActionListener(this);
183		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	558	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
184	559	pasteCloneItem.addActionListener(this);
185		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	560	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
186	561	// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
	562	+ //menu.add("-");
	563	+ oe.jTree.popup.addSeparator();
	564	+
	565	+ if (Globals.ADVANCED)
	566	+ {
	567	+ // Deletes the cameras...
189	568	clearAllItem = menu.add(new MenuItem("Clear All"));
190	569	clearAllItem.addActionListener(this);
	570	+ }
	571	+
	572	+ menuBar.add(cameraMenu = new Menu("View"));
	573	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	574	+ //zBufferItem.addActionListener(this);
	575	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	576	+ //normalLensItem.addActionListener(this);
	577	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	578	+ restoreCameraItem.addActionListener(this);
	579	+
	580	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	581	+// toggleFullScreenItem.addItemListener(this);
	582	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	583	+// cameraMenu.add("-");
	584	+//
	585	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	586	+// toggleTextureItem.addItemListener(this);
	587	+// toggleTextureItem.setState(CameraPane.textureon);
	588	+//
	589	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	590	+// toggleSwitchItem.addItemListener(this);
	591	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	592	+
	593	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	594	+ toggleHandleItem.addItemListener(this);
	595	+ toggleHandleItem.setState(CameraPane.HANDLES);
	596	+
	597	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	598	+ togglePaintItem.addItemListener(this);
	599	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	600	+
	601	+ if (Globals.ADVANCED)
	602	+ {
	603	+ cameraMenu.add("-");
	604	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	605	+ toggleLiveItem.addItemListener(this);
	606	+ toggleLiveItem.setState(Globals.isLIVE());
191	607
	608	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	609	+ stepItem.addActionListener(this);
	610	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	611	+ // toggleDLItem.addItemListener(this);
	612	+ // toggleDLItem.setState(false);
	613	+
	614	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	615	+ toggleRenderItem.addItemListener(this);
	616	+ toggleRenderItem.setState(!CameraPane.frozen);
	617	+
	618	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	619	+ toggleDebugItem.addItemListener(this);
	620	+ toggleDebugItem.setState(Globals.DEBUG);
	621	+
	622	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	623	+ toggleFrustumItem.addItemListener(this);
	624	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	625	+
	626	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	627	+ toggleFootContactItem.addItemListener(this);
	628	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	629	+
	630	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	631	+ toggleTimelineItem.addItemListener(this);
	632	+ }
	633	+
	634	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	635	+// toggleRootItem.addItemListener(this);
	636	+// toggleRootItem.setState(false);
	637	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	638	+// animationItem.addItemListener(this);
	639	+// animationItem.setState(CameraPane.ANIMATION);
	640	+ cameraMenu.add("-");
	641	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	642	+ editCameraItem.addActionListener(this);
	643	+
	644	+ if (Globals.ADVANCED)
	645	+ {
	646	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	647	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	648	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	649	+ oe.cameraMenu.add("-");
	650	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	651	+ openWindowItem.addActionListener(this);
	652	+ lookAtItem.addActionListener(this);
	653	+ //lookFromItem.addActinoListener(this);
	654	+ //switchViewItem.addActionListener(this);
	655	+ }
	656	+
192	657	oe.menuBar.add(menu = new Menu("Setting"));
193		- resetMeshItem = menu.add(new MenuItem("Reset All"));
194		- resetMeshItem.addActionListener(this);
195		- stepAllItem = menu.add(new MenuItem("Step All"));
196		- stepAllItem.addActionListener(this);
	658	+ if (Globals.ADVANCED)
	659	+ {
197	660	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	661	revertMeshItem.addActionListener(this);
199	662	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	663	resetreferencesItem.addActionListener(this);
201	664	menu.add("-");
	665	+ }
202	666	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	667	overwriteGeoItem.addActionListener(this);
204	668	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,79 +674,118 @@
210	674	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	675	overwriteUVItem.addActionListener(this);
212	676	menu.add("-");
	677	+ if (Globals.ADVANCED)
	678	+ {
213	679	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	680	generateMeshItem.addActionListener(this);
215	681	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	682	poseMeshItem.addActionListener(this);
217	683	menu.add("-");
	684	+ }
218	685	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	686	resetsupportItem.addActionListener(this);
220	687	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	688	linkverticesItem.addActionListener(this);
222	689	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	690	relinkverticesItem.addActionListener(this);
	691	+
	692	+ if (Globals.ADVANCED)
	693	+ {
224	694	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	695	setMasterItem.addActionListener(this);
	696	+ }
226	697
227		- oe.menuBar.add(menu = new Menu("Group"));
228		- grabItem = menu.add(new MenuItem("Grab"));
229		- grabItem.addActionListener(this);
	698	+ oe.menuBar.add(menu = new Menu("Order"));
	699	+
230	700	backItem = menu.add(new MenuItem("Back"));
231	701	backItem.addActionListener(this);
232	702	frontItem = menu.add(new MenuItem("Front"));
233	703	frontItem.addActionListener(this);
234		- compositeItem = menu.add(new MenuItem("Composite"));
235		- compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	704	+// compositeItem = menu.add(new MenuItem("Composite"));
	705	+// compositeItem.addActionListener(this);
	706	+
	707	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	708	+ grabItem.addActionListener(this);
	709	+
	710	+ if (Globals.ADVANCED)
	711	+ {
	712	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	713	hideItem.addActionListener(this);
238		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	714	+ }
	715	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
239	716	ungroupItem.addActionListener(this);
240		- menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
242		- randomItem.addActionListener(this);
243		- physicsItem = menu.add(new MenuItem("Physics"));
244		- physicsItem.addActionListener(this);
245		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
246		- frameselectorItem.addActionListener(this);
	717	+
	718	+ oe.jTree.popup.addSeparator();
	719	+
	720	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	721	+ deleteItem.addActionListener(this);
	722	+
	723	+// menu.add("-");
	724	+//
	725	+// switchItem = menu.add(new MenuItem("Switch node"));
	726	+// switchItem.addActionListener(this);
	727	+ if (Globals.ADVANCED)
	728	+ {
247	729	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	730	switchGeoItem.addActionListener(this);
249	731	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	732	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	733	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	734	morphItem.addActionListener(this);
	735	+
	736	+ menu.add("-");
	737	+ physicsItem = menu.add(new MenuItem("Physics"));
	738	+ physicsItem.addActionListener(this);
	739	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	740	+ frameselectorItem.addActionListener(this);
253	741	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	742	scriptNodeItem.addActionListener(this);
255		- cameraItem = menu.add(new MenuItem("Camera"));
256		- cameraItem.addActionListener(this);
	743	+ }
257	744
258	745	oe.menuBar.add(menu = new Menu("Object"));
259		- textureItem = menu.add(new MenuItem("Texture"));
260		- textureItem.addActionListener(this);
	746	+// textureItem = menu.add(new MenuItem("Texture"));
	747	+// textureItem.addActionListener(this);
261	748	billboardItem = menu.add(new MenuItem("Billboard"));
262	749	billboardItem.addActionListener(this);
263	750	csgItem = menu.add(new MenuItem("CSG"));
264	751	csgItem.addActionListener(this);
265		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	752	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266	753	shadowXItem.addActionListener(this);
267		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	754	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268	755	shadowYItem.addActionListener(this);
269		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	756	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270	757	shadowZItem.addActionListener(this);
	758	+
	759	+ attributeItem = menu.add(new MenuItem("Attribute"));
	760	+ attributeItem.addActionListener(this);
	761	+ if (Globals.ADVANCED)
	762	+ {
	763	+ menu.add("-");
271	764	linkerItem = menu.add(new MenuItem("Linker"));
272	765	linkerItem.addActionListener(this);
273	766	templateItem = menu.add(new MenuItem("Template"));
274	767	templateItem.addActionListener(this);
275		- attributeItem = menu.add(new MenuItem("Attribute"));
276		- attributeItem.addActionListener(this);
277	768	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	769	pointflowItem.addActionListener(this);
	770	+ }
	771	+ menu.add("-");
	772	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	773	+ textureRatioRItem.addActionListener(this);
	774	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	775	+ textureRatioGItem.addActionListener(this);
	776	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	777	+ textureRatioBItem.addActionListener(this);
279	778	menu.add("-");
280	779	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	780	resetTransformItem.addActionListener(this);
282	781	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	782	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	783	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
	784	+ resetCentroidXZItem.addActionListener(this);
	785	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	786	+ transformGeometryItem.addActionListener(this);
	787	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	788	+ transformChildrenItem.addActionListener(this);
286	789
287	790	oe.menuBar.add(menu = new Menu("Geometry"));
288	791	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +796,11 @@
293	796	genNormalsCADItem.addActionListener(this);
294	797	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	798	genNormalsMESHItem.addActionListener(this);
296		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	799	+ if (Globals.ADVANCED)
	800	+ {
	801	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
297	802	genNormalsMINEItem.addActionListener(this);
	803	+ }
298	804	stripifyItem = menu.add(new MenuItem("Stripify"));
299	805	stripifyItem.addActionListener(this);
300	806	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,31 +822,52 @@
316	822	reduce34MeshItem.addActionListener(this);
317	823	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	824	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	825	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	826	clipMeshItem.addActionListener(this);
	827	+
	828	+ if (Globals.ADVANCED)
	829	+ {
	830	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	831	+ smoothMeshItem.addActionListener(this);
	832	+ }
323	833
324	834	oe.menuBar.add(menu = new Menu("Attributes"));
	835	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	836	+ clearVersionsItem.addActionListener(this);
325	837	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	838	clearMaterialsItem.addActionListener(this);
	839	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	840	+ resetAllItem.addActionListener(this);
	841	+ stepAllItem = menu.add(new MenuItem("Step All"));
	842	+ stepAllItem.addActionListener(this);
327	843	menu.add("-");
328	844	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	845	liveleavesItem.addActionListener(this);
330	846	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	847	unliveleavesItem.addActionListener(this);
	848	+ if (Globals.ADVANCED)
	849	+ {
332	850	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	851	supportleavesItem.addActionListener(this);
334	852	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	853	unsupportleavesItem.addActionListener(this);
	854	+ }
336	855	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	856	hideleavesItem.addActionListener(this);
338	857	showleavesItem = menu.add(new MenuItem("Show Leaves"));
339	858	showleavesItem.addActionListener(this);
340		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	859	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
341	860	markleavesItem.addActionListener(this);
342		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	861	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
343	862	unmarkleavesItem.addActionListener(this);
	863	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	864	+ rewindleavesItem.addActionListener(this);
	865	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	866	+ unrewindleavesItem.addActionListener(this);
	867	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	868	+ randomleavesItem.addActionListener(this);
	869	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	870	+ unrandomleavesItem.addActionListener(this);
344	871	menu.add("-");
345	872	flipVItem = menu.add(new MenuItem("Flip V"));
346	873	flipVItem.addActionListener(this);
..	..	@@ -366,53 +893,135 @@
366	893	attachBumpItem.addActionListener(this);
367	894	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
368	895	pigmentBumpItem.addActionListener(this);
	896	+ //embedTexturesItem
369	897	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
370	898	detachPigmentItem.addActionListener(this);
371	899	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
372	900	detachBumpItem.addActionListener(this);
	901	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	902	+ embedTexturesItem.addActionListener(this);
	903	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	904	+ deEmbedTexturesItem.addActionListener(this);
373	905	menu.add("-");
374	906	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
375	907	sortbysizeItem.addActionListener(this);
376	908	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	909	sortbynameItem.addActionListener(this);
378	910	menu.add("-");
	911	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	912	+ shareGeometriesItem.addActionListener(this);
	913	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	914	+ mergeGeometriesItem.addActionListener(this);
	915	+ menu.add("-");
	916	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	917	+ editLeafItem.addActionListener(this);
	918	+ if (Globals.ADVANCED)
	919	+ {
	920	+ // Pretty much the same as duplicate and clone.
379	921	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	922	extractGeometriesItem.addActionListener(this);
381	923	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	924	cloneGeometriesItem.addActionListener(this);
383		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
384		- shareGeometriesItem.addActionListener(this);
385		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
386		- mergeGeometriesItem.addActionListener(this);
	925	+ }
387	926
388	927	oe.menuBar.add(menu = new Menu("Insert"));
389	928	buildCreateMenu(menu);
390	929
391		-
392		- oe.menuBar.add(menu = new Menu("Include"));
393		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
394		- importGFDItem.addActionListener(this);
395		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
396		- importVRMLX3DItem.addActionListener(this);
397		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
398		- importOBJItem.addActionListener(this);
399		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
400		- import3DSItem.addActionListener(this);
401		-
402	930	oe.menuBar.add(menu = new Menu("Tools"));
403	931	buildToolsMenu(menu);
404	932	}
405	933
	934	+ JTabbedPane resourcecontainer;
	935	+ cGridBag currenttab;
	936	+ //boolean added; // patch for jar
	937	+
	938	+ int totalcount = 0;
	939	+
	940	+ int tabcount = 0;
	941	+ int colcount = 0;
	942	+ int rowcount = 0;
	943	+ int texturecount = 0;
	944	+
	945	+ int columns = 5;
	946	+ int rows = 7;
	947	+
	948	+ public void ResourceCallBack(String[] path)
	949	+ {
	950	+// for (int i = 0; i < path.length; i++)
	951	+// System.out.print(path[i] + "/");
	952	+// System.out.println();
	953	+
	954	+ if (//rowcount == 0 \|\|
	955	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	956	+ {
	957	+ currenttab = new cGridBag();
	958	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	959	+ currenttab.setName(tabname);
	960	+ //added = false;
	961	+ resourcecontainer.add(currenttab);
	962	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	963	+ rowcount = 1;
	964	+ colcount = 0;
	965	+ texturecount = 0;
	966	+ }
	967	+
	968	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	969	+ {
	970	+ //if (!added)
	971	+ {
	972	+ //added = true;
	973	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	974	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	975	+ }
	976	+
	977	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	978	+ totalcount++;
	979	+
	980	+ if (++colcount >= columns)
	981	+ {
	982	+ colcount = 0;
	983	+ currenttab.Return();
	984	+
	985	+ if (rowcount++ >= rows)
	986	+ {
	987	+ rowcount = 0;
	988	+ }
	989	+ }
	990	+ }
	991	+ else
	992	+ {
	993	+// if (!path[path.length-1].equals("icons"))
	994	+// resourcecontainer.Return();
	995	+ }
	996	+ }
	997	+
	998	+ void CreateTexturePanel(cGridBag container)
	999	+ {
	1000	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1001	+ container.add(resourcecontainer);
	1002	+
	1003	+ Grafreed.ParseResources("textures", this);
	1004	+
	1005	+ // 935. System.out.println("Total = " + totalcount);
	1006	+ }
	1007	+
406	1008	void SetupUI2(ObjEditor oe)
407	1009	{
	1010	+ // June 2019
	1011	+ if (oe == null)
	1012	+ {
	1013	+ //super.SetupUI2(this);
	1014	+ //return;
	1015	+ }
	1016	+
	1017	+ if (copy != group)
	1018	+ {
	1019	+ //super.SetupUI2(this);
	1020	+ }
	1021	+
408	1022	//new Exception().printStackTrace();
409	1023
410	1024	oe.radioPanel = new JPanel(new GridBagLayout());
411		- oe.aConstraints.weightx = 1;
412		- oe.aConstraints.weighty = 0;
413		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
414		- oe.aConstraints.gridwidth = 100;
415		- oe.aConstraints.gridheight = 1;
416	1025	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
417	1026
418	1027	oe.buttonGroup = new ButtonGroup();
..	..	@@ -433,110 +1042,269 @@
433	1042	oe.radioPanel.add(dummyButton);
434	1043	oe.buttonGroup.add(dummyButton);
435	1044	*/
436		- aConstraints.gridy += 1;
	1045	+ cGridBag versionManagerPanel = new cGridBag();
	1046	+
	1047	+ versionManagerPanel.preferredHeight = 4;
437	1048
438	1049	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	1050
440		- oe.aConstraints.gridwidth = 1;
441		- oe.aConstraints.gridx = 0;
	1051	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1052	+ //minButton.setToolTipText("Minimize window");
	1053	+ //minButton.addActionListener(this);
442	1054
443		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
444		- liveCB.setToolTipText("Enabled animation");
445		- liveCB.addItemListener(this);
446		-
447		- oe.aConstraints.gridx += 1;
448		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
449		- trackCB.setToolTipText("Enable tracking");
450		- trackCB.addItemListener(this);
451		-
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	1055	+ if (Globals.ADVANCED)
	1056	+ {
	1057	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+// maxButton.setToolTipText("Maximize window");
	1059	+// maxButton.addActionListener(this);
	1060	+ }
	1061	+
	1062	+ cButton gcButton;
	1063	+
	1064	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1065	+// gcButton.setToolTipText("Garbage collect");
	1066	+// gcButton.addActionListener(new ActionListener()
	1067	+// {
	1068	+// public void actionPerformed(ActionEvent e)
	1069	+// {
	1070	+// System.gc();
	1071	+// }
	1072	+// });
	1073	+
	1074	+ oe.toolbarPanel.add(fullScreenButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1075	+ fullScreenButton.setToolTipText("Full-screen window");
	1076	+ fullScreenButton.addActionListener(this);
	1077	+
	1078	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1079	+ collapseButton.setToolTipText("Collapse toolbar");
	1080	+ collapseButton.addActionListener(this);
	1081	+
	1082	+// oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1083	+// maximize3DButton.setToolTipText("Maximize 3D view");
	1084	+// maximize3DButton.addActionListener(this);
	1085	+
	1086	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1087	+ twoButton.setToolTipText("Show 3D view only");
	1088	+ twoButton.addActionListener(this);
	1089	+ this.fullscreenLayout = twoButton;
	1090	+
	1091	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1092	+ threeButton.setToolTipText("Show controls and 3D view");
	1093	+ threeButton.addActionListener(this);
	1094	+ if (Globals.ADVANCED)
	1095	+ {
	1096	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1097	+ sixButton.setToolTipText("Show 3D view and controls");
	1098	+ sixButton.addActionListener(this);
	1099	+ }
	1100	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1101	+// sevenButton.setToolTipText("3-column layout");
	1102	+// sevenButton.addActionListener(this);
	1103	+ //
	1104	+
	1105	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
454	1106	screenfitButton.setToolTipText("Screen fit");
455	1107	screenfitButton.addActionListener(this);
456		- oe.aConstraints.gridx += 1;
	1108	+
	1109	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1110	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1111	+ restoreCameraButton.addActionListener(this);
	1112	+
	1113	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1114	+ saveVersionButton.setToolTipText("Duplicate current version");
	1115	+ saveVersionButton.addActionListener(this);
	1116	+
	1117	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1118	+ deleteVersionButton.setToolTipText("Delete current version");
	1119	+ deleteVersionButton.addActionListener(this);
	1120	+ deleteVersionButton.setEnabled(false);
	1121	+
	1122	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1123	+ previousVersionButton.setToolTipText("Previous version");
	1124	+ previousVersionButton.addActionListener(this);
	1125	+ previousVersionButton.setEnabled(false);
	1126	+
	1127	+ cGridBag updown = new cGridBag().setVertical(true);
	1128	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ restoreButton.setToolTipText("Undo (restore current version)");
	1130	+ restoreButton.addActionListener(this);
	1131	+ restoreButton.setEnabled(false);
	1132	+
	1133	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1134	+ replaceButton.setToolTipText("Save (replace current version)");
	1135	+ replaceButton.addActionListener(this);
	1136	+ replaceButton.setEnabled(false);
	1137	+
	1138	+ versionManagerPanel.add(updown);
	1139	+
	1140	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1141	+ nextVersionButton.setToolTipText("Next version");
	1142	+ nextVersionButton.addActionListener(this);
	1143	+ nextVersionButton.setEnabled(false);
	1144	+
	1145	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1146	+ oneStepButton.setToolTipText("Animate one step forward");
	1147	+ oneStepButton.addActionListener(this);
	1148	+
	1149	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1150	+ liveCB.setToolTipText("Enable animation");
	1151	+ liveCB.addItemListener(this);
	1152	+
	1153	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1154	+ fastCB.setToolTipText("Fast mode");
	1155	+ fastCB.addItemListener(this);
	1156	+
	1157	+ //oe.toolboxPanel.Return();
	1158	+
	1159	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1160	+// trackCB.setToolTipText("Enable tracking");
	1161	+// trackCB.addItemListener(this);
	1162	+
457	1163	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
458	1164	// screenfitpointButton.addActionListener(this);
459		-// oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
461		- snapobjectButton.addActionListener(this);
462		- snapobjectButton.setToolTipText("Snap Object");
463		- oe.aConstraints.gridx += 1;
464	1165
465		- //aConstraints.gridx = 0;
466		- //aConstraints.gridy += 1;
467		- oe.aConstraints.weighty = 0;
468		- oe.aConstraints.gridwidth = 1;
469		-
470		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
471		- flashSelectionButton.setToolTipText("Show selection");
472		- flashSelectionButton.addActionListener(this);
473		-
474		- oe.toolbarPanel.add(new cButton(" ", false));
475		-
476		- oe.aConstraints.gridx += 1;
477		- oe.aConstraints.weighty = 0;
478		- oe.aConstraints.gridwidth = 1;
479		-
480		- //
481		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
482		- twoButton.setToolTipText("Show center view only");
483		- twoButton.addActionListener(this);
484		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	1166	+ if (Globals.ADVANCED)
	1167	+ {
	1168	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1169	+ snapobjectButton.addActionListener(this);
	1170	+ snapobjectButton.setToolTipText("Snap Object");
	1171	+
	1172	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
485	1173	fourButton.addActionListener(this);
486		- fourButton.setToolTipText("Show left panel only");
487		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
488		- sixButton.setToolTipText("2-column layout left");
489		- sixButton.addActionListener(this);
490		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
491		- threeButton.setToolTipText("2-column layout right");
492		- threeButton.addActionListener(this);
493		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
494		- sevenButton.setToolTipText("3-column layout");
495		- sevenButton.addActionListener(this);
496		- //
	1174	+ fourButton.setToolTipText("Show control panel only");
	1175	+ }
497	1176
498		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
499		- rootButton.setToolTipText("Edit object in new tab");
	1177	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	1178	+
	1179	+
	1180	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1181	+ rootButton.setToolTipText("Open selection in new tab");
500	1182	rootButton.addActionListener(this);
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	1183	+
	1184	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
503	1185	closeButton.setToolTipText("Close tab");
504	1186	closeButton.addActionListener(this);
505	1187	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
506	1188	//clearButton.addActionListener(this);
507		- oe.aConstraints.gridx += 1;
508		-
509		- oe.aConstraints.gridx = 1; //
510		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
511		- editButton.addActionListener(this);
512		- oe.aConstraints.gridx += 1;
513		- oe.aConstraints.weighty = 0;
514		- oe.aConstraints.gridwidth = 1;
515	1189
516		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	1190	+ cGridBag row1 = new cGridBag();
	1191	+
	1192	+ // INSERT
	1193	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ gridButton.setToolTipText("Create ground");
	1195	+ gridButton.addActionListener(this);
	1196	+
	1197	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ boxButton.setToolTipText("Create box");
	1199	+ boxButton.addActionListener(this);
	1200	+
	1201	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1202	+ superButton.setToolTipText("Create superellipsoid");
	1203	+ superButton.addActionListener(this);
	1204	+
	1205	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1206	+ sphereButton.setToolTipText("Create sphere");
	1207	+ sphereButton.addActionListener(this);
	1208	+
	1209	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ coneButton.setToolTipText("Create cone");
	1211	+ coneButton.addActionListener(this);
	1212	+
	1213	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1214	+ torusButton.setToolTipText("Create torus");
	1215	+ torusButton.addActionListener(this);
	1216	+
	1217	+ if (false) //Globals.ADVANCED)
	1218	+ {
	1219	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ kleinButton.setToolTipText("Create Klein bottle");
	1221	+ kleinButton.addActionListener(this);
	1222	+ }
	1223	+
	1224	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1225	+ particlesButton.setToolTipText("Create particle system");
	1226	+ particlesButton.addActionListener(this);
	1227	+
	1228	+ oe.toolboxPanel.add(row1);
	1229	+
	1230	+ cGridBag row2 = new cGridBag();
	1231	+
	1232	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ groupButton.setToolTipText("Create group");
	1234	+ groupButton.addActionListener(this);
	1235	+
	1236	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ compositeButton.setToolTipText("Create composite");
	1238	+ compositeButton.addActionListener(this);
	1239	+
	1240	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1241	+ switchButton.setToolTipText("Create item switcher");
	1242	+ switchButton.addActionListener(this);
	1243	+
	1244	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1245	+ loopButton.setToolTipText("Create loop");
	1246	+ loopButton.addActionListener(this);
	1247	+
	1248	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1249	+ textureButton.setToolTipText("Create texture");
	1250	+ textureButton.addActionListener(this);
	1251	+
	1252	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1253	+ overlayButton.setToolTipText("Create overlay");
	1254	+ overlayButton.addActionListener(this);
	1255	+
	1256	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1257	+ lightButton.setToolTipText("Create light");
	1258	+ lightButton.addActionListener(this);
	1259	+
	1260	+ oe.toolboxPanel.add(row2);
	1261	+
	1262	+ cGridBag textures = new cGridBag();
	1263	+
	1264	+ CreateTexturePanel(textures);
	1265	+
	1266	+ int tabCount = resourcecontainer.getTabCount();
	1267	+
	1268	+ if (tabCount > 0)
	1269	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1270	+
	1271	+ oe.toolboxPanel.add(textures);
	1272	+
	1273	+ textures.preferredHeight = 100;
	1274	+
	1275	+ CreateSkyboxPanel(oe.skyboxPanel);
	1276	+
	1277	+ // EDIT panel
	1278	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ editButton.setToolTipText("Pin selection controls");
	1280	+ editButton.addActionListener(this);
	1281	+
	1282	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1283	+ uneditButton.setToolTipText("Unpin and remove selection controls");
517	1284	uneditButton.addActionListener(this);
518	1285
519		- oe.aConstraints.gridx += 1;
520		- oe.aConstraints.weighty = 0;
521		- oe.aConstraints.gridwidth = 1;
522		-
523		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
524		- clearPanelButton.addActionListener(this);
525		-
526		- oe.aConstraints.gridx += 1;
527		- oe.aConstraints.weighty = 0;
528		- oe.aConstraints.gridwidth = 1;
529		-
530		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	1286	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1287	+ allParamsButton.setToolTipText("Show all controls");
531	1288	allParamsButton.addActionListener(this);
532	1289
533		- oe.aConstraints.gridx += 1;
534		- oe.aConstraints.weighty = 0;
535		- oe.aConstraints.gridwidth = 1;
536		-
537		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
538		- unselectButton.addActionListener(this);
	1290	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1291	+ clearPanelButton.setToolTipText("Clear all controls");
	1292	+ clearPanelButton.addActionListener(this);
539	1293
	1294	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1295	+ //unselectButton.setToolTipText("Unselect");
	1296	+ //unselectButton.addActionListener(this);
	1297	+
	1298	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1299	+ flashSelectionButton.setToolTipText("Highlight selection");
	1300	+ flashSelectionButton.addActionListener(this);
	1301	+
	1302	+ editCommandsPanel.preferredHeight = 1;
	1303	+
	1304	+ SetPinStates(false);
	1305	+// oe.treePanel.add(commandsPanel);
	1306	+// oe.treePanel.Return();
	1307	+
540	1308	// oe.aConstraints.gridx += 1;
541	1309	// oe.aConstraints.weighty = 0;
542	1310	// oe.aConstraints.gridwidth = 1;
..	..	@@ -548,47 +1316,34 @@
548	1316	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
549	1317	// gcButton.addActionListener(this);
550	1318
551		- oe.aConstraints.gridx = 0;
552		- oe.aConstraints.gridy += 1;
553		-
554		- //ctrlPanel.add(objList = new List(5, true));
555		- oe.aConstraints.gridwidth = 100;
556		- // oe.aConstraints.gridheight = 100;
557		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
558		- oe.aConstraints.gridheight = 1;
559		- oe.aConstraints.weighty = 0.5;
560		- oe.aConstraints.gridx = 0;
561		- JScrollPane jSP;
	1319	+ cGridBag jSPPanel = new cGridBag();
	1320	+
	1321	+ jSPPanel.preferredHeight = 20;
	1322	+
	1323	+ JScrollPane jSP;
562	1324	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
563		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	1325	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
564	1326	ResetModel();
565		- oe.aConstraints.weighty = 0.5;
566		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
567		- oe.aConstraints.gridy += 1;
568		- oe.aConstraints.gridwidth = 1;
569		-
570		- oe.aConstraints.weighty = 0;
571		- oe.aConstraints.gridwidth = 2;
572		-
573		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
574		- colorCB.addItemListener(this);
575		- oe.aConstraints.gridx += 2;
576		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
577		- materialCB.addItemListener(this);
578		- oe.aConstraints.gridx += 2;
579		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
580		- textureCB.addItemListener(this);
581		-
582		- oe.aConstraints.gridx = 0;
583		- oe.aConstraints.gridy += 1;
584	1327
	1328	+ oe.treePanel.add(jSPPanel);
	1329	+ oe.treePanel.Return();
	1330	+
	1331	+ oe.treePanel.add(versionManagerPanel);
	1332	+ oe.treePanel.Return();
	1333	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1334	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1335	+ versionSliderPane.preferredHeight = 3;
	1336	+
	1337	+// mainPanel.setDividerLocation(0.1); //1.0);
	1338	+ mainPanel.setResizeWeight(0.4);
	1339	+
585	1340	//jList.addListSelectionListener(this);
586	1341	oe.jTree.addTreeSelectionListener(this);
587	1342	//jTree.setRootVisible(false);
588	1343	//jTree.setEditable(true);
589	1344	oe.jTree.setDragEnabled(true);
590	1345	//jTree.setPreferredSize(new Dimension(10,10));
591		- jSP.setPreferredSize(new Dimension(100,200));
	1346	+ //jSP.setPreferredSize(new Dimension(100,200));
592	1347
593	1348	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
594	1349
..	..	@@ -600,122 +1355,204 @@
600	1355	dgr.addDragGestureListener(this);
601	1356	}catch(Exception e) {}
602	1357	*/
603		- radio.layout = sevenButton;
	1358	+ radio.layout = threeButton; // sixButton;
604	1359	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
605	1360	}
606	1361
607		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	1362	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
608	1363	{
609		- constraints.gridx = 0;
610		- constraints.gridy = 0;
611		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), constraints);
612		- fastCB.setToolTipText("Fast mode");
613		- fastCB.addItemListener(this);
614		- constraints.gridy += 1;
615		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), constraints);
616		- supportCB.setToolTipText("Enabled rigging");
617		- supportCB.addItemListener(this);
	1364	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1365	+ colorCB.setToolTipText("Copy color when dropped");
	1366	+ colorCB.addItemListener(this);
618	1367
619		- // constraints.gridy += 1;
	1368	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1369	+ materialCB.setToolTipText("Copy material when dropped");
	1370	+ materialCB.addItemListener(this);
	1371	+
	1372	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1373	+ textureCB.setToolTipText("Copy texture when dropped");
	1374	+ textureCB.addItemListener(this);
	1375	+
	1376	+ panel.Return();
	1377	+
	1378	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1379	+ boxCB.setToolTipText("Display bounding boxes");
	1380	+ boxCB.addItemListener(this);
	1381	+
	1382	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1383	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1384	+ zoomBoxCB.addItemListener(this);
	1385	+
	1386	+ if (true) // Globals.ADVANCED)
	1387	+ {
	1388	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1389	+// supportCB.setToolTipText("Enable rigging");
	1390	+// supportCB.addItemListener(this);
	1391	+
	1392	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1393	+ freezeCB.setToolTipText("Fast moving camera");
	1394	+ freezeCB.addItemListener(this);
	1395	+
620	1396	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
621	1397	// localCB.addItemListener(this);
622	1398
623		- constraints.gridy += 1;
624		- panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), constraints);
	1399	+ panel.Return();
	1400	+
	1401	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
625	1402	crowdCB.setToolTipText("Used for crowds");
626	1403	crowdCB.addItemListener(this);
627	1404
628		- constraints.gridy += 1;
629		- panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), constraints);
	1405	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
630	1406	smoothCB.setToolTipText("Snapping delay");
631	1407	smoothCB.addItemListener(this);
632	1408
633		- constraints.gridy += 1;
634		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), constraints);
635		- slowCB.setToolTipText("Smooth interpolation");
636		- slowCB.addItemListener(this);
637		- constraints.gridy += 1;
638		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), constraints);
639		- boxCB.setToolTipText("Display bounding boxes");
640		- boxCB.addItemListener(this);
641		- constraints.gridy += 1;
642		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), constraints);
643		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
644		- zoomBoxCB.addItemListener(this);
645		-
	1409	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1410	+// slowCB.setToolTipText("Smooth interpolation");
	1411	+// slowCB.addItemListener(this);
	1412	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1413	+ minshaderCB.setToolTipText("Minimal fast shader");
	1414	+ minshaderCB.addItemListener(this);
	1415	+
646	1416	// constraints.gridy += 1;
647	1417	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
648	1418	// speakerMocapCB.addItemListener(this);
649	1419
	1420	+ panel.Return();
	1421	+
650	1422	if (false)
651	1423	{
652	1424	// handled in scripts
653		- constraints.gridy += 1;
654		- panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), constraints);
	1425	+ //constraints.gridy += 1;
	1426	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
655	1427	speakerCameraCB.addItemListener(this);
656	1428
657		- constraints.gridy += 1;
658		- panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), constraints);
	1429	+ //constraints.gridy += 1;
	1430	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
659	1431	speakerFocusCB.addItemListener(this);
660	1432
661		- constraints.gridy += 1;
662		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), constraints);
	1433	+ //constraints.gridy += 1;
	1434	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
663	1435	smoothfocusCB.addItemListener(this);
	1436	+ panel.Return();
664	1437	}
665	1438
666	1439	//constraints.gridx += 1;
667	1440	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
668	1441	// debugCB.addItemListener(this);
669	1442
670		- constraints.gridy += 1;
671		- panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), constraints);
	1443	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1444	+ trackCB.setToolTipText("Enable tracking target");
	1445	+ trackCB.addItemListener(this);
	1446	+
	1447	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1448	+ oeilCB.setToolTipText("Move camera when tracking");
672	1449	oeilCB.addItemListener(this);
673	1450
674		- constraints.gridy += 1;
675		- panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), constraints);
	1451	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1452	+ shadowCB.setToolTipText("When live compute shadows");
	1453	+ shadowCB.addItemListener(this);
	1454	+
	1455	+ panel.Return();
	1456	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1457	+ toggleTextureCB.setToolTipText("Load textures");
	1458	+ toggleTextureCB.addItemListener(this);
	1459	+
	1460	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1461	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1462	+ toggleSwitchCB.addItemListener(this);
	1463	+
	1464	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1465	+ autokeepCB.setToolTipText("On structure change");
	1466	+ autokeepCB.addItemListener(this);
	1467	+
	1468	+ panel.Return();
	1469	+ if (Globals.ADVANCED)
	1470	+ {
	1471	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
676	1472	lookAtCB.setToolTipText("Look-at target");
677	1473	lookAtCB.addItemListener(this);
	1474	+ }
	1475	+
	1476	+ }
	1477	+
	1478	+ cGridBag fill = new cGridBag();
	1479	+ fill.preferredHeight = 200;
	1480	+ cGridBag fill2 = new cGridBag();
	1481	+ fill2.preferredHeight = 200;
	1482	+ cGridBag fill3 = new cGridBag();
	1483	+ fill3.preferredHeight = 200;
	1484	+
	1485	+ panel.add(fill);
	1486	+ panel.add(fill2);
	1487	+ panel.add(fill3);
678	1488
679	1489	}
680	1490
681	1491	void EditObject(Object3D obj)
682	1492	{
	1493	+ //assert(obj instanceof Composite);
	1494	+
	1495	+// if (obj.versionlist == null)
	1496	+// {
	1497	+// obj.versionlist = new Object3D[100];
	1498	+// obj.versionindex = -1;
	1499	+// }
	1500	+
683	1501	cRadio radioButton = new cRadio(obj.name);
	1502	+
	1503	+ // June 2019. Patch to avoid bug with transparency.
	1504	+ radioButton.hadMaterial = obj.material != null;
	1505	+ if (!radioButton.hadMaterial)
	1506	+ {
	1507	+ obj.material = new cMaterial();
	1508	+ }
	1509	+
684	1510	radioButton.SetObject(obj);
685		- radioButton.layout = sevenButton;
	1511	+ radioButton.layout = threeButton; // sixButton;
686	1512	radioButton.SetCamera(cameraView.renderCamera, false);
687	1513	radioButton.addActionListener(this);
688	1514	radioPanel.add(radioButton);
689	1515	buttonGroup.add(radioButton);
690	1516	radioButton.doClick();
691	1517	}
	1518	+
692	1519	void SetupViews(ObjEditor oe)
693	1520	{
	1521	+ theFrame = this;
	1522	+
694	1523	oe.SetupViews();
695	1524
	1525	+ if (Globals.DEBUG)
696	1526	System.out.println("SetupViews");
697	1527	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
698	1528	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
699	1529	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
700	1530	}
701	1531
702		- JCheckBox liveCB;
703		- JCheckBox supportCB;
704		- JCheckBox localCB;
705		- JCheckBox crowdCB;
706		- JCheckBox smoothCB;
707		- JCheckBox fastCB;
708		- JCheckBox slowCB;
709		- JCheckBox boxCB;
710		- JCheckBox zoomBoxCB;
711		- JCheckBox trackCB;
712		- JCheckBox smoothfocusCB;
	1532	+ cToggleButton liveCB;
	1533	+ cCheckBox supportCB;
	1534	+ cCheckBox localCB;
	1535	+ cCheckBox crowdCB;
	1536	+ cCheckBox smoothCB;
	1537	+ cCheckBox minshaderCB;
	1538	+
	1539	+ cToggleButton fastCB;
	1540	+ cCheckBox slowCB;
	1541	+ cCheckBox boxCB;
	1542	+ cCheckBox zoomBoxCB;
	1543	+ cCheckBox freezeCB;
	1544	+ //cToggleButton trackCB;
	1545	+ cCheckBox trackCB;
	1546	+ cCheckBox smoothfocusCB;
713	1547	// JCheckBox speakerMocapCB;
714		- JCheckBox speakerCameraCB;
715		- JCheckBox speakerFocusCB;
716		- JCheckBox debugCB;
717		- JCheckBox oeilCB;
718		- JCheckBox lookAtCB;
	1548	+ cCheckBox speakerCameraCB;
	1549	+ cCheckBox speakerFocusCB;
	1550	+ cCheckBox debugCB;
	1551	+
	1552	+ cCheckBox oeilCB;
	1553	+ cCheckBox shadowCB;
	1554	+ cCheckBox autokeepCB;
	1555	+ cCheckBox lookAtCB;
719	1556
720	1557	// static int COLOR = 1;
721	1558	// static int MATERIAL = 2;
..	..	@@ -723,9 +1560,9 @@
723	1560
724	1561	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
725	1562
726		- JCheckBox colorCB;
727		- JCheckBox materialCB;
728		- JCheckBox textureCB;
	1563	+ cCheckBox colorCB;
	1564	+ cCheckBox materialCB;
	1565	+ cCheckBox textureCB;
729	1566
730	1567	public void itemStateChanged(ItemEvent e)
731	1568	{
..	..	@@ -753,6 +1590,7 @@
753	1590	} else if(e.getSource() == liveCB)
754	1591	{
755	1592	cameraView.ToggleLive();
	1593	+ refreshContents(false);
756	1594	}
757	1595	else if(e.getSource() == supportCB)
758	1596	{
..	..	@@ -768,6 +1606,12 @@
768	1606	{
769	1607	cameraView.ToggleInertia();
770	1608	cameraView.repaint();
	1609	+ }
	1610	+ else if(e.getSource() == minshaderCB)
	1611	+ {
	1612	+ Globals.MINSHADER ^= true;
	1613	+ cameraView.programInitialized = false;
	1614	+ cameraView.repaint();
771	1615	}
772	1616	else if(e.getSource() == localCB)
773	1617	{
..	..	@@ -817,6 +1661,18 @@
817	1661	{
818	1662	cameraView.ToggleOeil();
819	1663	}
	1664	+ else if(e.getSource() == shadowCB)
	1665	+ {
	1666	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1667	+ }
	1668	+ else if(e.getSource() == freezeCB)
	1669	+ {
	1670	+ Globals.FREEZEONMOVE ^= true;
	1671	+ }
	1672	+ else if(e.getSource() == autokeepCB)
	1673	+ {
	1674	+ Globals.REPLACEONMAKE ^= true;
	1675	+ }
820	1676	else if(e.getSource() == lookAtCB)
821	1677	{
822	1678	cameraView.ToggleLookAt();
..	..	@@ -833,7 +1689,8 @@
833	1689
834	1690	/**/
835	1691	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
836		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1692	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1693	+ TreePath path = objEditor.jTree.getSelectionPath();
837	1694	if ((path == null) \|\| (path.getPathCount() <= 1)) {
838	1695	// We can't move the root node or an empty selection
839	1696	return;
..	..	@@ -896,8 +1753,6 @@
896	1753	}
897	1754	}
898	1755
899		- String string = (String) object;
900		-
901	1756	System.out.println("Transfer = " + object + "; drop : " + target);
902	1757	// if( object instanceof java.io.File[])
903	1758	// {
..	..	@@ -905,7 +1760,11 @@
905	1760	// objEditor.DropFile((java.io.File[]) object, true);
906	1761	// return;
907	1762	// }
908		- if (string.charAt(0) == '/')
	1763	+
	1764	+ String string = object.toString();
	1765	+
	1766	+ // File path for Mac and Windows
	1767	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
909	1768	{
910	1769	// file(s)
911	1770	String[] names = string.split("\n");
..	..	@@ -932,7 +1791,7 @@
932	1791
933	1792	flashIt = false;
934	1793	CameraPane pane = (CameraPane) target;
935		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1794	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
936	1795	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
937	1796
938	1797	if (group.selection.size() == 1)
..	..	@@ -948,23 +1807,33 @@
948	1807
949	1808	assert target == objEditor.jTree;
950	1809	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1810	+ Object3D destinationLeaf;
951	1811	try {
952		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1812	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
953	1813	} catch (Exception e) {
954	1814	System.out.println("destinationPath : " + destinationPath);
955	1815	return;
956	1816	}
957	1817
958		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1818	+ for (int i=group.selection.size(); --i>=0;)
959	1819	{
	1820	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1821	+
	1822	+ // Cannot move into itself
	1823	+ if (child == destinationLeaf)
	1824	+ return;
	1825	+ }
	1826	+
	1827	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1828	+// {
960	1829	loadClipboard(true);
961	1830	objEditor.jTree.setSelectionPath(destinationPath);
962		- pasteInto(false);
963		- } else {
964		- loadClipboard(false);
965		- objEditor.jTree.setSelectionPath(destinationPath);
966		- pasteInto(false); // true); // ???
967		- }
	1831	+ pasteInto(false, false);
	1832	+// } else {
	1833	+// loadClipboard(false);
	1834	+// objEditor.jTree.setSelectionPath(destinationPath);
	1835	+// pasteInto(false, false); // true); // ???
	1836	+// }
968	1837	}
969	1838	public void dropActionChanged(DropTargetDragEvent dtde)
970	1839	// Called if the user has modified the current drop gesture
..	..	@@ -1020,7 +1889,12 @@
1020	1889	TreePath path;
1021	1890
1022	1891	public TransferableTreePath(TreePath tp) {
1023		- path = tp;
	1892	+ Object[] objs = new Object[tp.getPathCount()];
	1893	+ for (int i=0; i<objs.length; i++)
	1894	+ {
	1895	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1896	+ }
	1897	+ path = new TreePath(objs);
1024	1898	}
1025	1899
1026	1900	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1069,85 +1943,107 @@
1069	1943	{
1070	1944	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1071	1945	//heightFieldItem.addActionListener(this);
1072		- gridItem = menu.add(new MenuItem("Grid"));
1073		- gridItem.addActionListener(this);
1074		- rectoidItem = menu.add(new MenuItem("Box"));
1075		- rectoidItem.addActionListener(this);
1076		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1077		- ellipsoidItem.addActionListener(this);
1078		- coneItem = menu.add(new MenuItem("Cone"));
1079		- coneItem.addActionListener(this);
1080		- torusItem = menu.add(new MenuItem("Torus"));
1081		- torusItem.addActionListener(this);
1082		- superItem = menu.add(new MenuItem("Superellipsoid"));
1083		- superItem.addActionListener(this);
	1946	+// gridItem = menu.add(new MenuItem("Grid"));
	1947	+// gridItem.addActionListener(this);
	1948	+// rectoidItem = menu.add(new MenuItem("Box"));
	1949	+// rectoidItem.addActionListener(this);
	1950	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1951	+// ellipsoidItem.addActionListener(this);
	1952	+// coneItem = menu.add(new MenuItem("Cone"));
	1953	+// coneItem.addActionListener(this);
	1954	+// torusItem = menu.add(new MenuItem("Torus"));
	1955	+// torusItem.addActionListener(this);
	1956	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1957	+// superItem.addActionListener(this);
	1958	+
	1959	+ cameraItem = menu.add(new MenuItem("Camera"));
	1960	+ cameraItem.addActionListener(this);
	1961	+
	1962	+ if (!Globals.ADVANCED)
	1963	+ {
1084	1964	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1085	1965	kleinItem.addActionListener(this);
1086		- particleItem = menu.add(new MenuItem("Particle system"));
1087		- particleItem.addActionListener(this);
	1966	+ }
	1967	+
	1968	+// particleItem = menu.add(new MenuItem("Particle system"));
	1969	+// particleItem.addActionListener(this);
	1970	+ if (Globals.ADVANCED)
	1971	+ {
1088	1972	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1089	1973	ragdollItem.addActionListener(this);
1090	1974	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1091	1975	ragdoll2Item.addActionListener(this);
	1976	+ }
1092	1977	menu.add("-");
1093		- meshItem = menu.add(new MenuItem("Mesh"));
	1978	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1094	1979	meshItem.addActionListener(this);
1095	1980	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1096	1981	// meshGroupItem.addActionListener(this);
	1982	+ if (Globals.ADVANCED)
	1983	+ {
1097	1984	springItem = menu.add(new MenuItem("Spring"));
1098	1985	springItem.addActionListener(this);
1099	1986	flagItem = menu.add(new MenuItem("Flag"));
1100	1987	flagItem.addActionListener(this);
1101		- bezierItem = menu.add(new MenuItem("Patch"));
1102		- bezierItem.addActionListener(this);
1103		- checkerItem = menu.add(new MenuItem("Checker"));
1104		- checkerItem.addActionListener(this);
1105	1988	blobItem = menu.add(new MenuItem("Blob"));
1106	1989	blobItem.addActionListener(this);
1107	1990	latheItem = menu.add(new MenuItem("Lathe"));
1108	1991	latheItem.addActionListener(this);
1109		- lightItem = menu.add(new MenuItem("Light"));
1110		- lightItem.addActionListener(this);
	1992	+ }
	1993	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1994	+ bezierItem.addActionListener(this);
	1995	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1996	+// overlayItem.addActionListener(this);
	1997	+// lightItem = menu.add(new MenuItem("Light"));
	1998	+// lightItem.addActionListener(this);
1111	1999	menu.add("-");
1112	2000	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1113	2001	//superLoopItem.addActionListener(this);
1114		- loopItem = menu.add(new MenuItem("Loop"));
1115		- loopItem.addActionListener(this);
	2002	+// loopItem = menu.add(new MenuItem("Loop"));
	2003	+// loopItem.addActionListener(this);
1116	2004	doubleItem = menu.add(new MenuItem("Fork"));
1117	2005	doubleItem.addActionListener(this);
	2006	+ if (Globals.ADVANCED)
	2007	+ {
1118	2008	tripleItem = menu.add(new MenuItem("Trident"));
1119	2009	tripleItem.addActionListener(this);
	2010	+ }
1120	2011	}
1121	2012
1122	2013	void buildToolsMenu(Menu menu)
1123	2014	{
1124	2015	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1125	2016	animationItem.addItemListener(this);
1126		- animationItem.setState(CameraPane.ANIMATION);
	2017	+ animationItem.setState(Globals.ANIMATION);
	2018	+
	2019	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2020	+ archiveItem.addActionListener(this);
1127	2021
1128	2022	menu.add("-");
1129	2023	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1130	2024	parseverticesItem.addActionListener(this);
1131	2025	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1132	2026	textureFieldItem.addActionListener(this);
1133		- alignItem = menu.add(new MenuItem("Align"));
	2027	+ alignItem = menu.add(new MenuItem("Align Objects"));
1134	2028	alignItem.addActionListener(this);
1135		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1136		- mirrorItem.addActionListener(this);
1137	2029	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1138	2030	reduceMorphItem.addActionListener(this);
1139	2031	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1140	2032	reduce34MorphItem.addActionListener(this);
1141		-
1142		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1143		- computeAOItem.addActionListener(this);
1144	2033	menu.add("-");
1145		-
1146	2034	menu.add(memoryItem = new MenuItem("Memory Usage"));
1147	2035	memoryItem.addActionListener(this);
	2036	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	2037	+ computeAOItem.addActionListener(this);
	2038	+
	2039	+ if (Globals.ADVANCED)
	2040	+ {
	2041	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	2042	+ mirrorItem.addActionListener(this);
	2043	+ menu.add("-");
1148	2044	menu.add(analyzeItem = new MenuItem("Analyze"));
1149	2045	analyzeItem.addActionListener(this);
1150		- menu.add(dumpItem = new MenuItem("Dump"));
	2046	+ menu.add(dumpItem = new MenuItem("Print"));
1151	2047	dumpItem.addActionListener(this);
1152	2048	// menu.add(pathItem = new MenuItem("From-to path"));
1153	2049	// pathItem.addActionListener(this);
..	..	@@ -1165,6 +2061,7 @@
1165	2061	menu.add("-");
1166	2062	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1167	2063	editScriptItem.addActionListener(this);
	2064	+ }
1168	2065	}
1169	2066
1170	2067	void ScreenFit()
..	..	@@ -1229,24 +2126,24 @@
1229	2126	switch(axis)
1230	2127	{
1231	2128	case 0 :
1232		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1233		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1234		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1235		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2129	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2130	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2131	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2132	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
1236	2133	norm = cVector.X;
1237	2134	break;
1238	2135	case 1 :
1239		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1240		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1241		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1242		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2136	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2137	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2138	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2139	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
1243	2140	norm = cVector.Y;
1244	2141	break;
1245	2142	case 2 :
1246		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1247		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1248		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1249		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2143	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2144	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2145	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2146	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
1250	2147	norm = cVector.Z;
1251	2148	break;
1252	2149	}
..	..	@@ -1287,9 +2184,38 @@
1287	2184	shadow.material = new cMaterial(obj.material);
1288	2185	shadow.material.diffuse = 0.0001f;
1289	2186	shadow.material.specular = 0.0001f;
	2187	+ shadow.material.opacity = 0.75f;
	2188	+
	2189	+ AllocProjectedVertices(shadow);
	2190	+
	2191	+ shadow.projectedVertices[1].x = 300;
1290	2192
1291	2193	makeSomething(shadow);
1292	2194	}
	2195	+
	2196	+ private void ClearUnpinned()
	2197	+ {
	2198	+ //for (Object3D obj : listUI)
	2199	+ for (int i=listUI.size(); --i>=0;)
	2200	+ {
	2201	+ Object3D obj = listUI.elementAt(i);
	2202	+ if (!obj.pinned)
	2203	+ {
	2204	+ obj.CloseUI();
	2205	+ listUI.remove(i);
	2206	+ }
	2207	+ }
	2208	+ }
	2209	+
	2210	+ private void EditElement(Object3D elem, boolean newWindow)
	2211	+ {
	2212	+ // if (!(elem instanceof Composite))
	2213	+ // newWindow = false;
	2214	+ listUI.add(elem);
	2215	+ elem.openEditWindow(this, newWindow); //, false);
	2216	+ System.out.println("edit : " + elem);
	2217	+ elem.editWindow.refreshContents(true); // ? new
	2218	+ }
1293	2219
1294	2220	/**
1295	2221	* applyExample
..	..	@@ -1493,9 +2419,9 @@
1493	2419
1494	2420	void Overwrite(int mask)
1495	2421	{
1496		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2422	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1497	2423	{
1498		- Object3D content = GrafreeD.clipboard.get(0);
	2424	+ Object3D content = Grafreed.clipboard.get(0);
1499	2425
1500	2426	if (content instanceof cGroup && ((cGroup)content).transientlink )
1501	2427	content = ((cGroup)content).get(0);
..	..	@@ -1534,7 +2460,7 @@
1534	2460	{
1535	2461	ScreenFit();
1536	2462	} else
1537		- if (source == switchItem)
	2463	+ if (source == switchViewItem)
1538	2464	{
1539	2465	cVector v1 = new cVector();
1540	2466	cVector v2 = new cVector();
..	..	@@ -1543,11 +2469,11 @@
1543	2469	objEditor.cameraView.renderCamera.setAim(v2, v1);
1544	2470	objEditor.cameraView.repaint();
1545	2471	} else
1546		- if (source == rectoidItem)
	2472	+ if (source == rectoidItem \|\| source == boxButton)
1547	2473	{
1548	2474	makeSomething(new Box());
1549	2475	} else
1550		- if (source == particleItem)
	2476	+ if (source == particleItem \|\| source == particlesButton)
1551	2477	{
1552	2478	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1553	2479	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1626,27 +2552,27 @@
1626	2552
1627	2553	makeSomething(obj);
1628	2554	} else
1629		- if (source == gridItem)
	2555	+ if (source == gridItem \|\| source == gridButton)
1630	2556	{
1631	2557	makeSomething(new Grid());
1632	2558	} else
1633		- if (source == ellipsoidItem)
	2559	+ if (source == ellipsoidItem \|\| source == sphereButton)
1634	2560	{
1635	2561	makeSomething(new Sphere());
1636	2562	} else
1637		- if (source == coneItem)
	2563	+ if (source == coneItem \|\| source == coneButton)
1638	2564	{
1639	2565	makeSomething(new Cone());
1640	2566	} else
1641		- if (source == torusItem)
	2567	+ if (source == torusItem \|\| source == torusButton)
1642	2568	{
1643	2569	makeSomething(new Torus());
1644	2570	} else
1645		- if (source == superItem)
	2571	+ if (source == superItem \|\| source == superButton)
1646	2572	{
1647	2573	makeSomething(new Superellipsoid());
1648	2574	} else
1649		- if (source == kleinItem)
	2575	+ if (source == kleinItem \|\| source == kleinButton)
1650	2576	{
1651	2577	makeSomething(new Klein());
1652	2578	} else
..	..	@@ -1666,7 +2592,7 @@
1666	2592	{
1667	2593	makeSomething(new BezierSurface());
1668	2594	} else
1669		- if (source == checkerItem)
	2595	+ if (source == overlayItem \|\| source == overlayButton)
1670	2596	{
1671	2597	/*
1672	2598	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1714,10 +2640,27 @@
1714	2640	s.setup();
1715	2641	makeSomething(s);
1716	2642	} else
1717		- if (source == lightItem)
	2643	+ if (source == lightItem \|\| source == lightButton)
1718	2644	{
1719	2645	makeSomething(new Light());
1720	2646	} else
	2647	+// if (source == skybox1Button \|\|
	2648	+// source == skybox2Button \|\|
	2649	+// source == skybox3Button \|\|
	2650	+// source == skybox4Button \|\|
	2651	+// source == skybox5Button \|\|
	2652	+// source == skybox6Button \|\|
	2653	+// source == skybox7Button \|\|
	2654	+// source == skybox11Button \|\|
	2655	+// source == skybox12Button \|\|
	2656	+// source == skybox13Button \|\|
	2657	+// source == skybox14Button \|\|
	2658	+// source == skybox15Button \|\|
	2659	+// source == skybox16Button \|\|
	2660	+// source == skybox17Button)
	2661	+// {
	2662	+// ChangeSkybox(source);
	2663	+// } else
1721	2664	if (source == csgItem)
1722	2665	{
1723	2666	group(new CSG());
..	..	@@ -1764,30 +2707,38 @@
1764	2707
1765	2708	group(g);
1766	2709	} else
1767		- if (source == loopItem)
	2710	+ if (source == loopItem \|\| source == loopButton)
1768	2711	{
	2712	+ if (!group.selection.isEmpty())
	2713	+ {
1769	2714	Composite csg = new GroupLeaf();
1770		- csg.count = 5;
1771	2715	group(csg);
1772		- Composite child = new cGroup();
	2716	+ csg.count = 5;
	2717	+ Composite child = new cGroup("Branch");
1773	2718	csg.addChild(child);
1774	2719	child.addChild(csg);
	2720	+ }
1775	2721	} else
1776	2722	if (source == doubleItem)
1777	2723	{
1778		- Composite csg = new GroupLeaf();
1779		- csg.count = 5;
	2724	+ if (!group.selection.isEmpty())
	2725	+ {
	2726	+ Composite csg = new GroupLeaf("Fork");
1780	2727	group(csg);
1781		- Composite child = new cGroup();
	2728	+ csg.count = 5;
	2729	+ Composite child = new cGroup("Branch A");
1782	2730	csg.addChild(child);
1783	2731	child.addChild(csg);
1784		- child = new cGroup();
	2732	+ child = new cGroup("Branch B");
1785	2733	csg.addChild(child);
1786	2734	child.addChild(csg);
	2735	+ }
1787	2736	} else
1788	2737	if (source == tripleItem)
1789	2738	{
1790		- Composite csg = new GroupLeaf();
	2739	+ if (!group.selection.isEmpty())
	2740	+ {
	2741	+ Composite csg = new GroupLeaf("Trident");
1791	2742	csg.count = 4;
1792	2743	group(csg);
1793	2744	Composite child = new cGroup();
..	..	@@ -1799,28 +2750,12 @@
1799	2750	child = new cGroup();
1800	2751	csg.addChild(child);
1801	2752	child.addChild(csg);
1802		- } else
1803		-
1804		- if (source == importGFDItem)
1805		- {
1806		- ImportGFD();
1807		- } else
1808		- if (source == importVRMLX3DItem)
1809		- {
1810		- ImportVRMLX3D();
1811		- } else
1812		- if (source == import3DSItem)
1813		- {
1814		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1815		- } else
1816		- if (source == importOBJItem)
1817		- {
1818		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	2753	+ }
1819	2754	} else
1820	2755	if (source == computeAOItem)
1821	2756	{
1822	2757	Globals.drawMode = CameraPane.OCCLUSION;
1823		- Globals.theRenderer.repaint();
	2758	+ cameraView.repaint();
1824	2759	} else
1825	2760	if (source == recompileItem)
1826	2761	{
..	..	@@ -1835,7 +2770,7 @@
1835	2770	if (source == invariantsItem)
1836	2771	{
1837	2772	System.out.println("Invariants:");
1838		- GrafreeD.grafreeD.universe.invariants();
	2773	+ Grafreed.grafreed.universe.invariants();
1839	2774	} else
1840	2775	if (source == memoryItem)
1841	2776	{
..	..	@@ -1854,19 +2789,80 @@
1854	2789	{
1855	2790	DumpObject();
1856	2791	} else
	2792	+ if (source == minButton)
	2793	+ {
	2794	+ Minimize();
	2795	+ } else
	2796	+ if (source == maxButton)
	2797	+ {
	2798	+ Maximize();
	2799	+ } else
	2800	+ if (source == fullScreenButton)
	2801	+ {
	2802	+ ToggleFullScreen();
	2803	+ } else
	2804	+ if (source == collapseButton)
	2805	+ {
	2806	+ this.expandedLayout = radio.layout;
	2807	+ CollapseToolbar();
	2808	+ } else
	2809	+// if (source == maximize3DButton)
	2810	+// {
	2811	+// this.expandedLayout = radio.layout;
	2812	+// radio.layout = twoButton;
	2813	+// CollapseToolbar();
	2814	+// Show3DView();
	2815	+// } else
	2816	+ if (source == previousVersionButton)
	2817	+ {
	2818	+ // Go to previous version
	2819	+ //if (!Undo())
	2820	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2821	+ PreviousVersion();
	2822	+ } else
	2823	+ if (source == restoreButton)
	2824	+ {
	2825	+ // Restore current version
	2826	+ Restore();
	2827	+ //restoreButton.setEnabled(false);
	2828	+ } else
	2829	+ if (source == replaceButton)
	2830	+ {
	2831	+ // Overwrite current version
	2832	+ Replace();
	2833	+ //replaceButton.setEnabled(false);
	2834	+ } else
	2835	+ if (source == nextVersionButton)
	2836	+ {
	2837	+ // Go to next version
	2838	+ NextVersion();
	2839	+ } else
	2840	+ if (source == saveVersionButton)
	2841	+ {
	2842	+ // Save a new version
	2843	+ if (!Save(true))
	2844	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2845	+ } else
	2846	+ if (source == deleteVersionButton)
	2847	+ {
	2848	+ // Delete a new version
	2849	+ DeleteVersion();
	2850	+ } else
	2851	+ if (source == oneStepButton)
	2852	+ {
	2853	+ Globals.ONESTEP = true;
	2854	+ cameraView.repaint();
	2855	+ } else
1857	2856	if (source == screenfitButton)
1858	2857	{
1859		- //Reload(lastConverter, lastFilename, true);
1860	2858	ScreenFit();
1861	2859	} else
1862	2860	if (source == screenfitpointButton)
1863	2861	{
1864		- //Reload(lastConverter, lastFilename, true);
1865	2862	ScreenFitPoint();
1866	2863	} else
1867	2864	if (source == snapobjectButton)
1868	2865	{
1869		- //Reload(lastConverter, lastFilename, true);
1870	2866	SnapObject();
1871	2867	} else
1872	2868	// if (event.getSource() == recompileButton)
..	..	@@ -1903,12 +2899,20 @@
1903	2899	{
1904	2900	loadClipboard(true);
1905	2901	} else
	2902	+ if (source == undoItem)
	2903	+ {
	2904	+ PreviousVersion();
	2905	+ } else
	2906	+ if (source == redoItem)
	2907	+ {
	2908	+ NextVersion();
	2909	+ } else
1906	2910	if (source == duplicateItem)
1907	2911	{
1908		- Object3D keep = GrafreeD.clipboard;
	2912	+ Object3D keep = Grafreed.clipboard;
1909	2913	loadClipboard(false);
1910	2914	paste(false);
1911		- GrafreeD.clipboard = keep;
	2915	+ Grafreed.clipboard = keep;
1912	2916	} else
1913	2917	if (source == cloneItem)
1914	2918	{
..	..	@@ -1926,13 +2930,17 @@
1926	2930	{
1927	2931	paste(false);
1928	2932	} else
	2933	+ if (source == pasteIntoItem)
	2934	+ {
	2935	+ pasteInto(true, false);
	2936	+ } else
1929	2937	if (source == pasteLinkItem)
1930	2938	{
1931		- pasteInto(false);
	2939	+ pasteInto(false, false);
1932	2940	} else
1933	2941	if (source == pasteCloneItem)
1934	2942	{
1935		- pasteInto(true);
	2943	+ pasteInto(true, true);
1936	2944	} else
1937	2945	if (source == pasteExpandItem)
1938	2946	{
..	..	@@ -2124,9 +3132,9 @@
2124	3132	// group.selection.get(0).setMasterThis(content); // should be identity
2125	3133	// refreshContents();
2126	3134	// }
2127		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3135	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2128	3136	{
2129		- Object3D content = GrafreeD.clipboard.get(0);
	3137	+ Object3D content = Grafreed.clipboard.get(0);
2130	3138
2131	3139	if (content instanceof cGroup && ((cGroup)content).transientlink )
2132	3140	content = ((cGroup)content).get(0);
..	..	@@ -2134,11 +3142,11 @@
2134	3142	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2135	3143	for (int i=0; i<group.selection.size(); i++)
2136	3144	{
2137		- boolean random = CameraPane.RANDOM;
2138		- CameraPane.RANDOM = false; // parse all random nodes
	3145	+ boolean random = CameraPane.SWITCH;
	3146	+ CameraPane.SWITCH = false; // parse all random nodes
2139	3147	group.selection.get(i).linkVerticesThis(content);
2140	3148	// group.selection.get(i).setMasterThis(content); // should be identity
2141		- CameraPane.RANDOM = random;
	3149	+ CameraPane.SWITCH = random;
2142	3150	}
2143	3151	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2144	3152	refreshContents();
..	..	@@ -2148,20 +3156,20 @@
2148	3156	{
2149	3157	for (int i=0; i<group.selection.size(); i++)
2150	3158	{
2151		- boolean random = CameraPane.RANDOM;
2152		- CameraPane.RANDOM = false; // parse all random nodes
	3159	+ boolean random = CameraPane.SWITCH;
	3160	+ CameraPane.SWITCH = false; // parse all random nodes
2153	3161	group.selection.get(i).linkVerticesThis(null);
2154		- CameraPane.RANDOM = random;
	3162	+ CameraPane.SWITCH = random;
2155	3163	}
2156	3164
2157	3165	refreshContents();
2158	3166	} else
2159	3167	if (source == relinkverticesItem)
2160	3168	{
2161		- boolean random = CameraPane.RANDOM;
2162		- CameraPane.RANDOM = false; // parse all random nodes
	3169	+ boolean random = CameraPane.SWITCH;
	3170	+ CameraPane.SWITCH = false; // parse all random nodes
2163	3171	group.selection.RelinkToSupport();
2164		- CameraPane.RANDOM = random;
	3172	+ CameraPane.SWITCH = random;
2165	3173
2166	3174	refreshContents();
2167	3175	} else
..	..	@@ -2176,9 +3184,9 @@
2176	3184	} else
2177	3185	if (source == setMasterItem)
2178	3186	{
2179		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3187	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2180	3188	{
2181		- Object3D content = GrafreeD.clipboard.get(0);
	3189	+ Object3D content = Grafreed.clipboard.get(0);
2182	3190
2183	3191	if (content instanceof cGroup && ((cGroup)content).transientlink )
2184	3192	content = ((cGroup)content).get(0);
..	..	@@ -2191,9 +3199,9 @@
2191	3199	{
2192	3200	if (group.selection.size() == 1)
2193	3201	{
2194		- if (GrafreeD.clipboard.size() == 1)
	3202	+ if (Grafreed.clipboard.size() == 1)
2195	3203	{
2196		- Object3D content = GrafreeD.clipboard.get(0);
	3204	+ Object3D content = Grafreed.clipboard.get(0);
2197	3205
2198	3206	if (content instanceof cGroup && ((cGroup)content).transientlink )
2199	3207	content = ((cGroup)content).get(0);
..	..	@@ -2210,7 +3218,7 @@
2210	3218	{
2211	3219	RevertMeshes();
2212	3220	} else
2213		- if (source == resetMeshItem)
	3221	+ if (source == resetAllItem)
2214	3222	{
2215	3223	ResetAll();
2216	3224	} else
..	..	@@ -2218,7 +3226,7 @@
2218	3226	{
2219	3227	StepAll();
2220	3228	} else
2221		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3229	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2222	3230	{
2223	3231	//int indices[] = jList.getSelectedIndices();
2224	3232	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2230,9 +3238,9 @@
2230	3238	{
2231	3239	ClearSelection(true);
2232	3240	} else
2233		- if (source == grabItem)
	3241	+ if (source == grabItem \|\| source == groupButton)
2234	3242	{
2235		- group(new cGroup(), true);
	3243	+ group(new cGroup(), false); // true);
2236	3244	} else
2237	3245	if (source == hideItem)
2238	3246	{
..	..	@@ -2250,16 +3258,16 @@
2250	3258	{
2251	3259	makeSomething(new Camera());
2252	3260	} else
2253		- if (source == compositeItem)
	3261	+ if (source == compositeItem \|\| source == compositeButton)
2254	3262	{
2255	3263	group(new Composite());
2256	3264	} else
2257		- if (source == randomItem)
	3265	+ if (source == switchItem \|\| source == switchButton)
2258	3266	{
2259	3267	RandomNode random = new RandomNode();
2260	3268	group(random);
2261	3269	if (random.size() > 0)
2262		- random.name = random.get(0).name + "Rnd";
	3270	+ random.name = random.get(0).name + "Switch";
2263	3271	} else
2264	3272	if (source == physicsItem)
2265	3273	{
..	..	@@ -2356,7 +3364,7 @@
2356	3364	{
2357	3365	group(new cLinker());
2358	3366	} else
2359		- if (source == textureItem)
	3367	+ if (source == textureItem \|\| source == textureButton)
2360	3368	{
2361	3369	group(new TextureNode());
2362	3370	} else
..	..	@@ -2376,17 +3384,42 @@
2376	3384	{
2377	3385	CastShadow(2);
2378	3386	} else
2379		- if (source == ungroupItem)
	3387	+ if (source == ungroupItem \|\| source == ungroupButton)
2380	3388	{
2381		- //ungroup();
	3389	+ boolean canUngroup = true;
	3390	+
2382	3391	for (int i=0; i<group.selection.size(); i++)
2383	3392	{
2384		- Ungroup(group.selection.get(i));
	3393	+ Object3D selectedItem = group.selection.get(i);
	3394	+
	3395	+ if (selectedItem.Size() == 0)
	3396	+ {
	3397	+ // Cannot ungroup leaves
	3398	+ canUngroup = false;
	3399	+ break;
	3400	+ }
	3401	+
	3402	+ if (selectedItem == group)
	3403	+ {
	3404	+ // Cannot ungroup root
	3405	+ canUngroup = false;
	3406	+ break;
	3407	+ }
2385	3408	}
2386	3409
2387		- ClearSelection(false);
2388		-
2389		- refreshContents();
	3410	+ if (canUngroup)
	3411	+ {
	3412	+ for (int i=0; i<group.selection.size(); i++)
	3413	+ {
	3414	+ Object3D selectedItem = group.selection.get(i);
	3415	+
	3416	+ Ungroup(selectedItem);
	3417	+ }
	3418	+
	3419	+ ClearSelection(false);
	3420	+
	3421	+ refreshContents();
	3422	+ }
2390	3423	} else
2391	3424	if (source == genUVItem)
2392	3425	{
..	..	@@ -2398,7 +3431,7 @@
2398	3431	} else
2399	3432	if (source == genNormalsMESHItem)
2400	3433	{
2401		- GenNormals(true); // TODO
	3434	+ GenNormalsMESH();
2402	3435	} else
2403	3436	if (source == genNormalsORGANItem)
2404	3437	{
..	..	@@ -2432,6 +3465,10 @@
2432	3465	{
2433	3466	ClearMaterials();
2434	3467	} else
	3468	+ if (source == clearVersionsItem)
	3469	+ {
	3470	+ ClearVersions();
	3471	+ } else
2435	3472	if (source == liveleavesItem)
2436	3473	{
2437	3474	LiveLeaves(true);
..	..	@@ -2463,6 +3500,22 @@
2463	3500	if (source == unmarkleavesItem)
2464	3501	{
2465	3502	MarkLeaves(false);
	3503	+ } else
	3504	+ if (source == rewindleavesItem)
	3505	+ {
	3506	+ RewindLeaves(true);
	3507	+ } else
	3508	+ if (source == unrewindleavesItem)
	3509	+ {
	3510	+ RewindLeaves(false);
	3511	+ } else
	3512	+ if (source == randomleavesItem)
	3513	+ {
	3514	+ RandomLeaves(true);
	3515	+ } else
	3516	+ if (source == unrandomleavesItem)
	3517	+ {
	3518	+ RandomLeaves(false);
2466	3519	} else
2467	3520	if (source == flipVItem)
2468	3521	{
..	..	@@ -2548,9 +3601,25 @@
2548	3601	{
2549	3602	SmoothMesh();
2550	3603	} else
2551		- if (source == transformgeometryItem)
	3604	+ if (source == transformGeometryItem)
2552	3605	{
2553	3606	TransformGeometry();
	3607	+ } else
	3608	+ if (source == transformChildrenItem)
	3609	+ {
	3610	+ TransformChildren();
	3611	+ } else
	3612	+ if (source == textureRatioRItem)
	3613	+ {
	3614	+ TextureRatio(0);
	3615	+ } else
	3616	+ if (source == textureRatioGItem)
	3617	+ {
	3618	+ TextureRatio(1);
	3619	+ } else
	3620	+ if (source == textureRatioBItem)
	3621	+ {
	3622	+ TextureRatio(2);
2554	3623	} else
2555	3624	if (source == resetTransformItem)
2556	3625	{
..	..	@@ -2558,7 +3627,11 @@
2558	3627	} else
2559	3628	if (source == resetCentroidItem)
2560	3629	{
2561		- ResetCentroid();
	3630	+ ResetCentroid(true);
	3631	+ } else
	3632	+ if (source == resetCentroidXZItem)
	3633	+ {
	3634	+ ResetCentroid(false);
2562	3635	} else
2563	3636	if (source == resetParentItem)
2564	3637	{
..	..	@@ -2663,7 +3736,7 @@
2663	3736	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2664	3737	{
2665	3738	obj = (Object3D)e.nextElement();
2666		- obj.SetBumpTexture(null);
	3739	+ obj.ResetBumpTexture();
2667	3740	}
2668	3741
2669	3742	refreshContents();
..	..	@@ -2679,6 +3752,31 @@
2679	3752
2680	3753	refreshContents();
2681	3754	} else
	3755	+ if (source == embedTexturesItem)
	3756	+ {
	3757	+ Object3D obj;
	3758	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3759	+ {
	3760	+ obj = (Object3D)e.nextElement();
	3761	+ obj.EmbedTextures(true);
	3762	+ }
	3763	+
	3764	+ refreshContents();
	3765	+ } else
	3766	+ if (source == deEmbedTexturesItem)
	3767	+ {
	3768	+ Object3D obj;
	3769	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3770	+ {
	3771	+ obj = (Object3D)e.nextElement();
	3772	+ obj.EmbedTextures(false);
	3773	+ }
	3774	+
	3775	+ CameraPane.texturepigment.clear();
	3776	+ CameraPane.texturebump.clear();
	3777	+
	3778	+ refreshContents();
	3779	+ } else
2682	3780	if (source == flashSelectionButton)
2683	3781	{
2684	3782	CameraPane.flash = true;
..	..	@@ -2690,42 +3788,36 @@
2690	3788	if (source == twoButton)
2691	3789	{
2692	3790	radio.layout = twoButton;
2693		- // bug
2694		- //gridPanel.setDividerLocation(1.0);
2695		- //bigPanel.setDividerLocation(0.0);
2696		-// bigThree.remove(scenePanel);
2697		-// bigThree.remove(centralPanel);
2698		-// bigThree.remove(XYZPanel);
2699		-// aWindowConstraints.gridx = 0;
2700		-// aWindowConstraints.gridy = 0;
2701		-// aWindowConstraints.gridwidth = 1;
2702		-// // aConstraints.gridheight = 3;
2703		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2704		-// aWindowConstraints.weightx = 0;
2705		-// aWindowConstraints.weighty = 1;
2706		-// //bigThree.add(jtp, aWindowConstraints);
2707		-// aWindowConstraints.weightx = 1;
2708		-// aWindowConstraints.gridwidth = 3;
2709		-// // aConstraints.gridheight = 3;
2710		-// aWindowConstraints.gridx = 1;
2711		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2712		-// bigThree.add(centralPanel, aWindowConstraints);
2713		-// aWindowConstraints.weightx = 0;
2714		-// aWindowConstraints.gridx = 4;
2715		-// aWindowConstraints.gridwidth = 1;
2716		-// // aConstraints.gridheight = 3;
2717		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2718		-// //bigThree.add(XYZPanel, aWindowConstraints);
2719		-// scenePanel.setVisible(false);
2720		-// centralPanel.setVisible(true);
2721		-// XYZPanel.setVisible(false);
2722		- bigThree.ClearUI();
2723		- bigThree.add(centralPanel);
2724		- bigThree.FlushUI();
	3791	+
	3792	+ if (CameraPane.FULLSCREEN)
	3793	+ fullscreenLayout = radio.layout;
	3794	+
	3795	+ Show3DView();
	3796	+
	3797	+ cameraView.requestFocusInWindow();
	3798	+
	3799	+// refreshContents(true);
	3800	+//
	3801	+// try
	3802	+// {
	3803	+// java.awt.Robot bot = new java.awt.Robot();
	3804	+// int mask = InputEvent.BUTTON1_MASK;
	3805	+// bot.mouseMove(100, 100);
	3806	+// bot.mousePress(mask);
	3807	+// bot.mouseRelease(mask);
	3808	+// }
	3809	+// catch (Exception e)
	3810	+// {
	3811	+//
	3812	+// }
	3813	+
2725	3814	} else
2726	3815	if (source == threeButton)
2727	3816	{
2728	3817	radio.layout = threeButton;
	3818	+
	3819	+ if (CameraPane.FULLSCREEN)
	3820	+ fullscreenLayout = radio.layout;
2729	3821
2730	3822	// bigThree.remove(scenePanel);
2731	3823	// bigThree.remove(centralPanel);
..	..	@@ -2755,13 +3847,18 @@
2755	3847	// centralPanel.setVisible(true);
2756	3848	// XYZPanel.setVisible(true);
2757	3849	bigThree.ClearUI();
	3850	+ bigThree.add(scenePanel);
2758	3851	bigThree.add(centralPanel);
2759		- bigThree.add(XYZPanel);
2760	3852	bigThree.FlushUI();
	3853	+
	3854	+ cameraView.requestFocusInWindow();
2761	3855	} else
2762	3856	if (source == fourButton)
2763	3857	{
2764	3858	radio.layout = fourButton;
	3859	+
	3860	+ if (CameraPane.FULLSCREEN)
	3861	+ fullscreenLayout = radio.layout;
2765	3862
2766	3863	// bigThree.remove(scenePanel);
2767	3864	// bigThree.remove(centralPanel);
..	..	@@ -2793,10 +3890,15 @@
2793	3890	bigThree.ClearUI();
2794	3891	bigThree.add(scenePanel);
2795	3892	bigThree.FlushUI();
	3893	+
	3894	+ cameraView.requestFocusInWindow();
2796	3895	} else
2797	3896	if (source == sixButton)
2798	3897	{
2799	3898	radio.layout = sixButton;
	3899	+
	3900	+ if (CameraPane.FULLSCREEN)
	3901	+ fullscreenLayout = radio.layout;
2800	3902
2801	3903	// bigThree.remove(scenePanel);
2802	3904	// bigThree.remove(centralPanel);
..	..	@@ -2826,13 +3928,18 @@
2826	3928	// centralPanel.setVisible(true);
2827	3929	// XYZPanel.setVisible(false);
2828	3930	bigThree.ClearUI();
2829		- bigThree.add(scenePanel);
2830	3931	bigThree.add(centralPanel);
	3932	+ bigThree.add(scenePanel);
2831	3933	bigThree.FlushUI();
	3934	+
	3935	+ cameraView.requestFocusInWindow();
2832	3936	} else
2833	3937	if (source == sevenButton)
2834	3938	{
2835	3939	radio.layout = sevenButton;
	3940	+
	3941	+ if (CameraPane.FULLSCREEN)
	3942	+ fullscreenLayout = radio.layout;
2836	3943
2837	3944	// bigThree.remove(scenePanel);
2838	3945	// bigThree.remove(centralPanel);
..	..	@@ -2866,9 +3973,12 @@
2866	3973	bigThree.add(centralPanel);
2867	3974	bigThree.add(XYZPanel);
2868	3975	bigThree.FlushUI();
	3976	+
	3977	+ cameraView.requestFocusInWindow();
2869	3978	} else
2870	3979	if (source == rootButton)
2871	3980	{
	3981	+ Replace();
2872	3982	Object3D obj;
2873	3983	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2874	3984	{
..	..	@@ -2877,31 +3987,50 @@
2877	3987	EditObject(obj);
2878	3988	}
2879	3989
	3990	+ cameraView.requestFocusInWindow();
2880	3991	refreshContents(true);
2881	3992	} else
2882	3993	if (source == closeButton)
2883	3994	{
2884	3995	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3996	+ if (copy.versionlist != null)
	3997	+ Replace();
	3998	+
2885	3999	cRadio ab;
2886	4000	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2887	4001	{
2888	4002	ab = (cRadio)e.nextElement();
2889		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	4003	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2890	4004	{
	4005	+ // Patch to avoid bug with transparency.
	4006	+ if (!ab.hadMaterial)
	4007	+ {
	4008	+ ab.object.material = null;
	4009	+ }
	4010	+
2891	4011	buttonGroup.remove(ab);
2892	4012	radioPanel.remove(ab);
2893	4013
2894		- ab.GetObject().editWindow = null;
	4014	+ //ab.GetObject().editWindow = null;
	4015	+ ab.GetObject().manipWindow = null;
2895	4016	// ab.GetObject().objectUI = null; // ?????????
2896	4017
2897	4018	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2898	4019	break;
2899	4020	}
2900	4021	}
	4022	+
	4023	+ cameraView.requestFocusInWindow();
2901	4024	refreshContents(true);
2902	4025	} else
2903	4026	if (source == editItem \|\| source == editButton)
2904	4027	{
	4028	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4029	+ {
	4030	+ Object3D child = (Object3D)e.nextElement();
	4031	+ child.pinned = true;
	4032	+ }
	4033	+
2905	4034	EditSelection(false);
2906	4035	} else
2907	4036	if (source == uneditButton)
..	..	@@ -2910,13 +4039,14 @@
2910	4039	{
2911	4040	Object3D child = (Object3D)e.nextElement();
2912	4041	if(child.editWindow != null)
2913		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4042	+ child.pinned = false;
2914	4043	child.CloseUI();
2915	4044	listUI.remove(child);
	4045	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2916	4046
2917		- child.editWindow = null; // ???????????
	4047	+ //child.editWindow = null; // ???????????
2918	4048	}
2919		- objEditor.ctrlPanel.revalidate();
	4049	+ objEditor.ctrlPanel.FlushUI();
2920	4050	//objEditor.jTree.clearSelection();
2921	4051	//objEditor.ResetSliders();
2922	4052	refreshContents(true);
..	..	@@ -2927,16 +4057,18 @@
2927	4057	//copy.ClearUI();
2928	4058	for (Object3D obj : listUI)
2929	4059	{
	4060	+ obj.pinned = false;
2930	4061	obj.CloseUI();
2931	4062	}
2932	4063	listUI.clear();
	4064	+ SetPinStates(group.selection.size() > 0);
2933	4065	refreshContents(true);
2934	4066	} else
2935	4067	if (source == allParamsButton)
2936	4068	{
2937	4069	assert(copy == group);
2938	4070
2939		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4071	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2940	4072
2941	4073	for (Object3D obj : listUI)
2942	4074	{
..	..	@@ -2962,6 +4094,9 @@
2962	4094	} else
2963	4095	if(source instanceof cRadio)
2964	4096	{
	4097	+ if (copy.versionlist != null)
	4098	+ Replace();
	4099	+
2965	4100	group.parent = keepparent;
2966	4101	group.attributes = 0;
2967	4102	//group.editWindow = null;
..	..	@@ -2985,6 +4120,7 @@
2985	4120	}
2986	4121
2987	4122	copy = group;
	4123	+
2988	4124	//Globals.theRenderer.object = group;
2989	4125	if(!useclient)
2990	4126	{
..	..	@@ -3000,20 +4136,75 @@
3000	4136	frontView.object = group;
3001	4137	sideView.object = group;
3002	4138	}
3003		- group.editWindow = this;
	4139	+
	4140	+// fix "+" issue
	4141	+ //group.editWindow = this;
	4142	+ group.manipWindow = this;
	4143	+
3004	4144	/*
3005	4145	currentLayout = radio.layout;
3006	4146	if (currentLayout == null)
3007	4147	currentLayout = sevenButton;
3008	4148	*/
3009	4149	radio.layout.doClick();
	4150	+
	4151	+ //assert(copy instanceof Composite);
	4152	+
	4153	+ if (copy.versionlist == null)
	4154	+ {
	4155	+ copy.versionindex = -1;
	4156	+
	4157	+ // Cannot work with loops
	4158	+ // To fix this issue, we first mark all nodes above the root,
	4159	+ // and check if any of these nodes are reachable below the root.
	4160	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4161	+
	4162	+ if (copy instanceof Composite && !copy.HasTags())
	4163	+ {
	4164	+ if (copy.versionlist == null)
	4165	+ copy.versionlist = new Object3D[100];
	4166	+
	4167	+ //Save(true);
	4168	+ }
	4169	+ else
	4170	+ copy.versionindex = -2;
	4171	+
	4172	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4173	+ }
	4174	+
	4175	+ SetVersionStates();
	4176	+
	4177	+ ClearUnpinned();
	4178	+
	4179	+ //Grafreed.Assert(group != null);
	4180	+ //Grafreed.Assert(group.selection != null);
	4181	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4182	+ if (group.selection == null \|\| group.selection.size() == 1)
	4183	+ EditSelection(false);
3010	4184	keepparent = group.parent;
3011	4185	// PARENT = NULL or not???
3012	4186	//group.parent = null; // ROOT
3013	4187	//group.attributes = -1;
3014	4188	ResetModel();
	4189	+
	4190	+ cameraView.requestFocusInWindow();
3015	4191	refreshContents(true);
3016		- }
	4192	+ } else if (event.getSource() == editCameraItem)
	4193	+ {
	4194	+ cameraView.ProtectCamera();
	4195	+ cameraView.requestFocusInWindow();
	4196	+ cameraView.repaint();
	4197	+ return;
	4198	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4199	+ {
	4200	+ cameraView.RevertCamera();
	4201	+ cameraView.requestFocusInWindow();
	4202	+ cameraView.repaint();
	4203	+ return;
	4204	+ // } else if (event.getSource() == textureButton)
	4205	+ // {
	4206	+ // return; // true;
	4207	+ }
3017	4208	else
3018	4209	{
3019	4210	//return super.action(event, arg);
..	..	@@ -3022,7 +4213,6 @@
3022	4213	}
3023	4214
3024	4215	boolean useclient = false;
3025		- cRadio radio;
3026	4216
3027	4217	void ToggleRoot()
3028	4218	{
..	..	@@ -3074,6 +4264,40 @@
3074	4264	refreshContents();
3075	4265	}
3076	4266
	4267	+ void TransformChildren()
	4268	+ {
	4269	+ Object3D obj;
	4270	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4271	+ {
	4272	+ obj = (Object3D)e.nextElement();
	4273	+ obj.KeepTextureMatrices();
	4274	+ obj.TransformChildren();
	4275	+ obj.RestoreTextureMatrices();
	4276	+
	4277	+// if (obj.parent == null)
	4278	+// {
	4279	+// System.out.println("NULL PARENT!");
	4280	+// new Exception().printStackTrace();
	4281	+// }
	4282	+// else
	4283	+// TouchTransform(obj);
	4284	+// //obj.parent.Touch();
	4285	+ }
	4286	+
	4287	+ refreshContents();
	4288	+ }
	4289	+
	4290	+ void TextureRatio(int axis)
	4291	+ {
	4292	+ Object3D obj;
	4293	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4294	+ {
	4295	+ obj = (Object3D)e.nextElement();
	4296	+ obj.TextureRatio(axis);
	4297	+ }
	4298	+
	4299	+ refreshContents();
	4300	+ }
3077	4301
3078	4302	void ResetTransform()
3079	4303	{
..	..	@@ -3090,42 +4314,8 @@
3090	4314	if (obj.toParent == null)
3091	4315	continue;
3092	4316
3093		- if (mask == -1)
3094		- {
3095		- if (obj instanceof Camera) // jan 2014
3096		- {
3097		- LA.matIdentity(obj.toParent);
3098		- LA.matIdentity(obj.fromParent);
3099		- }
3100		- else
3101		- {
3102		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
3103		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
3104		- }
3105		- TouchTransform(obj);
3106		- continue;
3107		- }
3108		- if ((mask&2) != 0) // Scale
3109		- {
3110		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3111		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3112		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3113		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3114		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3115		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3116		- }
3117		- if ((mask&4) != 0) // Rotation
3118		- {
3119		- // ?
3120		- }
3121		- if ((mask&1) != 0) // Translation
3122		- {
3123		- if (obj.toParent != null)
3124		- {
3125		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
3126		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
3127		- }
3128		- }
	4317	+ obj.ResetTransform(mask);
	4318	+
3129	4319	if (obj.parent == null)
3130	4320	{
3131	4321	System.out.println("NULL PARENT!");
..	..	@@ -3186,7 +4376,7 @@
3186	4376	refreshContents();
3187	4377	}
3188	4378
3189		- void ResetCentroid()
	4379	+ void ResetCentroid(boolean full)
3190	4380	{
3191	4381	Object3D obj;
3192	4382	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3201,12 +4391,16 @@
3201	4391	LA.matIdentity(Object3D.mat);
3202	4392	obj.getBounds(minima, maxima, false);
3203	4393	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3204		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4394	+ if (full)
	4395	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3205	4396	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3206	4397	obj.TransformMesh(Object3D.mat);
	4398	+
3207	4399	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3208		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4400	+ if (full)
	4401	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3209	4402	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4403	+
3210	4404	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3211	4405	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3212	4406	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3235,7 +4429,8 @@
3235	4429
3236	4430	int size = obj.MemorySize();
3237	4431
3238		- System.err.println((size/1024) + " KB is the size of " + obj);
	4432	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4433	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3239	4434	}
3240	4435	}
3241	4436	catch (Exception e)
..	..	@@ -3272,9 +4467,9 @@
3272	4467	obj = (Object3D)e.nextElement();
3273	4468
3274	4469	System.out.println("Object is: " + obj);
3275		- GrafreeD.AnalyzeObject(obj);
	4470	+ Grafreed.AnalyzeObject(obj);
3276	4471	System.out.println("Boundary rep: " + obj.bRep);
3277		- GrafreeD.AnalyzeObject(obj.bRep);
	4472	+ Grafreed.AnalyzeObject(obj.bRep);
3278	4473
3279	4474	// System.err.println((size/1024) + " KB is the size of " + obj);
3280	4475	}
..	..	@@ -3316,6 +4511,13 @@
3316	4511	void GenNormals(boolean crease)
3317	4512	{
3318	4513	group.GenNormalsS(crease);
	4514	+
	4515	+ refreshContents();
	4516	+ }
	4517	+
	4518	+ void GenNormalsMESH()
	4519	+ {
	4520	+ group.GenNormalsMeshS();
3319	4521
3320	4522	refreshContents();
3321	4523	}
..	..	@@ -3488,8 +4690,8 @@
3488	4690
3489	4691	void ParseVertices()
3490	4692	{
3491		- boolean epsequal = GrafreeD.epsequal;
3492		- GrafreeD.epsequal = true;
	4693	+ boolean epsequal = Grafreed.epsequal;
	4694	+ Grafreed.epsequal = true;
3493	4695
3494	4696	for (int i=0; i<group.selection.size(); i++)
3495	4697	{
..	..	@@ -3514,7 +4716,7 @@
3514	4716	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3515	4717	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3516	4718
3517		- g.add(GrafreeD.clipboard);
	4719	+ g.add(Grafreed.clipboard);
3518	4720
3519	4721	buffer.add(g);
3520	4722	}
..	..	@@ -3529,7 +4731,7 @@
3529	4731	makeSomething(buffer, i==group.selection.size()-1);
3530	4732	}
3531	4733
3532		- GrafreeD.epsequal = epsequal;
	4734	+ Grafreed.epsequal = epsequal;
3533	4735
3534	4736	refreshContents();
3535	4737	}
..	..	@@ -3547,7 +4749,16 @@
3547	4749	String pigment = Object3D.GetPigment(tex);
3548	4750	//String bump = Object3D.GetBump(tex);
3549	4751
3550		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4752	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4753	+
	4754	+ try
	4755	+ {
	4756	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4757	+ }
	4758	+ catch (Exception e)
	4759	+ {
	4760	+ System.err.println("FAIL: " + node);
	4761	+ }
3551	4762
3552	4763	double s = v.s;
3553	4764
..	..	@@ -3613,6 +4824,12 @@
3613	4824	{
3614	4825	Object3D obj = group.selection.get(i);
3615	4826
	4827	+ if (obj.toParent == null)
	4828	+ {
	4829	+ obj.toParent = LA.newMatrix();
	4830	+ obj.fromParent = LA.newMatrix();
	4831	+ }
	4832	+
3616	4833	LA.matTranslate(obj.toParent, i * scale, 0, 0);
3617	4834	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3618	4835	}
..	..	@@ -3635,11 +4852,11 @@
3635	4852
3636	4853	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3637	4854
3638		- boolean random = CameraPane.RANDOM;
3639		- CameraPane.RANDOM = false; // parse all random nodes
	4855	+ boolean random = CameraPane.SWITCH;
	4856	+ CameraPane.SWITCH = false; // parse all random nodes
3640	4857	lowres.linkVerticesThis(null);
3641	4858	lowres.linkVerticesThis(sn);
3642		- CameraPane.RANDOM = random;
	4859	+ CameraPane.SWITCH = random;
3643	4860
3644	4861	System.err.flush();
3645	4862
..	..	@@ -3679,7 +4896,7 @@
3679	4896	return;
3680	4897
3681	4898	Object3D poses = group.selection.get(0);
3682		- Object3D ref = GrafreeD.clipboard.get(0);
	4899	+ Object3D ref = Grafreed.clipboard.get(0);
3683	4900
3684	4901	Object3D newgroup = new Object3D("Po:" + poses.name);
3685	4902
..	..	@@ -3873,9 +5090,9 @@
3873	5090
3874	5091	void ClipMesh()
3875	5092	{
3876		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	5093	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3877	5094	{
3878		- Object3D content = GrafreeD.clipboard.get(0);
	5095	+ Object3D content = Grafreed.clipboard.get(0);
3879	5096
3880	5097	if (content instanceof cGroup && ((cGroup)content).transientlink )
3881	5098	content = ((cGroup)content).get(0);
..	..	@@ -3884,7 +5101,7 @@
3884	5101	// {
3885	5102	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3886	5103	// }
3887		- group.selection.ClipMesh(GrafreeD.clipboard);
	5104	+ group.selection.ClipMesh(Grafreed.clipboard);
3888	5105	}
3889	5106	// group.selection.ClipMesh(GrafreeD.clipboard);
3890	5107	System.out.println("DONE.");
..	..	@@ -3901,6 +5118,12 @@
3901	5118	void ClearMaterials()
3902	5119	{
3903	5120	group.selection.ClearMaterials();
	5121	+ refreshContents();
	5122	+ }
	5123	+
	5124	+ void ClearVersions()
	5125	+ {
	5126	+ group.selection.ClearVersions();
3904	5127	refreshContents();
3905	5128	}
3906	5129
..	..	@@ -3931,6 +5154,18 @@
3931	5154	void MarkLeaves(boolean hide)
3932	5155	{
3933	5156	group.selection.MarkLeaves(hide);
	5157	+ refreshContents();
	5158	+ }
	5159	+
	5160	+ void RewindLeaves(boolean hide)
	5161	+ {
	5162	+ group.selection.RewindLeaves(hide);
	5163	+ refreshContents();
	5164	+ }
	5165	+
	5166	+ void RandomLeaves(boolean hide)
	5167	+ {
	5168	+ group.selection.RandomLeaves(hide);
3934	5169	refreshContents();
3935	5170	}
3936	5171
..	..	@@ -4005,28 +5240,25 @@
4005	5240	// }
4006	5241	// }
4007	5242
4008		- static boolean allparams = true;
4009		-
4010		- static Vector<Object3D> listUI = new Vector<Object3D>();
4011		-
4012	5243	void EditSelection(boolean newWindow)
4013	5244	{
	5245	+ if (group.selection == null)
	5246	+ {
	5247	+ EditElement(group, newWindow); // ? new
	5248	+ return;
	5249	+ }
	5250	+
4014	5251	// aConstraints.gridy = 0;
4015	5252	for (int i=0; i<group.selection.size(); i++)
4016	5253	{
4017	5254	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4018	5255	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4019		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5256	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4020	5257
4021	5258	Object3D elem = (Object3D)group.selection.elementAt(i);
4022		- if(elem != group)
	5259	+ if(elem != group \|\| !newWindow)
4023	5260	{
4024		- // if (!(elem instanceof Composite))
4025		- // newWindow = false;
4026		- listUI.add(elem);
4027		- elem.openEditWindow(this, newWindow); //, false);
4028		- System.out.println("edit : " + elem);
4029		- elem.editWindow.refreshContents(true); // ? new
	5261	+ EditElement(elem, newWindow); // ? new
4030	5262	}
4031	5263	}
4032	5264	}
..	..	@@ -4089,9 +5321,7 @@
4089	5321
4090	5322	freezemodel = false;
4091	5323	}
4092		-
4093		- boolean flashIt = true;
4094		-
	5324	+
4095	5325	public void valueChanged(TreeSelectionEvent e)
4096	5326	//public boolean handleEvent(Event event)
4097	5327	{
..	..	@@ -4101,7 +5331,8 @@
4101	5331	//new Exception().printStackTrace();
4102	5332
4103	5333	freezemodel = true;
4104		-
	5334	+ ClearUnpinned();
	5335	+
4105	5336	/**/
4106	5337	//switch (event.id)
4107	5338	{
..	..	@@ -4109,7 +5340,6 @@
4109	5340	//case 702: // Event.LIST_DESELECT
4110	5341	group.deselectAll();
4111	5342	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4112		- objEditor.ClearInfo(); // .GetMaterial());
4113	5343	if (tps != null)
4114	5344	{
4115	5345	for (int i=0; i < tps.length; i++)
..	..	@@ -4118,33 +5348,39 @@
4118	5348
4119	5349	//if (child.parent != null)
4120	5350	//child.parent.addSelectee(child);
	5351	+ objEditor.SetMaterial(child);
4121	5352	group.addSelectee(child);
4122		- objEditor.SetMaterial(child); // .GetMaterial());
4123		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4124		- System.err.println("info : " + child.GetPath());
4125	5353	}
4126	5354	}
4127		- else
4128		- {
4129		- objEditor.SetMaterial(group); // .GetMaterial());
4130		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4131		- System.err.println("info : " + group.GetPath());
4132		- }
	5355	+// else
	5356	+// {
	5357	+// objEditor.SetMaterial(group); // .GetMaterial());
	5358	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5359	+// System.err.println("info : " + group.GetPath());
	5360	+// }
4133	5361
4134		- objEditor.SetText(); // jan 2014
4135		-
4136		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5362	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4137	5363	CameraPane.flash = true;
4138	5364
4139		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5365	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4140	5366	// a camera
4141	5367	{
4142		- CameraPane.camerachangeframe = 0; // don't refuse it
4143		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5368	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
	5369	+ {
	5370	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5371	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5372	+ }
4144	5373	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4145	5374	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4146	5375	}
4147	5376
	5377	+ if (tps != null && tps.length == 1)
	5378	+ {
	5379	+ EditSelection(false);
	5380	+ }
	5381	+
	5382	+ SetPinStates(tps != null && tps.length > 0);
	5383	+
4148	5384	refreshContents();
4149	5385	//return true;
4150	5386	}
..	..	@@ -4153,6 +5389,53 @@
4153	5389
4154	5390	freezemodel = false;
4155	5391	}
	5392	+
	5393	+ void SetPinStates(boolean enabled)
	5394	+ {
	5395	+ editButton.setEnabled(enabled);
	5396	+ uneditButton.setEnabled(enabled);
	5397	+ //unselectButton.setEnabled(enabled);
	5398	+ flashSelectionButton.setEnabled(enabled);
	5399	+
	5400	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5401	+
	5402	+ boolean allComposites = true;
	5403	+
	5404	+ if (group.selection != null)
	5405	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5406	+ {
	5407	+ Object next = e.nextElement();
	5408	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5409	+ {
	5410	+ allComposites = false;
	5411	+ break;
	5412	+ }
	5413	+ }
	5414	+
	5415	+ rootButton.setEnabled(true); // allComposites);
	5416	+ }
	5417	+
	5418	+ void refreshContents(boolean cp)
	5419	+ {
	5420	+ if (Globals.SHOWINFO)
	5421	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5422	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5423	+ {
	5424	+ objEditor.ClearInfo(); // .GetMaterial());
	5425	+
	5426	+ for (int i=0; i < group.selection.Size(); i++)
	5427	+ {
	5428	+ Object3D child = (Object3D) group.selection.get(i);
	5429	+
	5430	+ objEditor.AddInfo(child, this, true);
	5431	+// System.err.println("info : " + child.GetPath());
	5432	+ }
	5433	+
	5434	+ objEditor.SetText(); // jan 2014
	5435	+ }
	5436	+
	5437	+ super.refreshContents(cp);
	5438	+ }
4156	5439
4157	5440	void linkSomething(Object3D thing)
4158	5441	{
..	..	@@ -4224,16 +5507,19 @@
4224	5507	{
4225	5508	if (group.selection.isEmpty())
4226	5509	return;
4227		- GrafreeD.clipboardIsTempGroup = false;
	5510	+
	5511	+ Grafreed.clipboardIsTempGroup = false;
4228	5512	Composite tGroup = null;
4229	5513	if (group.selection.size() > 0) // 1)
4230	5514	{
4231	5515	tGroup = new cGroup();
4232		- GrafreeD.clipboardIsTempGroup = true;
	5516	+ Grafreed.clipboardIsTempGroup = true;
4233	5517	}
4234	5518
4235	5519	if (cut)
4236	5520	{
	5521	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5522	+// Save();
4237	5523	//int indices[] = jList.getSelectedIndices();
4238	5524	//for (int i = indices.length - 1; i >= 0; i--)
4239	5525	//jList.remove(indices[i]);
..	..	@@ -4269,16 +5555,16 @@
4269	5555	//System.out.println("cut " + child);
4270	5556	//System.out.println("parent = " + child.parent);
4271	5557	// tmp.addChild(child);
4272		- if (GrafreeD.clipboardIsTempGroup)
	5558	+ if (Grafreed.clipboardIsTempGroup)
4273	5559	tGroup.add/Child/(tmp);
4274	5560	else
4275		- GrafreeD.clipboard = tmp;
	5561	+ Grafreed.clipboard = tmp;
4276	5562	}
4277	5563	else
4278		- if (GrafreeD.clipboardIsTempGroup)
	5564	+ if (Grafreed.clipboardIsTempGroup)
4279	5565	tGroup.add/Child/(child);
4280	5566	else
4281		- GrafreeD.clipboard = child;
	5567	+ Grafreed.clipboard = child;
4282	5568	}
4283	5569
4284	5570	//ResetModel();
..	..	@@ -4310,21 +5596,23 @@
4310	5596	//System.out.println("cut " + elem);
4311	5597	//System.out.println("parent = " + elem.parent);
4312	5598	// tmp.addChild(elem);
4313		- if (GrafreeD.clipboardIsTempGroup)
	5599	+ if (Grafreed.clipboardIsTempGroup)
4314	5600	tGroup.add/Child/(tmp);
4315	5601	else
4316		- GrafreeD.clipboard = tmp;
	5602	+ Grafreed.clipboard = tmp;
4317	5603	}
4318	5604	else
4319		- if (GrafreeD.clipboardIsTempGroup)
	5605	+ if (Grafreed.clipboardIsTempGroup)
4320	5606	tGroup.add/Child/(child);
4321	5607	else
4322		- GrafreeD.clipboard = child;
	5608	+ Grafreed.clipboard = child;
4323	5609	}
4324	5610
4325	5611	}
4326		- if (GrafreeD.clipboardIsTempGroup)
4327		- GrafreeD.clipboard = tGroup;
	5612	+
	5613	+ if (Grafreed.clipboardIsTempGroup)
	5614	+ Grafreed.clipboard = tGroup;
	5615	+
4328	5616	if (cut)
4329	5617	{
4330	5618	ResetModel();
..	..	@@ -4334,11 +5622,15 @@
4334	5622
4335	5623	void paste(boolean expand)
4336	5624	{
	5625	+ if (Globals.REPLACEONMAKE)
	5626	+ Save();
	5627	+ boolean keep = Globals.REPLACEONMAKE;
	5628	+ Globals.REPLACEONMAKE = false;
4337	5629	// if (GrafreeD.clipboard == null)
4338	5630	// return;
4339	5631	boolean first = true;
4340	5632
4341		- if (GrafreeD.clipboardIsTempGroup)
	5633	+ if (Grafreed.clipboardIsTempGroup)
4342	5634	{
4343	5635	Composite temp;
4344	5636
..	..	@@ -4349,7 +5641,7 @@
4349	5641	temp = (Composite)Applet3D.clipboard.deepCopy();
4350	5642	*/
4351	5643	Object3D elem;
4352		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5644	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4353	5645	{
4354	5646	Object3D child = (Object3D)e.nextElement();
4355	5647
..	..	@@ -4383,21 +5675,22 @@
4383	5675	//Object3D cb = Applet3D.clipboard;
4384	5676	//temp.addChild(cb);
4385	5677	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4386		- assert(GrafreeD.clipboard.parent == null);
4387		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4388		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4389		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4390		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5678	+ assert(Grafreed.clipboard.parent == null);
	5679	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5680	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5681	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5682	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4391	5683	else
4392		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4393		- GrafreeD.clipboard.get(0).parent = keepparent;
	5684	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5685	+ Grafreed.clipboard.get(0).parent = keepparent;
4394	5686	}
4395	5687
	5688	+ Globals.REPLACEONMAKE = keep;
4396	5689	ResetModel();
4397	5690	refreshContents();
4398	5691	}
4399	5692
4400		- void pasteInto(boolean copyit)
	5693	+ void pasteInto(boolean copyit, boolean clone)
4401	5694	{
4402	5695	// if (GrafreeD.clipboard == null)
4403	5696	// return;
..	..	@@ -4426,15 +5719,22 @@
4426	5719	if (copyit)
4427	5720	{
4428	5721	// paste(false);
4429		- CloneClipboard(false); // sept 2014
	5722	+ if (clone)
	5723	+ {
	5724	+ CloneClipboard(false); // sept 2014
	5725	+ }
	5726	+ else
	5727	+ {
	5728	+ paste(false);
	5729	+ }
4430	5730	}
4431	5731	else
4432	5732	{
4433	5733	boolean first = true;
4434	5734
4435		- if (GrafreeD.clipboardIsTempGroup)
	5735	+ if (Grafreed.clipboardIsTempGroup)
4436	5736	{
4437		- Composite temp = (Composite)GrafreeD.clipboard;
	5737	+ Composite temp = (Composite)Grafreed.clipboard;
4438	5738	Object3D copy;
4439	5739	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4440	5740	{
..	..	@@ -4444,7 +5744,7 @@
4444	5744	}
4445	5745	} else
4446	5746	{
4447		- linkSomething(GrafreeD.clipboard); //.get(0));
	5747	+ linkSomething(Grafreed.clipboard); //.get(0));
4448	5748	}
4449	5749	}
4450	5750	}
..	..	@@ -4521,6 +5821,10 @@
4521	5821
4522	5822	void group(Object3D csg, boolean grab)
4523	5823	{
	5824	+ if (Globals.REPLACEONMAKE)
	5825	+ Save();
	5826	+ boolean keep = Globals.REPLACEONMAKE;
	5827	+ Globals.REPLACEONMAKE = false;
4524	5828	if (//false) // why??
4525	5829	!group.selection.isEmpty())
4526	5830	{
..	..	@@ -4634,10 +5938,15 @@
4634	5938	//node.add(csg);
4635	5939	//makeSomething(node);
4636	5940	makeSomething(csg);
	5941	+ Globals.REPLACEONMAKE = keep;
4637	5942	}
4638	5943
4639	5944	void Ungroup(Object3D g)
4640	5945	{
	5946	+ if (Globals.REPLACEONMAKE)
	5947	+ Save();
	5948	+ boolean keep = Globals.REPLACEONMAKE;
	5949	+ Globals.REPLACEONMAKE = false;
4641	5950	if (g instanceof HiddenObject)
4642	5951	{
4643	5952	HiddenObject h = (HiddenObject) g;
..	..	@@ -4654,6 +5963,7 @@
4654	5963	objEditor.makeSomething(g.get(i), false);
4655	5964	}
4656	5965	}
	5966	+ Globals.REPLACEONMAKE = keep;
4657	5967	}
4658	5968
4659	5969	void ungroup()
..	..	@@ -4849,21 +6159,6 @@
4849	6159	}
4850	6160	*/
4851	6161
4852		- void ImportGFD()
4853		- {
4854		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4855		- browser.show();
4856		- String filename = browser.getFile();
4857		- if (filename != null && filename.length() > 0)
4858		- {
4859		- String fullname = browser.getDirectory() + filename;
4860		-
4861		- //Object3D readobj =
4862		- objEditor.ReadGFD(fullname, objEditor);
4863		- //makeSomething(readobj);
4864		- }
4865		- }
4866		-
4867	6162	/*
4868	6163	public void Callback(Object obj)
4869	6164	{
..	..	@@ -4887,26 +6182,9 @@
4887	6182	}
4888	6183	*/
4889	6184
4890		- void ImportVRMLX3D()
4891		- {
4892		- if (GrafreeD.standAlone)
4893		- {
4894		- /**/
4895		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4896		- browser.show();
4897		- String filename = browser.getFile();
4898		- if (filename != null && filename.length() > 0)
4899		- {
4900		- String fullname = browser.getDirectory() + filename;
4901		- LoadVRMLX3D(fullname);
4902		- }
4903		- /**/
4904		- }
4905		- }
4906		-
4907	6185	String GetFile(String dialogName)
4908	6186	{
4909		- if (GrafreeD.standAlone)
	6187	+ if (Grafreed.standAlone)
4910	6188	{
4911	6189	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4912	6190	browser.show();
..	..	@@ -4970,10 +6248,48 @@
4970	6248	cButton flashSelectionButton;
4971	6249	cButton editButton;
4972	6250	cButton uneditButton;
	6251	+ JCheckBox allParamsButton;
4973	6252	cButton clearpanelButton;
4974		- cButton allParamsButton;
4975	6253	cButton unselectButton;
4976	6254
	6255	+ cButton restoreCameraButton;
	6256	+
	6257	+ cButton oneStepButton;
	6258	+
	6259	+ cButton groupButton;
	6260	+ cButton ungroupButton;
	6261	+ cButton compositeButton;
	6262	+ cButton switchButton;
	6263	+ cButton loopButton;
	6264	+ cButton textureButton;
	6265	+
	6266	+ cButton skybox1Button;
	6267	+ cButton skybox2Button;
	6268	+ cButton skybox3Button;
	6269	+ cButton skybox4Button;
	6270	+ cButton skybox5Button;
	6271	+ cButton skybox6Button;
	6272	+ cButton skybox7Button;
	6273	+
	6274	+ cButton skybox11Button;
	6275	+ cButton skybox12Button;
	6276	+ cButton skybox13Button;
	6277	+ cButton skybox14Button;
	6278	+ cButton skybox15Button;
	6279	+ cButton skybox16Button;
	6280	+ cButton skybox17Button;
	6281	+
	6282	+ cButton gridButton;
	6283	+ cButton boxButton;
	6284	+ cButton sphereButton;
	6285	+ cButton coneButton;
	6286	+ cButton torusButton;
	6287	+ cButton superButton;
	6288	+ cButton kleinButton;
	6289	+ cButton particlesButton;
	6290	+ cButton overlayButton;
	6291	+ cButton lightButton;
	6292	+
4977	6293	cButton screenfitButton;
4978	6294	cButton screenfitpointButton;
4979	6295	cButton snapobjectButton;
..	..	@@ -4985,14 +6301,6 @@
4985	6301
4986	6302	cButton setsupportButton;
4987	6303
4988		- cButton twoButton;
4989		- cButton sixButton;
4990		- cButton threeButton;
4991		- cButton sevenButton;
4992		- cButton fourButton; // full panel
4993		- cButton oneButton; // full XYZ
4994		- //cButton currentLayout;
4995		-
4996	6304	//
4997	6305	//Composite
4998	6306	Object3D // to do !!
..	..	@@ -5002,10 +6310,12 @@
5002	6310	//JTree jTree;
5003	6311	private MenuItem lookAtItem;
5004	6312	private MenuItem lookFromItem;
5005		- private MenuItem switchItem;
5006		- private MenuItem cutItem;
5007		- private MenuItem duplicateItem;
5008		- private MenuItem cloneItem;
	6313	+ private MenuItem switchViewItem;
	6314	+ private JMenuItem cutItem;
	6315	+ private MenuItem undoItem;
	6316	+ private MenuItem redoItem;
	6317	+ private JMenuItem duplicateItem;
	6318	+ private JMenuItem cloneItem;
5009	6319	private MenuItem cloneSupportItem;
5010	6320	private MenuItem overwriteGeoItem;
5011	6321	private MenuItem overwriteMatItem;
..	..	@@ -5017,7 +6327,7 @@
5017	6327	private MenuItem linkverticesItem;
5018	6328	private MenuItem relinkverticesItem;
5019	6329	private MenuItem setMasterItem;
5020		- private MenuItem resetMeshItem;
	6330	+ private MenuItem resetAllItem;
5021	6331	private MenuItem stepAllItem;
5022	6332	private MenuItem revertMeshItem;
5023	6333	private MenuItem poseMeshItem;
..	..	@@ -5026,12 +6336,13 @@
5026	6336	private MenuItem cloneGeometriesItem;
5027	6337	private MenuItem shareGeometriesItem;
5028	6338	private MenuItem mergeGeometriesItem;
5029		- private MenuItem copyItem;
	6339	+ private JMenuItem copyItem;
5030	6340	private MenuItem pasteItem;
5031		- private MenuItem pasteLinkItem;
5032		- private MenuItem pasteCloneItem;
5033		- private MenuItem pasteExpandItem;
5034		- private MenuItem clearItem;
	6341	+ private JMenuItem pasteIntoItem;
	6342	+ private JMenuItem pasteLinkItem;
	6343	+ private JMenuItem pasteCloneItem;
	6344	+ private JMenuItem pasteExpandItem;
	6345	+ private JMenuItem deleteItem;
5035	6346	private MenuItem clearAllItem;
5036	6347	private MenuItem genUVItem;
5037	6348	private MenuItem genNormalsMESHItem;
..	..	@@ -5057,6 +6368,7 @@
5057	6368	private MenuItem clipMeshItem;
5058	6369	private MenuItem smoothMeshItem;
5059	6370	private MenuItem clearMaterialsItem;
	6371	+ private MenuItem clearVersionsItem;
5060	6372
5061	6373	private MenuItem liveleavesItem;
5062	6374	private MenuItem unliveleavesItem;
..	..	@@ -5066,6 +6378,10 @@
5066	6378	private MenuItem showleavesItem;
5067	6379	private MenuItem markleavesItem;
5068	6380	private MenuItem unmarkleavesItem;
	6381	+ private MenuItem rewindleavesItem;
	6382	+ private MenuItem unrewindleavesItem;
	6383	+ private MenuItem randomleavesItem;
	6384	+ private MenuItem unrandomleavesItem;
5069	6385
5070	6386	private MenuItem flipVItem;
5071	6387	private MenuItem unflipVItem;
..	..	@@ -5076,16 +6392,21 @@
5076	6392	private MenuItem maxTexturesItem;
5077	6393	private MenuItem panoTexturesItem;
5078	6394
	6395	+ private MenuItem textureRatioRItem;
	6396	+ private MenuItem textureRatioGItem;
	6397	+ private MenuItem textureRatioBItem;
5079	6398	private MenuItem resetCentroidItem;
5080		- private MenuItem transformgeometryItem;
	6399	+ private MenuItem resetCentroidXZItem;
5081	6400	private MenuItem resetTransformItem;
	6401	+ private MenuItem transformGeometryItem;
	6402	+ private MenuItem transformChildrenItem;
5082	6403	private MenuItem hideItem;
5083		- private MenuItem grabItem;
	6404	+ private JMenuItem grabItem;
5084	6405	private MenuItem backItem;
5085	6406	private MenuItem frontItem;
5086	6407	private MenuItem cameraItem;
5087	6408	private MenuItem compositeItem;
5088		- private MenuItem randomItem;
	6409	+ private MenuItem switchItem;
5089	6410	private MenuItem physicsItem;
5090	6411	private MenuItem frameselectorItem;
5091	6412	private MenuItem scriptNodeItem;
..	..	@@ -5093,7 +6414,7 @@
5093	6414	private MenuItem switchTransfoItem;
5094	6415	private MenuItem morphItem;
5095	6416	private MenuItem linkerItem;
5096		- private MenuItem ungroupItem;
	6417	+ private JMenuItem ungroupItem;
5097	6418	private MenuItem editItem;
5098	6419	private MenuItem openWindowItem;
5099	6420	private MenuItem editLeafItem;
..	..	@@ -5109,6 +6430,8 @@
5109	6430	private MenuItem attachBumpItem;
5110	6431	private MenuItem detachBumpItem;
5111	6432	private MenuItem pigmentBumpItem;
	6433	+ private MenuItem embedTexturesItem;
	6434	+ private MenuItem deEmbedTexturesItem;
5112	6435
5113	6436	private MenuItem particleItem;
5114	6437	private MenuItem ragdollItem;
..	..	@@ -5125,7 +6448,7 @@
5125	6448	private MenuItem blobItem;
5126	6449	private MenuItem latheItem;
5127	6450	private MenuItem bezierItem;
5128		- private MenuItem checkerItem;
	6451	+ private MenuItem overlayItem;
5129	6452	private MenuItem meshItem;
5130	6453	// private MenuItem meshGroupItem;
5131	6454	private MenuItem springItem;
..	..	@@ -5147,11 +6470,6 @@
5147	6470	private MenuItem doubleItem;
5148	6471	private MenuItem tripleItem;
5149	6472
5150		- private MenuItem importGFDItem;
5151		- private MenuItem importVRMLX3DItem;
5152		- private MenuItem import3DSItem;
5153		- private MenuItem importOBJItem;
5154		-
5155	6473	private MenuItem computeAOItem;
5156	6474	private MenuItem recompileItem;
5157	6475	private MenuItem editScriptItem;
..	..	@@ -5161,4 +6479,8 @@
5161	6479	private MenuItem analyzeItem;
5162	6480	private MenuItem dumpItem;
5163	6481	//boolean freezemodel = false;
	6482	+
	6483	+ Menu cameraMenu;
	6484	+ MenuItem editCameraItem;
	6485	+ MenuItem restoreCameraItem;
5164	6486	}