~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		-class GroupEditor extends ObjEditor implements iParse, //iCallBack,
	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,17 +429,29 @@
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	{
86		- // Object3D keep = GraphreeD.clipboard;
	450	+ if (Globals.REPLACEONMAKE)
	451	+ Save();
	452	+ boolean keep = Globals.REPLACEONMAKE;
	453	+ Globals.REPLACEONMAKE = false;
	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();)
89	457	{
..	..	@@ -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(GraphreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
102		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GraphreeD.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(GraphreeD.clipboard, false));
107		- GraphreeD.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)GraphreeD.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,57 +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);
191		- menu.add("-");
192		- resetMeshItem = menu.add(new MenuItem("Reset All"));
193		- resetMeshItem.addActionListener(this);
194		- stepAllItem = menu.add(new MenuItem("Step All"));
195		- stepAllItem.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());
	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	+
	657	+ oe.menuBar.add(menu = new Menu("Setting"));
	658	+ if (Globals.ADVANCED)
	659	+ {
196	660	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
197	661	revertMeshItem.addActionListener(this);
198	662	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
199	663	resetreferencesItem.addActionListener(this);
200	664	menu.add("-");
	665	+ }
201	666	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
202	667	overwriteGeoItem.addActionListener(this);
203	668	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -209,72 +674,118 @@
209	674	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
210	675	overwriteUVItem.addActionListener(this);
211	676	menu.add("-");
	677	+ if (Globals.ADVANCED)
	678	+ {
212	679	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
213	680	generateMeshItem.addActionListener(this);
214	681	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
215	682	poseMeshItem.addActionListener(this);
216	683	menu.add("-");
	684	+ }
217	685	resetsupportItem = menu.add(new MenuItem("Reset support"));
218	686	resetsupportItem.addActionListener(this);
219	687	linkverticesItem = menu.add(new MenuItem("Link to Support"));
220	688	linkverticesItem.addActionListener(this);
	689	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	690	+ relinkverticesItem.addActionListener(this);
	691	+
	692	+ if (Globals.ADVANCED)
	693	+ {
221	694	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
222	695	setMasterItem.addActionListener(this);
	696	+ }
223	697
224		- oe.menuBar.add(menu = new Menu("Object"));
225		- grabItem = menu.add(new MenuItem("Grab"));
226		- grabItem.addActionListener(this);
227		- frontItem = menu.add(new MenuItem("Front"));
228		- frontItem.addActionListener(this);
	698	+ oe.menuBar.add(menu = new Menu("Order"));
	699	+
229	700	backItem = menu.add(new MenuItem("Back"));
230	701	backItem.addActionListener(this);
231		- compositeItem = menu.add(new MenuItem("Composite"));
232		- compositeItem.addActionListener(this);
233		- menu.add("-");
234		- randomItem = menu.add(new MenuItem("Random"));
235		- randomItem.addActionListener(this);
236		- physicsItem = menu.add(new MenuItem("Physics"));
237		- physicsItem.addActionListener(this);
238		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
239		- frameselectorItem.addActionListener(this);
	702	+ frontItem = menu.add(new MenuItem("Front"));
	703	+ frontItem.addActionListener(this);
	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"));
	713	+ hideItem.addActionListener(this);
	714	+ }
	715	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
	716	+ ungroupItem.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	+ {
240	729	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
241	730	switchGeoItem.addActionListener(this);
242	731	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
243	732	switchTransfoItem.addActionListener(this);
244		- morphItem = menu.add(new MenuItem("Morph"));
	733	+ morphItem = menu.add(new MenuItem("Morph Group"));
245	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);
246	741	scriptNodeItem = menu.add(new MenuItem("Script Node"));
247	742	scriptNodeItem.addActionListener(this);
248		- cameraItem = menu.add(new MenuItem("Camera"));
249		- cameraItem.addActionListener(this);
250		- menu.add("-");
251		- textureItem = menu.add(new MenuItem("Texture"));
252		- textureItem.addActionListener(this);
	743	+ }
	744	+
	745	+ oe.menuBar.add(menu = new Menu("Object"));
	746	+// textureItem = menu.add(new MenuItem("Texture"));
	747	+// textureItem.addActionListener(this);
	748	+ billboardItem = menu.add(new MenuItem("Billboard"));
	749	+ billboardItem.addActionListener(this);
253	750	csgItem = menu.add(new MenuItem("CSG"));
254	751	csgItem.addActionListener(this);
255		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	752	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
256	753	shadowXItem.addActionListener(this);
257		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	754	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
258	755	shadowYItem.addActionListener(this);
259		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	756	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
260	757	shadowZItem.addActionListener(this);
	758	+
	759	+ attributeItem = menu.add(new MenuItem("Attribute"));
	760	+ attributeItem.addActionListener(this);
	761	+ if (Globals.ADVANCED)
	762	+ {
	763	+ menu.add("-");
261	764	linkerItem = menu.add(new MenuItem("Linker"));
262	765	linkerItem.addActionListener(this);
263	766	templateItem = menu.add(new MenuItem("Template"));
264	767	templateItem.addActionListener(this);
265		- attributeItem = menu.add(new MenuItem("Attribute"));
266		- attributeItem.addActionListener(this);
267	768	pointflowItem = menu.add(new MenuItem("Point Flow"));
268	769	pointflowItem.addActionListener(this);
	770	+ }
269	771	menu.add("-");
270		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
271		- transformgeometryItem.addActionListener(this);
	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);
	778	+ menu.add("-");
272	779	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
273	780	resetTransformItem.addActionListener(this);
274	781	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
275	782	resetCentroidItem.addActionListener(this);
276		- ungroupItem = menu.add(new MenuItem("Ungroup"));
277		- ungroupItem.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);
278	789
279	790	oe.menuBar.add(menu = new Menu("Geometry"));
280	791	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -283,6 +794,13 @@
283	794	genNormalsORGANItem.addActionListener(this);
284	795	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
285	796	genNormalsCADItem.addActionListener(this);
	797	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	798	+ genNormalsMESHItem.addActionListener(this);
	799	+ if (Globals.ADVANCED)
	800	+ {
	801	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
	802	+ genNormalsMINEItem.addActionListener(this);
	803	+ }
286	804	stripifyItem = menu.add(new MenuItem("Stripify"));
287	805	stripifyItem.addActionListener(this);
288	806	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -292,8 +810,6 @@
292	810	untrimItem = menu.add(new MenuItem("Untrim"));
293	811	untrimItem.addActionListener(this);
294	812	menu.add("-");
295		- clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
296		- clearMaterialsItem.addActionListener(this);
297	813	clearColorsItem = menu.add(new MenuItem("Clear AO"));
298	814	clearColorsItem.addActionListener(this);
299	815	reverseNormalsItem = menu.add(new MenuItem("Reverse Normals"));
..	..	@@ -306,53 +822,69 @@
306	822	reduce34MeshItem.addActionListener(this);
307	823	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	824	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	825	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	826	clipMeshItem.addActionListener(this);
	827	+
	828	+ if (Globals.ADVANCED)
	829	+ {
	830	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	831	+ smoothMeshItem.addActionListener(this);
	832	+ }
	833	+
	834	+ oe.menuBar.add(menu = new Menu("Attributes"));
	835	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	836	+ clearVersionsItem.addActionListener(this);
	837	+ clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
	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);
313	843	menu.add("-");
314	844	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
315	845	liveleavesItem.addActionListener(this);
316	846	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
317	847	unliveleavesItem.addActionListener(this);
	848	+ if (Globals.ADVANCED)
	849	+ {
318	850	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
319	851	supportleavesItem.addActionListener(this);
320	852	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
321	853	unsupportleavesItem.addActionListener(this);
	854	+ }
322	855	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
323	856	hideleavesItem.addActionListener(this);
324	857	showleavesItem = menu.add(new MenuItem("Show Leaves"));
325	858	showleavesItem.addActionListener(this);
326		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	859	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
327	860	markleavesItem.addActionListener(this);
328		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	861	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
329	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);
330	871	menu.add("-");
331	872	flipVItem = menu.add(new MenuItem("Flip V"));
332	873	flipVItem.addActionListener(this);
333	874	unflipVItem = menu.add(new MenuItem("Unflip V"));
334	875	unflipVItem.addActionListener(this);
335		- lowTexturesItem = menu.add(new MenuItem("Low Texture"));
	876	+ lowTexturesItem = menu.add(new MenuItem("Low Texture (256)"));
336	877	lowTexturesItem.addActionListener(this);
337		- normalTexturesItem = menu.add(new MenuItem("Normal Texture"));
	878	+ normalTexturesItem = menu.add(new MenuItem("Normal Texture (512)"));
338	879	normalTexturesItem.addActionListener(this);
339		- highTexturesItem = menu.add(new MenuItem("High Texture"));
	880	+ highTexturesItem = menu.add(new MenuItem("High Texture (1024)"));
340	881	highTexturesItem.addActionListener(this);
341		- veryhighTexturesItem = menu.add(new MenuItem("Very high Texture"));
	882	+ veryhighTexturesItem = menu.add(new MenuItem("Very high Texture (2048)"));
342	883	veryhighTexturesItem.addActionListener(this);
343		- maxTexturesItem = menu.add(new MenuItem("Max Texture"));
	884	+ maxTexturesItem = menu.add(new MenuItem("Max Texture (4096)"));
344	885	maxTexturesItem.addActionListener(this);
345		- panoTexturesItem = menu.add(new MenuItem("Panoramic Texture"));
	886	+ panoTexturesItem = menu.add(new MenuItem("Panoramic Texture (8192)"));
346	887	panoTexturesItem.addActionListener(this);
347		- menu.add("-");
348		- extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
349		- extractGeometriesItem.addActionListener(this);
350		- cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
351		- cloneGeometriesItem.addActionListener(this);
352		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
353		- shareGeometriesItem.addActionListener(this);
354		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
355		- mergeGeometriesItem.addActionListener(this);
356	888
357	889	oe.menuBar.add(menu = new Menu("Selection"));
358	890	attachPigmentItem = menu.add(new MenuItem("Attach Pigment..."));
..	..	@@ -361,31 +893,135 @@
361	893	attachBumpItem.addActionListener(this);
362	894	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
363	895	pigmentBumpItem.addActionListener(this);
	896	+ //embedTexturesItem
364	897	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
365	898	detachPigmentItem.addActionListener(this);
366	899	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
367	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);
368	905	menu.add("-");
369	906	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
370	907	sortbysizeItem.addActionListener(this);
371	908	sortbynameItem = menu.add(new MenuItem("Sort by name"));
372	909	sortbynameItem.addActionListener(this);
	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.
	921	+ extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
	922	+ extractGeometriesItem.addActionListener(this);
	923	+ cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
	924	+ cloneGeometriesItem.addActionListener(this);
	925	+ }
	926	+
373	927	oe.menuBar.add(menu = new Menu("Insert"));
374	928	buildCreateMenu(menu);
375		- oe.menuBar.add(menu = new Menu("Tools"));
	929	+
	930	+ oe.menuBar.add(menu = new Menu("Tools"));
376	931	buildToolsMenu(menu);
377	932	}
378	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	+
379	1008	void SetupUI2(ObjEditor oe)
380	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	+
381	1022	//new Exception().printStackTrace();
382	1023
383	1024	oe.radioPanel = new JPanel(new GridBagLayout());
384		- oe.aConstraints.weightx = 1;
385		- oe.aConstraints.weighty = 0;
386		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
387		- oe.aConstraints.gridwidth = 100;
388		- oe.aConstraints.gridheight = 1;
389	1025	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
390	1026
391	1027	oe.buttonGroup = new ButtonGroup();
..	..	@@ -406,150 +1042,269 @@
406	1042	oe.radioPanel.add(dummyButton);
407	1043	oe.buttonGroup.add(dummyButton);
408	1044	*/
409		- aConstraints.gridy += 1;
410		- oe.aConstraints.gridwidth = 1;
411		- oe.aConstraints.gridx = 0;
	1045	+ cGridBag versionManagerPanel = new cGridBag();
	1046	+
	1047	+ versionManagerPanel.preferredHeight = 4;
412	1048
413		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	1049	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	1050	+
	1051	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1052	+ //minButton.setToolTipText("Minimize window");
	1053	+ //minButton.addActionListener(this);
	1054	+
	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);
	1106	+ screenfitButton.setToolTipText("Screen fit");
	1107	+ screenfitButton.addActionListener(this);
	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");
414	1151	liveCB.addItemListener(this);
415	1152
416		- oe.aConstraints.gridx += 1;
417		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
418		- supportCB.addItemListener(this);
419		-
420		- // oe.aConstraints.gridx += 1;
421		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
422		- // localCB.addItemListener(this);
423		-
424		- oe.aConstraints.gridx += 1;
425		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
426		- crowdCB.addItemListener(this);
427		-
428		- oe.aConstraints.gridx += 1;
429		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
430		- smoothCB.addItemListener(this);
431		-
432		- oe.aConstraints.gridx += 1;
433		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	1153	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1154	+ fastCB.setToolTipText("Fast mode");
434	1155	fastCB.addItemListener(this);
435		- oe.aConstraints.gridx += 1;
436		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
437		- slowCB.addItemListener(this);
438		- oe.aConstraints.gridx += 1;
439		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
440		- boxCB.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);
441	1162
442		-// oe.aConstraints.gridx += 1;
443		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
444		-// speakerMocapCB.addItemListener(this);
445		-
446		- if (false)
447		- {
448		- // handled in scripts
449		- oe.aConstraints.gridx += 1;
450		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
451		- speakerCameraCB.addItemListener(this);
452		-
453		- oe.aConstraints.gridx += 1;
454		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
455		- speakerFocusCB.addItemListener(this);
456		-
457		- oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
459		- smoothfocusCB.addItemListener(this);
460		- }
461		-
462		-//oe.aConstraints.gridx += 1;
463		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
464		-// debugCB.addItemListener(this);
465		-
466		- oe.aConstraints.gridx += 1;
467		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
468		- oeilCB.addItemListener(this);
469		-
470		- oe.aConstraints.gridx += 1;
471		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
472		- lookAtCB.addItemListener(this);
473		-
474		- oe.aConstraints.gridx += 1;
475		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
476		- trackCB.addItemListener(this);
477		-
478		- oe.aConstraints.gridx += 1;
479		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
480		- screenfitButton.addActionListener(this);
481		- oe.aConstraints.gridx += 1;
482	1163	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
483	1164	// screenfitpointButton.addActionListener(this);
484		-// oe.aConstraints.gridx += 1;
485		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
486		- snapobjectButton.addActionListener(this);
487		- oe.aConstraints.gridx += 1;
488	1165
489		- //aConstraints.gridx = 0;
490		- //aConstraints.gridy += 1;
491		- oe.aConstraints.weighty = 0;
492		- oe.aConstraints.gridwidth = 1;
493		-
494		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
495		- flashSelectionButton.addActionListener(this);
496		- oe.aConstraints.gridx += 1;
497		- oe.aConstraints.weighty = 0;
498		- oe.aConstraints.gridwidth = 1;
499		-
500		- //
501		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
502		- twoButton.addActionListener(this);
503		- 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);
504	1173	fourButton.addActionListener(this);
505		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
506		- sixButton.addActionListener(this);
507		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
508		- threeButton.addActionListener(this);
509		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
510		- sevenButton.addActionListener(this);
511		- //
	1174	+ fourButton.setToolTipText("Show control panel only");
	1175	+ }
512	1176
513		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	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");
514	1182	rootButton.addActionListener(this);
515		- oe.aConstraints.gridx += 1;
516		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	1183	+
	1184	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1185	+ closeButton.setToolTipText("Close tab");
517	1186	closeButton.addActionListener(this);
518	1187	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
519	1188	//clearButton.addActionListener(this);
520		- oe.aConstraints.gridx += 1;
521		-
522		- oe.aConstraints.gridx = 1; //
523		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
524		- editButton.addActionListener(this);
525		- oe.aConstraints.gridx += 1;
526		- oe.aConstraints.weighty = 0;
527		- oe.aConstraints.gridwidth = 1;
528	1189
529		- 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");
530	1284	uneditButton.addActionListener(this);
531	1285
532		- oe.aConstraints.gridx += 1;
533		- oe.aConstraints.weighty = 0;
534		- oe.aConstraints.gridwidth = 1;
535		-
536		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
537		- clearPanelButton.addActionListener(this);
538		-
539		- oe.aConstraints.gridx += 1;
540		- oe.aConstraints.weighty = 0;
541		- oe.aConstraints.gridwidth = 1;
542		-
543		- 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");
544	1288	allParamsButton.addActionListener(this);
545	1289
546		- oe.aConstraints.gridx += 1;
547		- oe.aConstraints.weighty = 0;
548		- oe.aConstraints.gridwidth = 1;
549		-
550		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
551		- 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);
552	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	+
553	1308	// oe.aConstraints.gridx += 1;
554	1309	// oe.aConstraints.weighty = 0;
555	1310	// oe.aConstraints.gridwidth = 1;
..	..	@@ -561,47 +1316,34 @@
561	1316	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
562	1317	// gcButton.addActionListener(this);
563	1318
564		- oe.aConstraints.gridx = 0;
565		- oe.aConstraints.gridy += 1;
566		-
567		- //ctrlPanel.add(objList = new List(5, true));
568		- oe.aConstraints.gridwidth = 100;
569		- // oe.aConstraints.gridheight = 100;
570		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
571		- oe.aConstraints.gridheight = 1;
572		- oe.aConstraints.weighty = 0.5;
573		- oe.aConstraints.gridx = 0;
574		- JScrollPane jSP;
	1319	+ cGridBag jSPPanel = new cGridBag();
	1320	+
	1321	+ jSPPanel.preferredHeight = 20;
	1322	+
	1323	+ JScrollPane jSP;
575	1324	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
576		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	1325	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
577	1326	ResetModel();
578		- oe.aConstraints.weighty = 0.5;
579		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
580		- oe.aConstraints.gridy += 1;
581		- oe.aConstraints.gridwidth = 1;
582		-
583		- oe.aConstraints.weighty = 0;
584		- oe.aConstraints.gridwidth = 2;
585		-
586		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
587		- colorCB.addItemListener(this);
588		- oe.aConstraints.gridx += 2;
589		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
590		- materialCB.addItemListener(this);
591		- oe.aConstraints.gridx += 2;
592		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
593		- textureCB.addItemListener(this);
594		-
595		- oe.aConstraints.gridx = 0;
596		- oe.aConstraints.gridy += 1;
597	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	+
598	1340	//jList.addListSelectionListener(this);
599	1341	oe.jTree.addTreeSelectionListener(this);
600	1342	//jTree.setRootVisible(false);
601	1343	//jTree.setEditable(true);
602	1344	oe.jTree.setDragEnabled(true);
603	1345	//jTree.setPreferredSize(new Dimension(10,10));
604		- jSP.setPreferredSize(new Dimension(100,200));
	1346	+ //jSP.setPreferredSize(new Dimension(100,200));
605	1347
606	1348	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
607	1349
..	..	@@ -613,47 +1355,204 @@
613	1355	dgr.addDragGestureListener(this);
614	1356	}catch(Exception e) {}
615	1357	*/
616		- radio.layout = sevenButton;
	1358	+ radio.layout = threeButton; // sixButton;
617	1359	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
618	1360	}
	1361	+
	1362	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1363	+ {
	1364	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1365	+ colorCB.setToolTipText("Copy color when dropped");
	1366	+ colorCB.addItemListener(this);
	1367	+
	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	+
	1396	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	1397	+ // localCB.addItemListener(this);
	1398	+
	1399	+ panel.Return();
	1400	+
	1401	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	1402	+ crowdCB.setToolTipText("Used for crowds");
	1403	+ crowdCB.addItemListener(this);
	1404	+
	1405	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	1406	+ smoothCB.setToolTipText("Snapping delay");
	1407	+ smoothCB.addItemListener(this);
	1408	+
	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	+
	1416	+// constraints.gridy += 1;
	1417	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	1418	+// speakerMocapCB.addItemListener(this);
	1419	+
	1420	+ panel.Return();
	1421	+
	1422	+ if (false)
	1423	+ {
	1424	+ // handled in scripts
	1425	+ //constraints.gridy += 1;
	1426	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	1427	+ speakerCameraCB.addItemListener(this);
	1428	+
	1429	+ //constraints.gridy += 1;
	1430	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	1431	+ speakerFocusCB.addItemListener(this);
	1432	+
	1433	+ //constraints.gridy += 1;
	1434	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1435	+ smoothfocusCB.addItemListener(this);
	1436	+ panel.Return();
	1437	+ }
	1438	+
	1439	+//constraints.gridx += 1;
	1440	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	1441	+// debugCB.addItemListener(this);
	1442	+
	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");
	1449	+ oeilCB.addItemListener(this);
	1450	+
	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);
	1472	+ lookAtCB.setToolTipText("Look-at target");
	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);
	1488	+
	1489	+ }
619	1490
620	1491	void EditObject(Object3D obj)
621	1492	{
622		- cRadio dummyButton = new cRadio(obj.name);
623		- dummyButton.SetObject(obj);
624		- dummyButton.layout = sevenButton;
625		- dummyButton.SetCamera(cameraView.renderCamera, false);
626		- dummyButton.addActionListener(this);
627		- radioPanel.add(dummyButton);
628		- buttonGroup.add(dummyButton);
629		- dummyButton.doClick();
	1493	+ //assert(obj instanceof Composite);
	1494	+
	1495	+// if (obj.versionlist == null)
	1496	+// {
	1497	+// obj.versionlist = new Object3D[100];
	1498	+// obj.versionindex = -1;
	1499	+// }
	1500	+
	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	+
	1510	+ radioButton.SetObject(obj);
	1511	+ radioButton.layout = threeButton; // sixButton;
	1512	+ radioButton.SetCamera(cameraView.renderCamera, false);
	1513	+ radioButton.addActionListener(this);
	1514	+ radioPanel.add(radioButton);
	1515	+ buttonGroup.add(radioButton);
	1516	+ radioButton.doClick();
630	1517	}
	1518	+
631	1519	void SetupViews(ObjEditor oe)
632	1520	{
	1521	+ theFrame = this;
	1522	+
633	1523	oe.SetupViews();
634	1524
	1525	+ if (Globals.DEBUG)
635	1526	System.out.println("SetupViews");
636	1527	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
637	1528	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
638	1529	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
639	1530	}
640	1531
641		- JCheckBox liveCB;
642		- JCheckBox supportCB;
643		- JCheckBox localCB;
644		- JCheckBox crowdCB;
645		- JCheckBox smoothCB;
646		- JCheckBox fastCB;
647		- JCheckBox slowCB;
648		- JCheckBox boxCB;
649		- JCheckBox trackCB;
650		- 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;
651	1547	// JCheckBox speakerMocapCB;
652		- JCheckBox speakerCameraCB;
653		- JCheckBox speakerFocusCB;
654		- JCheckBox debugCB;
655		- JCheckBox oeilCB;
656		- JCheckBox lookAtCB;
	1548	+ cCheckBox speakerCameraCB;
	1549	+ cCheckBox speakerFocusCB;
	1550	+ cCheckBox debugCB;
	1551	+
	1552	+ cCheckBox oeilCB;
	1553	+ cCheckBox shadowCB;
	1554	+ cCheckBox autokeepCB;
	1555	+ cCheckBox lookAtCB;
657	1556
658	1557	// static int COLOR = 1;
659	1558	// static int MATERIAL = 2;
..	..	@@ -661,9 +1560,9 @@
661	1560
662	1561	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
663	1562
664		- JCheckBox colorCB;
665		- JCheckBox materialCB;
666		- JCheckBox textureCB;
	1563	+ cCheckBox colorCB;
	1564	+ cCheckBox materialCB;
	1565	+ cCheckBox textureCB;
667	1566
668	1567	public void itemStateChanged(ItemEvent e)
669	1568	{
..	..	@@ -688,10 +1587,10 @@
688	1587	dropAttributes \|= Object3D.TEXTURE;
689	1588	else
690	1589	dropAttributes &= ~Object3D.TEXTURE;
691		- }
692		- else if(e.getSource() == liveCB)
	1590	+ } else if(e.getSource() == liveCB)
693	1591	{
694	1592	cameraView.ToggleLive();
	1593	+ refreshContents(false);
695	1594	}
696	1595	else if(e.getSource() == supportCB)
697	1596	{
..	..	@@ -707,6 +1606,12 @@
707	1606	{
708	1607	cameraView.ToggleInertia();
709	1608	cameraView.repaint();
	1609	+ }
	1610	+ else if(e.getSource() == minshaderCB)
	1611	+ {
	1612	+ Globals.MINSHADER ^= true;
	1613	+ cameraView.programInitialized = false;
	1614	+ cameraView.repaint();
710	1615	}
711	1616	else if(e.getSource() == localCB)
712	1617	{
..	..	@@ -726,6 +1631,10 @@
726	1631	Recompile();
727	1632	cameraView.repaint();
728	1633	// refreshContents();
	1634	+ }
	1635	+ else if(e.getSource() == zoomBoxCB)
	1636	+ {
	1637	+ cameraView.ToggleZoomBoxMode();
729	1638	}
730	1639	else if(e.getSource() == smoothfocusCB)
731	1640	{
..	..	@@ -752,6 +1661,18 @@
752	1661	{
753	1662	cameraView.ToggleOeil();
754	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	+ }
755	1676	else if(e.getSource() == lookAtCB)
756	1677	{
757	1678	cameraView.ToggleLookAt();
..	..	@@ -768,7 +1689,8 @@
768	1689
769	1690	/**/
770	1691	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
771		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1692	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1693	+ TreePath path = objEditor.jTree.getSelectionPath();
772	1694	if ((path == null) \|\| (path.getPathCount() <= 1)) {
773	1695	// We can't move the root node or an empty selection
774	1696	return;
..	..	@@ -831,8 +1753,6 @@
831	1753	}
832	1754	}
833	1755
834		- String string = (String) object;
835		-
836	1756	System.out.println("Transfer = " + object + "; drop : " + target);
837	1757	// if( object instanceof java.io.File[])
838	1758	// {
..	..	@@ -840,7 +1760,11 @@
840	1760	// objEditor.DropFile((java.io.File[]) object, true);
841	1761	// return;
842	1762	// }
843		- 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) == ':')
844	1768	{
845	1769	// file(s)
846	1770	String[] names = string.split("\n");
..	..	@@ -867,7 +1791,7 @@
867	1791
868	1792	flashIt = false;
869	1793	CameraPane pane = (CameraPane) target;
870		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1794	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
871	1795	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
872	1796
873	1797	if (group.selection.size() == 1)
..	..	@@ -883,23 +1807,33 @@
883	1807
884	1808	assert target == objEditor.jTree;
885	1809	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1810	+ Object3D destinationLeaf;
886	1811	try {
887		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1812	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
888	1813	} catch (Exception e) {
889	1814	System.out.println("destinationPath : " + destinationPath);
890	1815	return;
891	1816	}
892	1817
893		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1818	+ for (int i=group.selection.size(); --i>=0;)
894	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	+// {
895	1829	loadClipboard(true);
896	1830	objEditor.jTree.setSelectionPath(destinationPath);
897		- pasteInto(false);
898		- } else {
899		- loadClipboard(false);
900		- objEditor.jTree.setSelectionPath(destinationPath);
901		- pasteInto(false); // true); // ???
902		- }
	1831	+ pasteInto(false, false);
	1832	+// } else {
	1833	+// loadClipboard(false);
	1834	+// objEditor.jTree.setSelectionPath(destinationPath);
	1835	+// pasteInto(false, false); // true); // ???
	1836	+// }
903	1837	}
904	1838	public void dropActionChanged(DropTargetDragEvent dtde)
905	1839	// Called if the user has modified the current drop gesture
..	..	@@ -955,7 +1889,12 @@
955	1889	TreePath path;
956	1890
957	1891	public TransferableTreePath(TreePath tp) {
958		- 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);
959	1898	}
960	1899
961	1900	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1002,90 +1941,109 @@
1002	1941
1003	1942	void buildCreateMenu(Menu menu)
1004	1943	{
1005		- gridItem = menu.add(new MenuItem("Grid"));
1006		- gridItem.addActionListener(this);
1007		- rectoidItem = menu.add(new MenuItem("Box"));
1008		- rectoidItem.addActionListener(this);
1009		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1010		- ellipsoidItem.addActionListener(this);
1011		- coneItem = menu.add(new MenuItem("Cone"));
1012		- coneItem.addActionListener(this);
1013		- torusItem = menu.add(new MenuItem("Torus"));
1014		- torusItem.addActionListener(this);
1015		- superItem = menu.add(new MenuItem("Superellipsoid"));
1016		- superItem.addActionListener(this);
1017		- particleItem = menu.add(new MenuItem("Particle system"));
1018		- particleItem.addActionListener(this);
	1944	+ //heightFieldItem = menu.add(new MenuItem("Height Field"));
	1945	+ //heightFieldItem.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	+ {
	1964	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1965	+ kleinItem.addActionListener(this);
	1966	+ }
	1967	+
	1968	+// particleItem = menu.add(new MenuItem("Particle system"));
	1969	+// particleItem.addActionListener(this);
	1970	+ if (Globals.ADVANCED)
	1971	+ {
1019	1972	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1020	1973	ragdollItem.addActionListener(this);
1021	1974	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1022	1975	ragdoll2Item.addActionListener(this);
	1976	+ }
1023	1977	menu.add("-");
1024		- meshItem = menu.add(new MenuItem("Mesh"));
	1978	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1025	1979	meshItem.addActionListener(this);
1026	1980	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1027	1981	// meshGroupItem.addActionListener(this);
	1982	+ if (Globals.ADVANCED)
	1983	+ {
1028	1984	springItem = menu.add(new MenuItem("Spring"));
1029	1985	springItem.addActionListener(this);
1030	1986	flagItem = menu.add(new MenuItem("Flag"));
1031	1987	flagItem.addActionListener(this);
1032		- bezierItem = menu.add(new MenuItem("Patch"));
1033		- bezierItem.addActionListener(this);
1034		- checkerItem = menu.add(new MenuItem("Checker"));
1035		- checkerItem.addActionListener(this);
1036	1988	blobItem = menu.add(new MenuItem("Blob"));
1037	1989	blobItem.addActionListener(this);
1038	1990	latheItem = menu.add(new MenuItem("Lathe"));
1039	1991	latheItem.addActionListener(this);
1040		- lightItem = menu.add(new MenuItem("Light"));
1041		- 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);
1042	1999	menu.add("-");
1043	2000	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1044	2001	//superLoopItem.addActionListener(this);
1045		- loopItem = menu.add(new MenuItem("Loop"));
1046		- loopItem.addActionListener(this);
	2002	+// loopItem = menu.add(new MenuItem("Loop"));
	2003	+// loopItem.addActionListener(this);
1047	2004	doubleItem = menu.add(new MenuItem("Fork"));
1048	2005	doubleItem.addActionListener(this);
	2006	+ if (Globals.ADVANCED)
	2007	+ {
1049	2008	tripleItem = menu.add(new MenuItem("Trident"));
1050	2009	tripleItem.addActionListener(this);
1051		- menu.add("-");
1052		- importGFDItem = menu.add(new MenuItem("GraphreeD Object..."));
1053		- importGFDItem.addActionListener(this);
1054		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
1055		- importVRMLX3DItem.addActionListener(this);
1056		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
1057		- importOBJItem.addActionListener(this);
1058		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
1059		- import3DSItem.addActionListener(this);
	2010	+ }
1060	2011	}
1061	2012
1062	2013	void buildToolsMenu(Menu menu)
1063	2014	{
1064	2015	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1065	2016	animationItem.addItemListener(this);
1066		- animationItem.setState(CameraPane.ANIMATION);
	2017	+ animationItem.setState(Globals.ANIMATION);
	2018	+
	2019	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2020	+ archiveItem.addActionListener(this);
1067	2021
1068	2022	menu.add("-");
1069	2023	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1070	2024	parseverticesItem.addActionListener(this);
1071		- alignItem = menu.add(new MenuItem("Align"));
	2025	+ textureFieldItem = menu.add(new MenuItem("Texture Field"));
	2026	+ textureFieldItem.addActionListener(this);
	2027	+ alignItem = menu.add(new MenuItem("Align Objects"));
1072	2028	alignItem.addActionListener(this);
1073		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1074		- mirrorItem.addActionListener(this);
1075	2029	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1076	2030	reduceMorphItem.addActionListener(this);
1077	2031	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1078	2032	reduce34MorphItem.addActionListener(this);
1079		-
1080		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1081		- computeAOItem.addActionListener(this);
1082	2033	menu.add("-");
1083		-
1084	2034	menu.add(memoryItem = new MenuItem("Memory Usage"));
1085	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("-");
1086	2044	menu.add(analyzeItem = new MenuItem("Analyze"));
1087	2045	analyzeItem.addActionListener(this);
1088		- menu.add(dumpItem = new MenuItem("Dump"));
	2046	+ menu.add(dumpItem = new MenuItem("Print"));
1089	2047	dumpItem.addActionListener(this);
1090	2048	// menu.add(pathItem = new MenuItem("From-to path"));
1091	2049	// pathItem.addActionListener(this);
..	..	@@ -1094,6 +2052,8 @@
1094	2052	resetParentItem.addActionListener(this);
1095	2053	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1096	2054	repairParentItem.addActionListener(this);
	2055	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	2056	+ repairShadowItem.addActionListener(this);
1097	2057	menu.add(invariantsItem = new MenuItem("Invariants"));
1098	2058	invariantsItem.addActionListener(this);
1099	2059	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1101,6 +2061,7 @@
1101	2061	menu.add("-");
1102	2062	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1103	2063	editScriptItem.addActionListener(this);
	2064	+ }
1104	2065	}
1105	2066
1106	2067	void ScreenFit()
..	..	@@ -1165,24 +2126,24 @@
1165	2126	switch(axis)
1166	2127	{
1167	2128	case 0 :
1168		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1169		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1170		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1171		- 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;
1172	2133	norm = cVector.X;
1173	2134	break;
1174	2135	case 1 :
1175		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1176		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1177		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1178		- 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;
1179	2140	norm = cVector.Y;
1180	2141	break;
1181	2142	case 2 :
1182		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1183		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1184		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1185		- 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;
1186	2147	norm = cVector.Z;
1187	2148	break;
1188	2149	}
..	..	@@ -1223,9 +2184,38 @@
1223	2184	shadow.material = new cMaterial(obj.material);
1224	2185	shadow.material.diffuse = 0.0001f;
1225	2186	shadow.material.specular = 0.0001f;
	2187	+ shadow.material.opacity = 0.75f;
	2188	+
	2189	+ AllocProjectedVertices(shadow);
	2190	+
	2191	+ shadow.projectedVertices[1].x = 300;
1226	2192
1227	2193	makeSomething(shadow);
1228	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	+ }
1229	2219
1230	2220	/**
1231	2221	* applyExample
..	..	@@ -1429,9 +2419,9 @@
1429	2419
1430	2420	void Overwrite(int mask)
1431	2421	{
1432		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2422	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1433	2423	{
1434		- Object3D content = GraphreeD.clipboard.get(0);
	2424	+ Object3D content = Grafreed.clipboard.get(0);
1435	2425
1436	2426	if (content instanceof cGroup && ((cGroup)content).transientlink )
1437	2427	content = ((cGroup)content).get(0);
..	..	@@ -1454,6 +2444,7 @@
1454	2444	//
1455	2445	public void actionPerformed(ActionEvent event) // , Object arg)
1456	2446	{
	2447	+ Object source = event.getSource();
1457	2448	/*
1458	2449	if (event.getSource() == nameField)
1459	2450	{
..	..	@@ -1465,11 +2456,11 @@
1465	2456	}
1466	2457	else
1467	2458	*/
1468		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	2459	+ if (source == lookAtItem \|\| source == lookFromItem)
1469	2460	{
1470	2461	ScreenFit();
1471	2462	} else
1472		- if (event.getSource() == switchItem)
	2463	+ if (source == switchViewItem)
1473	2464	{
1474	2465	cVector v1 = new cVector();
1475	2466	cVector v2 = new cVector();
..	..	@@ -1478,11 +2469,11 @@
1478	2469	objEditor.cameraView.renderCamera.setAim(v2, v1);
1479	2470	objEditor.cameraView.repaint();
1480	2471	} else
1481		- if (event.getSource() == rectoidItem)
	2472	+ if (source == rectoidItem \|\| source == boxButton)
1482	2473	{
1483	2474	makeSomething(new Box());
1484	2475	} else
1485		- if (event.getSource() == particleItem)
	2476	+ if (source == particleItem \|\| source == particlesButton)
1486	2477	{
1487	2478	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1488	2479	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1503,9 +2494,9 @@
1503	2494	applyExample(particleGeom, "SMOKE");
1504	2495	makeSomething(particleGeom);
1505	2496	} else
1506		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	2497	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1507	2498	{
1508		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	2499	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1509	2500
1510	2501	ragdoll.toParent = LA.newMatrix();
1511	2502	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1521,27 +2512,71 @@
1521	2512	makeSomething(ragdoll);
1522	2513	//makeSomething(new VehicleDemo());
1523	2514	} else
1524		- if (event.getSource() == gridItem)
	2515	+ /*
	2516	+ */
	2517	+ if (source == heightFieldItem)
	2518	+ {
	2519	+ Object3D obj = new Object3D();
	2520	+
	2521	+ obj.CreateMaterial();
	2522	+ obj.bRep = new BoundaryRep();
	2523	+
	2524	+ obj.bRep.CreateMesh(new iHeightField()
	2525	+ {
	2526	+ public double f(double x, double y)
	2527	+ {
	2528	+ // The Mandelbrot set is represented by coloring
	2529	+ // each point (x,y) according to the number of
	2530	+ // iterations it takes before the while loop in
	2531	+ // this method ends. For points that are actually
	2532	+ // in the Mandelbrot set, or very close to it, the
	2533	+ // count will reach the maximum value, 80. These
	2534	+ // points will be colored purple. All other colors
	2535	+ // represent points that are definitely NOT in the set.
	2536	+ x -= 600;
	2537	+ y -= 500;
	2538	+ x /= 200;
	2539	+ y /= 200;
	2540	+ int count = 0;
	2541	+ double zx = x;
	2542	+ double zy = y;
	2543	+ while (count < 80 && Math.abs(x) < 100 && Math.abs(zy) < 100) {
	2544	+ double new_zx = zxzx - zyzy + x;
	2545	+ zy = 2zxzy + y;
	2546	+ zx = new_zx;
	2547	+ count++;
	2548	+ }
	2549	+ return count; // Math.sqrt(count);
	2550	+ }
	2551	+ }, 1000,1000);
	2552	+
	2553	+ makeSomething(obj);
	2554	+ } else
	2555	+ if (source == gridItem \|\| source == gridButton)
1525	2556	{
1526	2557	makeSomething(new Grid());
1527	2558	} else
1528		- if (event.getSource() == ellipsoidItem)
	2559	+ if (source == ellipsoidItem \|\| source == sphereButton)
1529	2560	{
1530	2561	makeSomething(new Sphere());
1531	2562	} else
1532		- if (event.getSource() == coneItem)
	2563	+ if (source == coneItem \|\| source == coneButton)
1533	2564	{
1534	2565	makeSomething(new Cone());
1535	2566	} else
1536		- if (event.getSource() == torusItem)
	2567	+ if (source == torusItem \|\| source == torusButton)
1537	2568	{
1538	2569	makeSomething(new Torus());
1539	2570	} else
1540		- if (event.getSource() == superItem)
	2571	+ if (source == superItem \|\| source == superButton)
1541	2572	{
1542	2573	makeSomething(new Superellipsoid());
1543	2574	} else
1544		- if (event.getSource() == blobItem)
	2575	+ if (source == kleinItem \|\| source == kleinButton)
	2576	+ {
	2577	+ makeSomething(new Klein());
	2578	+ } else
	2579	+ if (source == blobItem)
1545	2580	{
1546	2581	Blob blob = new Blob();
1547	2582	BlobComponent comp = new BlobComponent();
..	..	@@ -1549,15 +2584,15 @@
1549	2584	//blob.retile();
1550	2585	makeSomething(blob);
1551	2586	} else
1552		- if (event.getSource() == latheItem)
	2587	+ if (source == latheItem)
1553	2588	{
1554	2589	makeSomething(new Lathe());
1555	2590	} else
1556		- if (event.getSource() == bezierItem)
	2591	+ if (source == bezierItem)
1557	2592	{
1558	2593	makeSomething(new BezierSurface());
1559	2594	} else
1560		- if (event.getSource() == checkerItem)
	2595	+ if (source == overlayItem \|\| source == overlayButton)
1561	2596	{
1562	2597	/*
1563	2598	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1570,9 +2605,9 @@
1570	2605	LA.matConcat(obj.toParent, cameraView.renderCamera.fromParent, obj.toParent);
1571	2606	LA.matInvert(obj.toParent, obj.fromParent);
1572	2607	*/
1573		- makeSomething(new CheckerIG());
	2608	+ makeSomething(new Checker());
1574	2609	} else
1575		- if (event.getSource() == meshItem)
	2610	+ if (source == meshItem)
1576	2611	{
1577	2612	Object3D itemtomake = new Object3D();
1578	2613	Object3D child;
..	..	@@ -1593,35 +2628,52 @@
1593	2628	makeSomething(child);
1594	2629	}
1595	2630	} else
1596		- if (event.getSource() == springItem)
	2631	+ if (source == springItem)
1597	2632	{
1598	2633	cSpring s = new cSpring();
1599	2634	s.setup();
1600	2635	makeSomething(s);
1601	2636	} else
1602		- if (event.getSource() == flagItem)
	2637	+ if (source == flagItem)
1603	2638	{
1604	2639	cSpring s = new cFlag();
1605	2640	s.setup();
1606	2641	makeSomething(s);
1607	2642	} else
1608		- if (event.getSource() == lightItem)
	2643	+ if (source == lightItem \|\| source == lightButton)
1609	2644	{
1610	2645	makeSomething(new Light());
1611	2646	} else
1612		- if (event.getSource() == csgItem)
	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
	2664	+ if (source == csgItem)
1613	2665	{
1614	2666	group(new CSG());
1615	2667	} else
1616		- if (event.getSource() == templateItem)
	2668	+ if (source == templateItem)
1617	2669	{
1618	2670	group(new cTemplate());
1619	2671	} else
1620		- if (event.getSource() == attributeItem)
	2672	+ if (source == attributeItem)
1621	2673	{
1622	2674	makeSomething(new Attribute());
1623	2675	} else
1624		- if (event.getSource() == pointflowItem)
	2676	+ if (source == pointflowItem)
1625	2677	{
1626	2678	makeSomething(new PointFlow());
1627	2679	} else
..	..	@@ -1633,7 +2685,7 @@
1633	2685	} else
1634	2686	*/
1635	2687
1636		- if (event.getSource() == superLoopItem)
	2688	+ if (source == superLoopItem)
1637	2689	{
1638	2690	Composite g = new cGroup();
1639	2691	for (int i=0; i<15; i++)
..	..	@@ -1655,30 +2707,38 @@
1655	2707
1656	2708	group(g);
1657	2709	} else
1658		- if (event.getSource() == loopItem)
	2710	+ if (source == loopItem \|\| source == loopButton)
1659	2711	{
	2712	+ if (!group.selection.isEmpty())
	2713	+ {
1660	2714	Composite csg = new GroupLeaf();
1661		- csg.count = 5;
1662	2715	group(csg);
1663		- Composite child = new cGroup();
1664		- csg.addChild(child);
1665		- child.addChild(csg);
1666		- } else
1667		- if (event.getSource() == doubleItem)
1668		- {
1669		- Composite csg = new GroupLeaf();
1670	2716	csg.count = 5;
1671		- group(csg);
1672		- Composite child = new cGroup();
	2717	+ Composite child = new cGroup("Branch");
1673	2718	csg.addChild(child);
1674	2719	child.addChild(csg);
1675		- child = new cGroup();
1676		- csg.addChild(child);
1677		- child.addChild(csg);
	2720	+ }
1678	2721	} else
1679		- if (event.getSource() == tripleItem)
	2722	+ if (source == doubleItem)
1680	2723	{
1681		- Composite csg = new GroupLeaf();
	2724	+ if (!group.selection.isEmpty())
	2725	+ {
	2726	+ Composite csg = new GroupLeaf("Fork");
	2727	+ group(csg);
	2728	+ csg.count = 5;
	2729	+ Composite child = new cGroup("Branch A");
	2730	+ csg.addChild(child);
	2731	+ child.addChild(csg);
	2732	+ child = new cGroup("Branch B");
	2733	+ csg.addChild(child);
	2734	+ child.addChild(csg);
	2735	+ }
	2736	+ } else
	2737	+ if (source == tripleItem)
	2738	+ {
	2739	+ if (!group.selection.isEmpty())
	2740	+ {
	2741	+ Composite csg = new GroupLeaf("Trident");
1682	2742	csg.count = 4;
1683	2743	group(csg);
1684	2744	Composite child = new cGroup();
..	..	@@ -1690,74 +2750,119 @@
1690	2750	child = new cGroup();
1691	2751	csg.addChild(child);
1692	2752	child.addChild(csg);
	2753	+ }
1693	2754	} else
1694		-
1695		- if (event.getSource() == importGFDItem)
	2755	+ if (source == computeAOItem)
1696	2756	{
1697		- ImportGFD();
	2757	+ Globals.drawMode = CameraPane.OCCLUSION;
	2758	+ cameraView.repaint();
1698	2759	} else
1699		- if (event.getSource() == importVRMLX3DItem)
1700		- {
1701		- ImportVRMLX3D();
1702		- } else
1703		- if (event.getSource() == import3DSItem)
1704		- {
1705		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1706		- } else
1707		- if (event.getSource() == importOBJItem)
1708		- {
1709		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1710		- } else
1711		- if (event.getSource() == computeAOItem)
1712		- {
1713		- CameraPane.drawMode = CameraPane.OCCLUSION;
1714		- CameraPane.theRenderer.repaint();
1715		- } else
1716		- if (event.getSource() == recompileItem)
	2760	+ if (source == recompileItem)
1717	2761	{
1718	2762	Recompile();
1719	2763	refreshContents();
1720	2764	} else
1721		- if (event.getSource() == editScriptItem)
	2765	+ if (source == editScriptItem)
1722	2766	{
1723	2767	OpenDialog();
1724	2768	refreshContents();
1725	2769	} else
1726		- if (event.getSource() == invariantsItem)
	2770	+ if (source == invariantsItem)
1727	2771	{
1728	2772	System.out.println("Invariants:");
1729		- GraphreeD.theApplet3D.universe.invariants();
	2773	+ Grafreed.grafreed.universe.invariants();
1730	2774	} else
1731		- if (event.getSource() == memoryItem)
	2775	+ if (source == memoryItem)
1732	2776	{
1733	2777	//System.out.println("Invariants:");
1734	2778	PrintMemory();
1735	2779	} else
1736		- if (event.getSource() == pathItem)
	2780	+ if (source == pathItem)
1737	2781	{
1738	2782	PrintPath();
1739	2783	} else
1740		- if (event.getSource() == analyzeItem)
	2784	+ if (source == analyzeItem)
1741	2785	{
1742	2786	AnalyzeObject();
1743	2787	} else
1744		- if (event.getSource() == dumpItem)
	2788	+ if (source == dumpItem)
1745	2789	{
1746	2790	DumpObject();
1747	2791	} else
1748		- if (event.getSource() == screenfitButton)
	2792	+ if (source == minButton)
1749	2793	{
1750		- //Reload(lastConverter, lastFilename, true);
	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
	2856	+ if (source == screenfitButton)
	2857	+ {
1751	2858	ScreenFit();
1752	2859	} else
1753		- if (event.getSource() == screenfitpointButton)
	2860	+ if (source == screenfitpointButton)
1754	2861	{
1755		- //Reload(lastConverter, lastFilename, true);
1756	2862	ScreenFitPoint();
1757	2863	} else
1758		- if (event.getSource() == snapobjectButton)
	2864	+ if (source == snapobjectButton)
1759	2865	{
1760		- //Reload(lastConverter, lastFilename, true);
1761	2866	SnapObject();
1762	2867	} else
1763	2868	// if (event.getSource() == recompileButton)
..	..	@@ -1766,13 +2871,13 @@
1766	2871	// Recompile();
1767	2872	// refreshContents();
1768	2873	// } else
1769		- if (event.getSource() == gcButton)
	2874	+ if (source == gcButton)
1770	2875	{
1771	2876	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1772	2877	System.gc();
1773	2878	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1774	2879	} else
1775		- if (event.getSource() == editLeafItem)
	2880	+ if (source == editLeafItem)
1776	2881	{
1777	2882	Object3D obj;
1778	2883	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1786,65 +2891,78 @@
1786	2891	}
1787	2892	refreshContents(true);
1788	2893	} else
1789		- if (event.getSource() == openWindowItem)
	2894	+ if (source == openWindowItem)
1790	2895	{
1791	2896	EditSelection(true);
1792	2897	} else
1793		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2898	+ if (source == cutItem \|\| source == clearButton)
1794	2899	{
1795	2900	loadClipboard(true);
1796	2901	} else
1797		- if (event.getSource() == duplicateItem)
	2902	+ if (source == undoItem)
1798	2903	{
1799		- Object3D keep = GraphreeD.clipboard;
	2904	+ PreviousVersion();
	2905	+ } else
	2906	+ if (source == redoItem)
	2907	+ {
	2908	+ NextVersion();
	2909	+ } else
	2910	+ if (source == duplicateItem)
	2911	+ {
	2912	+ Object3D keep = Grafreed.clipboard;
1800	2913	loadClipboard(false);
1801	2914	paste(false);
1802		- GraphreeD.clipboard = keep;
	2915	+ Grafreed.clipboard = keep;
1803	2916	} else
1804		- if (event.getSource() == cloneItem)
	2917	+ if (source == cloneItem)
1805	2918	{
1806	2919	CloneSelection(false);
1807	2920	} else
1808		- if (event.getSource() == cloneSupportItem)
	2921	+ if (source == cloneSupportItem)
1809	2922	{
1810	2923	CloneSelection(true);
1811	2924	} else
1812		- if (event.getSource() == copyItem)
	2925	+ if (source == copyItem)
1813	2926	{
1814	2927	loadClipboard(false);
1815	2928	} else
1816		- if (event.getSource() == pasteItem)
	2929	+ if (source == pasteItem)
1817	2930	{
1818	2931	paste(false);
1819	2932	} else
1820		- if (event.getSource() == pasteLinkItem)
	2933	+ if (source == pasteIntoItem)
1821	2934	{
1822		- pasteInto(false);
	2935	+ pasteInto(true, false);
1823	2936	} else
1824		- if (event.getSource() == pasteCloneItem)
	2937	+ if (source == pasteLinkItem)
1825	2938	{
1826		- pasteInto(true);
	2939	+ pasteInto(false, false);
1827	2940	} else
1828		- if (event.getSource() == pasteExpandItem)
	2941	+ if (source == pasteCloneItem)
	2942	+ {
	2943	+ pasteInto(true, true);
	2944	+ } else
	2945	+ if (source == pasteExpandItem)
1829	2946	{
1830	2947	paste(true);
1831	2948	} else
1832		- if (event.getSource() == synchronizeItem)
	2949	+ if (source == synchronizeItem)
1833	2950	{
1834	2951	Overwrite(Object3D.TRANSFORM);
1835	2952	} else
1836		- if (event.getSource() == overwriteNameItem)
	2953	+ if (source == overwriteNameItem)
1837	2954	{
1838	2955	Overwrite(Object3D.NAME);
1839	2956	} else
1840		- if (event.getSource() == overwriteUVItem)
	2957	+ if (source == overwriteUVItem)
1841	2958	{
1842	2959	Overwrite(Object3D.UV);
1843	2960	} else
1844		- if (event.getSource() == overwriteMatItem)
	2961	+ if (source == overwriteMatItem)
1845	2962	{
	2963	+ /* july 2015
1846	2964	if ((dropAttributes & Object3D.TEXTURE) == 0)
1847		- Overwrite(Object3D.MATERIAL);
	2965	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1848	2966	else
1849	2967	{
1850	2968	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1856,13 +2974,16 @@
1856	2974	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1857	2975	}
1858	2976	}
	2977	+ */
	2978	+
	2979	+ Overwrite(dropAttributes);
1859	2980	}
1860		- if (event.getSource() == overwriteGeoItem)
	2981	+ if (source == overwriteGeoItem)
1861	2982	{
1862	2983	Overwrite(Object3D.GEOMETRY);
1863		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2984	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1864	2985	// {
1865		-// Object3D content = GraphreeD.clipboard.get(0);
	2986	+// Object3D content = GrafreeD.clipboard.get(0);
1866	2987	//
1867	2988	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1868	2989	// content = ((cGroup)content).get(0);
..	..	@@ -1874,7 +2995,7 @@
1874	2995	// refreshContents();
1875	2996	// }
1876	2997	} else
1877		- if (event.getSource() == generateMeshItem)
	2998	+ if (source == generateMeshItem)
1878	2999	{
1879	3000	//if (group.selection.size() == 1)
1880	3001	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1885,7 +3006,7 @@
1885	3006	ResetModel();
1886	3007	refreshContents();
1887	3008	} else
1888		- if (event.getSource() == extractGeometriesItem)
	3009	+ if (source == extractGeometriesItem)
1889	3010	{
1890	3011	boolean one = false;
1891	3012
..	..	@@ -1912,7 +3033,7 @@
1912	3033	ResetModel();
1913	3034	refreshContents();
1914	3035	} else
1915		- if (event.getSource() == cloneGeometriesItem)
	3036	+ if (source == cloneGeometriesItem)
1916	3037	{
1917	3038	boolean one = false;
1918	3039
..	..	@@ -1938,32 +3059,37 @@
1938	3059	ResetModel();
1939	3060	refreshContents();
1940	3061	} else
1941		- if (event.getSource() == shareGeometriesItem)
	3062	+ if (source == shareGeometriesItem)
1942	3063	{
1943	3064	boolean one = false;
1944	3065
1945	3066	if (group.selection.size() == 1)
1946	3067	one = true;
1947	3068
	3069	+ Object3D merge = null;
	3070	+
1948	3071	Object3D content = new cGroup();
1949	3072
1950	3073	for (int i=0; i<group.selection.size(); i++)
1951	3074	{
1952		- Object3D sel = new Merge(group.selection.get(i));
	3075	+ merge = new Merge(group.selection.get(i));
1953	3076
1954	3077	if (one)
1955		- makeSomething(sel, false);
	3078	+ makeSomething(merge, false);
1956	3079	else
1957		- content.addChild(sel);
	3080	+ content.addChild(merge);
1958	3081	}
1959	3082
1960	3083	if (!one)
1961		- makeSomething(content, false);
1962		-
1963		- ResetModel();
1964		- refreshContents();
	3084	+ makeSomething(content, true);
	3085	+ else
	3086	+ {
	3087	+ ResetModel();
	3088	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	3089	+ refreshContents();
	3090	+ }
1965	3091	} else
1966		- if (event.getSource() == mergeGeometriesItem)
	3092	+ if (source == mergeGeometriesItem)
1967	3093	{
1968	3094	boolean one = false;
1969	3095
..	..	@@ -1993,11 +3119,11 @@
1993	3119	ResetModel();
1994	3120	refreshContents();
1995	3121	} else
1996		- if (event.getSource() == linkverticesItem)
	3122	+ if (source == linkverticesItem)
1997	3123	{
1998		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	3124	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
1999	3125	// {
2000		-// Object3D content = GraphreeD.clipboard.get(0);
	3126	+// Object3D content = GrafreeD.clipboard.get(0);
2001	3127	//
2002	3128	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2003	3129	// content = ((cGroup)content).get(0);
..	..	@@ -2006,39 +3132,48 @@
2006	3132	// group.selection.get(0).setMasterThis(content); // should be identity
2007	3133	// refreshContents();
2008	3134	// }
2009		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	3135	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2010	3136	{
2011		- Object3D content = GraphreeD.clipboard.get(0);
	3137	+ Object3D content = Grafreed.clipboard.get(0);
2012	3138
2013	3139	if (content instanceof cGroup && ((cGroup)content).transientlink )
2014	3140	content = ((cGroup)content).get(0);
2015	3141
2016		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	3142	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2017	3143	for (int i=0; i<group.selection.size(); i++)
2018	3144	{
2019		- boolean random = CameraPane.RANDOM;
2020		- CameraPane.RANDOM = false; // parse all random nodes
	3145	+ boolean random = CameraPane.SWITCH;
	3146	+ CameraPane.SWITCH = false; // parse all random nodes
2021	3147	group.selection.get(i).linkVerticesThis(content);
2022	3148	// group.selection.get(i).setMasterThis(content); // should be identity
2023		- CameraPane.RANDOM = random;
	3149	+ CameraPane.SWITCH = random;
2024	3150	}
2025		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3151	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2026	3152	refreshContents();
2027	3153	}
2028	3154	} else
2029		- if (event.getSource() == resetsupportItem)
	3155	+ if (source == resetsupportItem)
2030	3156	{
2031	3157	for (int i=0; i<group.selection.size(); i++)
2032	3158	{
2033		- boolean random = CameraPane.RANDOM;
2034		- CameraPane.RANDOM = false; // parse all random nodes
	3159	+ boolean random = CameraPane.SWITCH;
	3160	+ CameraPane.SWITCH = false; // parse all random nodes
2035	3161	group.selection.get(i).linkVerticesThis(null);
2036		- CameraPane.RANDOM = random;
	3162	+ CameraPane.SWITCH = random;
2037	3163	}
2038	3164
2039	3165	refreshContents();
2040	3166	} else
2041		- if (event.getSource() == resetreferencesItem)
	3167	+ if (source == relinkverticesItem)
	3168	+ {
	3169	+ boolean random = CameraPane.SWITCH;
	3170	+ CameraPane.SWITCH = false; // parse all random nodes
	3171	+ group.selection.RelinkToSupport();
	3172	+ CameraPane.SWITCH = random;
	3173	+
	3174	+ refreshContents();
	3175	+ } else
	3176	+ if (source == resetreferencesItem)
2042	3177	{
2043	3178	for (int i=0; i<group.selection.size(); i++)
2044	3179	{
..	..	@@ -2047,11 +3182,11 @@
2047	3182
2048	3183	refreshContents();
2049	3184	} else
2050		- if (event.getSource() == setMasterItem)
	3185	+ if (source == setMasterItem)
2051	3186	{
2052		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	3187	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2053	3188	{
2054		- Object3D content = GraphreeD.clipboard.get(0);
	3189	+ Object3D content = Grafreed.clipboard.get(0);
2055	3190
2056	3191	if (content instanceof cGroup && ((cGroup)content).transientlink )
2057	3192	content = ((cGroup)content).get(0);
..	..	@@ -2060,13 +3195,13 @@
2060	3195	refreshContents();
2061	3196	}
2062	3197	} else
2063		- if (event.getSource() == poseMeshItem)
	3198	+ if (source == poseMeshItem)
2064	3199	{
2065	3200	if (group.selection.size() == 1)
2066	3201	{
2067		- if (GraphreeD.clipboard.size() == 1)
	3202	+ if (Grafreed.clipboard.size() == 1)
2068	3203	{
2069		- Object3D content = GraphreeD.clipboard.get(0);
	3204	+ Object3D content = Grafreed.clipboard.get(0);
2070	3205
2071	3206	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	3207	content = ((cGroup)content).get(0);
..	..	@@ -2079,19 +3214,19 @@
2079	3214	}
2080	3215
2081	3216	} else
2082		- if (event.getSource() == revertMeshItem)
	3217	+ if (source == revertMeshItem)
2083	3218	{
2084	3219	RevertMeshes();
2085	3220	} else
2086		- if (event.getSource() == resetMeshItem)
	3221	+ if (source == resetAllItem)
2087	3222	{
2088	3223	ResetAll();
2089	3224	} else
2090		- if (event.getSource() == stepAllItem)
	3225	+ if (source == stepAllItem)
2091	3226	{
2092	3227	StepAll();
2093	3228	} else
2094		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	3229	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2095	3230	{
2096	3231	//int indices[] = jList.getSelectedIndices();
2097	3232	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2099,42 +3234,46 @@
2099	3234
2100	3235	ClearSelection(false);
2101	3236	} else
2102		- if (event.getSource() == clearAllItem)
	3237	+ if (source == clearAllItem)
2103	3238	{
2104	3239	ClearSelection(true);
2105	3240	} else
2106		- if (event.getSource() == grabItem)
	3241	+ if (source == grabItem \|\| source == groupButton)
2107	3242	{
2108		- group(new cGroup(), true);
	3243	+ group(new cGroup(), false); // true);
2109	3244	} else
2110		- if (event.getSource() == frontItem)
	3245	+ if (source == hideItem)
	3246	+ {
	3247	+ group(new HiddenObject());
	3248	+ } else
	3249	+ if (source == frontItem)
2111	3250	{
2112	3251	front();
2113	3252	} else
2114		- if (event.getSource() == backItem)
	3253	+ if (source == backItem)
2115	3254	{
2116	3255	back();
2117	3256	} else
2118		- if (event.getSource() == cameraItem)
	3257	+ if (source == cameraItem)
2119	3258	{
2120	3259	makeSomething(new Camera());
2121	3260	} else
2122		- if (event.getSource() == compositeItem)
	3261	+ if (source == compositeItem \|\| source == compositeButton)
2123	3262	{
2124	3263	group(new Composite());
2125	3264	} else
2126		- if (event.getSource() == randomItem)
	3265	+ if (source == switchItem \|\| source == switchButton)
2127	3266	{
2128	3267	RandomNode random = new RandomNode();
2129	3268	group(random);
2130	3269	if (random.size() > 0)
2131		- random.name = random.get(0).name + "Rnd";
	3270	+ random.name = random.get(0).name + "Switch";
2132	3271	} else
2133		- if (event.getSource() == physicsItem)
	3272	+ if (source == physicsItem)
2134	3273	{
2135	3274	group(new PhysicsNode());
2136	3275	} else
2137		- if (event.getSource() == frameselectorItem)
	3276	+ if (source == frameselectorItem)
2138	3277	{
2139	3278	for (int i=0; i<group.selection.size(); i++)
2140	3279	{
..	..	@@ -2146,7 +3285,7 @@
2146	3285	ResetModel();
2147	3286	refreshContents();
2148	3287	} else
2149		- if (event.getSource() == switchGeoItem)
	3288	+ if (source == switchGeoItem)
2150	3289	{
2151	3290	for (int i=0; i<group.selection.size(); i++)
2152	3291	{
..	..	@@ -2158,7 +3297,7 @@
2158	3297	ResetModel();
2159	3298	refreshContents();
2160	3299	} else
2161		- if (event.getSource() == switchTransfoItem)
	3300	+ if (source == switchTransfoItem)
2162	3301	{
2163	3302	for (int i=0; i<group.selection.size(); i++)
2164	3303	{
..	..	@@ -2170,7 +3309,7 @@
2170	3309	ResetModel();
2171	3310	refreshContents();
2172	3311	} else
2173		- if (event.getSource() == morphItem)
	3312	+ if (source == morphItem)
2174	3313	{
2175	3314	for (int i=0; i<group.selection.size(); i++)
2176	3315	{
..	..	@@ -2182,7 +3321,7 @@
2182	3321	ResetModel();
2183	3322	refreshContents();
2184	3323	} else
2185		- if (event.getSource() == scriptNodeItem)
	3324	+ if (source == scriptNodeItem)
2186	3325	{
2187	3326	boolean atleastone = false;
2188	3327
..	..	@@ -2221,191 +3360,280 @@
2221	3360	}
2222	3361	}
2223	3362	} else
2224		- if (event.getSource() == linkerItem)
	3363	+ if (source == linkerItem)
2225	3364	{
2226	3365	group(new cLinker());
2227	3366	} else
2228		- if (event.getSource() == textureItem)
	3367	+ if (source == textureItem \|\| source == textureButton)
2229	3368	{
2230	3369	group(new TextureNode());
2231	3370	} else
2232		- if (event.getSource() == shadowXItem)
	3371	+ if (source == billboardItem)
	3372	+ {
	3373	+ group(new BillboardNode());
	3374	+ } else
	3375	+ if (source == shadowXItem)
2233	3376	{
2234	3377	CastShadow(0);
2235	3378	} else
2236		- if (event.getSource() == shadowYItem)
	3379	+ if (source == shadowYItem)
2237	3380	{
2238	3381	CastShadow(1);
2239	3382	} else
2240		- if (event.getSource() == shadowZItem)
	3383	+ if (source == shadowZItem)
2241	3384	{
2242	3385	CastShadow(2);
2243	3386	} else
2244		- if (event.getSource() == ungroupItem)
	3387	+ if (source == ungroupItem \|\| source == ungroupButton)
2245	3388	{
2246		- ungroup();
	3389	+ boolean canUngroup = true;
	3390	+
	3391	+ for (int i=0; i<group.selection.size(); i++)
	3392	+ {
	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	+ }
	3408	+ }
	3409	+
	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	+ }
2247	3423	} else
2248		- if (event.getSource() == genUVItem)
	3424	+ if (source == genUVItem)
2249	3425	{
2250	3426	GenUV();
2251	3427	} else
2252		- if (event.getSource() == genNormalsCADItem)
	3428	+ if (source == genNormalsCADItem)
2253	3429	{
2254	3430	GenNormals(true);
2255	3431	} else
2256		- if (event.getSource() == genNormalsORGANItem)
	3432	+ if (source == genNormalsMESHItem)
	3433	+ {
	3434	+ GenNormalsMESH();
	3435	+ } else
	3436	+ if (source == genNormalsORGANItem)
2257	3437	{
2258	3438	GenNormals(false);
2259	3439	} else
2260		- if (event.getSource() == stripifyItem)
	3440	+ if (source == genNormalsMINEItem)
	3441	+ {
	3442	+ GenNormalsMINE();
	3443	+ } else
	3444	+ if (source == stripifyItem)
2261	3445	{
2262	3446	Stripify();
2263	3447	} else
2264		- if (event.getSource() == unstripifyItem)
	3448	+ if (source == unstripifyItem)
2265	3449	{
2266	3450	Unstripify();
2267	3451	} else
2268		- if (event.getSource() == trimItem)
	3452	+ if (source == trimItem)
2269	3453	{
2270	3454	Trim();
2271	3455	} else
2272		- if (event.getSource() == untrimItem)
	3456	+ if (source == untrimItem)
2273	3457	{
2274	3458	Untrim();
2275	3459	} else
2276		- if (event.getSource() == clearColorsItem)
	3460	+ if (source == clearColorsItem)
2277	3461	{
2278	3462	ClearColors();
2279	3463	} else
2280		- if (event.getSource() == clearMaterialsItem)
	3464	+ if (source == clearMaterialsItem)
2281	3465	{
2282	3466	ClearMaterials();
2283	3467	} else
2284		- if (event.getSource() == liveleavesItem)
	3468	+ if (source == clearVersionsItem)
	3469	+ {
	3470	+ ClearVersions();
	3471	+ } else
	3472	+ if (source == liveleavesItem)
2285	3473	{
2286	3474	LiveLeaves(true);
2287	3475	} else
2288		- if (event.getSource() == unliveleavesItem)
	3476	+ if (source == unliveleavesItem)
2289	3477	{
2290	3478	LiveLeaves(false);
2291	3479	} else
2292		- if (event.getSource() == supportleavesItem)
	3480	+ if (source == supportleavesItem)
2293	3481	{
2294	3482	SupportLeaves(true);
2295	3483	} else
2296		- if (event.getSource() == unsupportleavesItem)
	3484	+ if (source == unsupportleavesItem)
2297	3485	{
2298	3486	SupportLeaves(false);
2299	3487	} else
2300		- if (event.getSource() == hideleavesItem)
	3488	+ if (source == hideleavesItem)
2301	3489	{
2302	3490	HideLeaves(true);
2303	3491	} else
2304		- if (event.getSource() == showleavesItem)
	3492	+ if (source == showleavesItem)
2305	3493	{
2306	3494	HideLeaves(false);
2307	3495	} else
2308		- if (event.getSource() == markleavesItem)
	3496	+ if (source == markleavesItem)
2309	3497	{
2310	3498	MarkLeaves(true);
2311	3499	} else
2312		- if (event.getSource() == unmarkleavesItem)
	3500	+ if (source == unmarkleavesItem)
2313	3501	{
2314	3502	MarkLeaves(false);
2315	3503	} else
2316		- if (event.getSource() == flipVItem)
	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);
	3519	+ } else
	3520	+ if (source == flipVItem)
2317	3521	{
2318	3522	FlipV(true);
2319	3523	} else
2320		- if (event.getSource() == unflipVItem)
	3524	+ if (source == unflipVItem)
2321	3525	{
2322	3526	FlipV(false);
2323	3527	} else
2324		- if (event.getSource() == lowTexturesItem)
	3528	+ if (source == lowTexturesItem)
2325	3529	{
2326	3530	SetTexRes(0);
2327	3531	} else
2328		- if (event.getSource() == normalTexturesItem)
	3532	+ if (source == normalTexturesItem)
2329	3533	{
2330	3534	SetTexRes(1);
2331	3535	} else
2332		- if (event.getSource() == highTexturesItem)
	3536	+ if (source == highTexturesItem)
2333	3537	{
2334	3538	SetTexRes(2);
2335	3539	} else
2336		- if (event.getSource() == veryhighTexturesItem)
	3540	+ if (source == veryhighTexturesItem)
2337	3541	{
2338	3542	SetTexRes(3);
2339	3543	} else
2340		- if (event.getSource() == maxTexturesItem)
	3544	+ if (source == maxTexturesItem)
2341	3545	{
2342	3546	SetTexRes(4);
2343	3547	} else
2344		- if (event.getSource() == panoTexturesItem)
	3548	+ if (source == panoTexturesItem)
2345	3549	{
2346	3550	SetTexRes(5);
2347	3551	} else
2348		- if (event.getSource() == reverseNormalsItem)
	3552	+ if (source == reverseNormalsItem)
2349	3553	{
2350	3554	ReverseNormals();
2351	3555	} else
2352		- if (event.getSource() == parseverticesItem)
	3556	+ if (source == parseverticesItem)
2353	3557	{
2354	3558	ParseVertices();
2355	3559	} else
2356		- if (event.getSource() == alignItem)
	3560	+ if (source == textureFieldItem)
	3561	+ {
	3562	+ TextureVertices();
	3563	+ } else
	3564	+ if (source == alignItem)
2357	3565	{
2358	3566	Align();
2359	3567	} else
2360		- if (event.getSource() == mirrorItem)
	3568	+ if (source == mirrorItem)
2361	3569	{
2362	3570	MirrorPoses();
2363	3571	} else
2364		- if (event.getSource() == reduceMorphItem)
	3572	+ if (source == reduceMorphItem)
2365	3573	{
2366	3574	MeshReduction(false);
2367	3575	} else
2368		- if (event.getSource() == reduce34MorphItem)
	3576	+ if (source == reduce34MorphItem)
2369	3577	{
2370	3578	MeshReduction(true);
2371	3579	} else
2372		- if (event.getSource() == reverseTrianglesItem)
	3580	+ if (source == reverseTrianglesItem)
2373	3581	{
2374	3582	ReverseTriangles();
2375	3583	} else
2376		- if (event.getSource() == reduceMeshItem)
	3584	+ if (source == reduceMeshItem)
2377	3585	{
2378	3586	ReduceMesh(false);
2379	3587	} else
2380		- if (event.getSource() == reduce34MeshItem)
	3588	+ if (source == reduce34MeshItem)
2381	3589	{
2382	3590	ReduceMesh(true);
2383	3591	} else
2384		- if (event.getSource() == increaseMeshItem)
	3592	+ if (source == increaseMeshItem)
2385	3593	{
2386	3594	IncreaseMesh();
2387	3595	} else
2388		- if (event.getSource() == clipMeshItem)
	3596	+ if (source == clipMeshItem)
2389	3597	{
2390	3598	ClipMesh();
2391	3599	} else
2392		- if (event.getSource() == smoothMeshItem)
	3600	+ if (source == smoothMeshItem)
2393	3601	{
2394	3602	SmoothMesh();
2395	3603	} else
2396		- if (event.getSource() == transformgeometryItem)
	3604	+ if (source == transformGeometryItem)
2397	3605	{
2398	3606	TransformGeometry();
2399	3607	} else
2400		- if (event.getSource() == resetTransformItem)
	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);
	3623	+ } else
	3624	+ if (source == resetTransformItem)
2401	3625	{
2402	3626	ResetTransform();
2403	3627	} else
2404		- if (event.getSource() == resetCentroidItem)
	3628	+ if (source == resetCentroidItem)
2405	3629	{
2406		- ResetCentroid();
	3630	+ ResetCentroid(true);
2407	3631	} else
2408		- if (event.getSource() == resetParentItem)
	3632	+ if (source == resetCentroidXZItem)
	3633	+ {
	3634	+ ResetCentroid(false);
	3635	+ } else
	3636	+ if (source == resetParentItem)
2409	3637	{
2410	3638	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2411	3639	{
..	..	@@ -2415,7 +3643,7 @@
2415	3643
2416	3644	refreshContents();
2417	3645	} else
2418		- if (event.getSource() == repairParentItem)
	3646	+ if (source == repairParentItem)
2419	3647	{
2420	3648	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2421	3649	{
..	..	@@ -2429,7 +3657,21 @@
2429	3657
2430	3658	refreshContents();
2431	3659	} else
2432		- if (event.getSource() == sortbysizeItem)
	3660	+ if (source == repairShadowItem)
	3661	+ {
	3662	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3663	+ {
	3664	+ Object3D obj = (Object3D)e.nextElement();
	3665	+ obj.RepairShadow();
	3666	+// for (int i=0; i<obj.size(); i++)
	3667	+// {
	3668	+// obj.get(i).parent = obj;
	3669	+// }
	3670	+ }
	3671	+
	3672	+ refreshContents();
	3673	+ } else
	3674	+ if (source == sortbysizeItem)
2433	3675	{
2434	3676	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2435	3677	{
..	..	@@ -2441,7 +3683,7 @@
2441	3683	ResetModel();
2442	3684	refreshContents();
2443	3685	} else
2444		- if (event.getSource() == sortbynameItem)
	3686	+ if (source == sortbynameItem)
2445	3687	{
2446	3688	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2447	3689	{
..	..	@@ -2453,7 +3695,7 @@
2453	3695	ResetModel();
2454	3696	refreshContents();
2455	3697	} else
2456		- if (event.getSource() == attachPigmentItem)
	3698	+ if (source == attachPigmentItem)
2457	3699	{
2458	3700	String texture = GetFile("Attach pigment");
2459	3701	Object3D obj;
..	..	@@ -2465,7 +3707,7 @@
2465	3707
2466	3708	refreshContents();
2467	3709	} else
2468		- if (event.getSource() == detachPigmentItem)
	3710	+ if (source == detachPigmentItem)
2469	3711	{
2470	3712	Object3D obj;
2471	3713	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2476,7 +3718,7 @@
2476	3718
2477	3719	refreshContents();
2478	3720	} else
2479		- if (event.getSource() == attachBumpItem)
	3721	+ if (source == attachBumpItem)
2480	3722	{
2481	3723	String texture = GetFile("Attach bump");
2482	3724	Object3D obj;
..	..	@@ -2488,18 +3730,18 @@
2488	3730
2489	3731	refreshContents();
2490	3732	} else
2491		- if (event.getSource() == detachBumpItem)
	3733	+ if (source == detachBumpItem)
2492	3734	{
2493	3735	Object3D obj;
2494	3736	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2495	3737	{
2496	3738	obj = (Object3D)e.nextElement();
2497		- obj.SetBumpTexture(null);
	3739	+ obj.ResetBumpTexture();
2498	3740	}
2499	3741
2500	3742	refreshContents();
2501	3743	} else
2502		- if (event.getSource() == pigmentBumpItem)
	3744	+ if (source == pigmentBumpItem)
2503	3745	{
2504	3746	Object3D obj;
2505	3747	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2510,159 +3752,233 @@
2510	3752
2511	3753	refreshContents();
2512	3754	} else
2513		- if (event.getSource() == flashSelectionButton)
	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
	3780	+ if (source == flashSelectionButton)
2514	3781	{
2515	3782	CameraPane.flash = true;
2516	3783	refreshContents();
2517	3784	} else
2518		- if (event.getSource() == oneButton)
	3785	+ if (source == oneButton)
2519	3786	{
2520	3787	} else
2521		- if (event.getSource() == twoButton)
	3788	+ if (source == twoButton)
2522	3789	{
2523	3790	radio.layout = twoButton;
2524		- // bug
2525		- //gridPanel.setDividerLocation(1.0);
2526		- //bigPanel.setDividerLocation(0.0);
2527		- bigThree.remove(jtp);
2528		- bigThree.remove(cameraPanel);
2529		- bigThree.remove(XYZPanel);
2530		- aWindowConstraints.gridx = 0;
2531		- aWindowConstraints.gridy = 0;
2532		- aWindowConstraints.gridwidth = 1;
2533		- // aConstraints.gridheight = 3;
2534		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2535		- aWindowConstraints.weightx = 0;
2536		- aWindowConstraints.weighty = 1;
2537		- //bigThree.add(jtp, aWindowConstraints);
2538		- aWindowConstraints.weightx = 1;
2539		- aWindowConstraints.gridwidth = 3;
2540		- // aConstraints.gridheight = 3;
2541		- aWindowConstraints.gridx = 1;
2542		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2543		- bigThree.add(cameraPanel, aWindowConstraints);
2544		- aWindowConstraints.weightx = 0;
2545		- aWindowConstraints.gridx = 4;
2546		- aWindowConstraints.gridwidth = 1;
2547		- // aConstraints.gridheight = 3;
2548		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2549		- //bigThree.add(XYZPanel, aWindowConstraints);
2550		- bigThree.revalidate();
	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	+
2551	3814	} else
2552		- if (event.getSource() == threeButton)
	3815	+ if (source == threeButton)
2553	3816	{
2554	3817	radio.layout = threeButton;
2555		- bigThree.remove(jtp);
2556		- bigThree.remove(cameraPanel);
2557		- bigThree.remove(XYZPanel);
2558		- aWindowConstraints.gridx = 0;
2559		- aWindowConstraints.gridy = 0;
2560		- aWindowConstraints.gridwidth = 1;
2561		- // aConstraints.gridheight = 3;
2562		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2563		- aWindowConstraints.weightx = 0;
2564		- aWindowConstraints.weighty = 1;
2565		- //bigThree.add(jtp, aWindowConstraints);
2566		- aWindowConstraints.weightx = 1;
2567		- aWindowConstraints.gridwidth = 3;
2568		- // aConstraints.gridheight = 3;
2569		- aWindowConstraints.gridx = 1;
2570		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2571		- bigThree.add(cameraPanel, aWindowConstraints);
2572		- aWindowConstraints.weightx = 0;
2573		- aWindowConstraints.gridx = 4;
2574		- aWindowConstraints.gridwidth = 1;
2575		- // aConstraints.gridheight = 3;
2576		- aConstraints.fill = GridBagConstraints.VERTICAL;
2577		- bigThree.add(XYZPanel, aWindowConstraints);
2578		- bigThree.revalidate();
	3818	+
	3819	+ if (CameraPane.FULLSCREEN)
	3820	+ fullscreenLayout = radio.layout;
	3821	+
	3822	+// bigThree.remove(scenePanel);
	3823	+// bigThree.remove(centralPanel);
	3824	+// bigThree.remove(XYZPanel);
	3825	+// aWindowConstraints.gridx = 0;
	3826	+// aWindowConstraints.gridy = 0;
	3827	+// aWindowConstraints.gridwidth = 1;
	3828	+// // aConstraints.gridheight = 3;
	3829	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3830	+// aWindowConstraints.weightx = 0;
	3831	+// aWindowConstraints.weighty = 1;
	3832	+// //bigThree.add(jtp, aWindowConstraints);
	3833	+// aWindowConstraints.weightx = 1;
	3834	+// aWindowConstraints.gridwidth = 3;
	3835	+// // aConstraints.gridheight = 3;
	3836	+// aWindowConstraints.gridx = 1;
	3837	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3838	+// bigThree.add(centralPanel, aWindowConstraints);
	3839	+// aWindowConstraints.weightx = 0;
	3840	+// aWindowConstraints.gridx = 4;
	3841	+// aWindowConstraints.gridwidth = 1;
	3842	+// // aConstraints.gridheight = 3;
	3843	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3844	+// bigThree.add(XYZPanel, aWindowConstraints);
	3845	+// bigThree.validate();
	3846	+// scenePanel.setVisible(false);
	3847	+// centralPanel.setVisible(true);
	3848	+// XYZPanel.setVisible(true);
	3849	+ bigThree.ClearUI();
	3850	+ bigThree.add(scenePanel);
	3851	+ bigThree.add(centralPanel);
	3852	+ bigThree.FlushUI();
	3853	+
	3854	+ cameraView.requestFocusInWindow();
2579	3855	} else
2580		- if (event.getSource() == fourButton)
	3856	+ if (source == fourButton)
2581	3857	{
2582	3858	radio.layout = fourButton;
2583		- bigThree.remove(jtp);
2584		- bigThree.remove(cameraPanel);
2585		- bigThree.remove(XYZPanel);
2586		- aWindowConstraints.gridx = 0;
2587		- aWindowConstraints.gridy = 0;
2588		- aWindowConstraints.gridwidth = 1;
2589		- // aWindowConstraints.gridheight = 3;
2590		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2591		- aWindowConstraints.weightx = 1;
2592		- aWindowConstraints.weighty = 1;
2593		- bigThree.add(jtp, aWindowConstraints);
2594		- aWindowConstraints.weightx = 1;
2595		- aWindowConstraints.gridwidth = 3;
2596		- // aConstraints.gridheight = 3;
2597		- aWindowConstraints.gridx = 1;
2598		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2599		- //bigThree.add(cameraPanel, aWindowConstraints);
2600		- aWindowConstraints.weightx = 0;
2601		- aWindowConstraints.gridx = 4;
2602		- aWindowConstraints.gridwidth = 1;
2603		- // aWindowConstraints.gridheight = 3;
2604		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2605		- //bigThree.add(XYZPanel, aWindowConstraints);
2606		- bigThree.revalidate();
	3859	+
	3860	+ if (CameraPane.FULLSCREEN)
	3861	+ fullscreenLayout = radio.layout;
	3862	+
	3863	+// bigThree.remove(scenePanel);
	3864	+// bigThree.remove(centralPanel);
	3865	+// bigThree.remove(XYZPanel);
	3866	+// aWindowConstraints.gridx = 0;
	3867	+// aWindowConstraints.gridy = 0;
	3868	+// aWindowConstraints.gridwidth = 1;
	3869	+// // aWindowConstraints.gridheight = 3;
	3870	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3871	+// aWindowConstraints.weightx = 1;
	3872	+// aWindowConstraints.weighty = 1;
	3873	+// bigThree.add(scenePanel, aWindowConstraints);
	3874	+// aWindowConstraints.weightx = 1;
	3875	+// aWindowConstraints.gridwidth = 3;
	3876	+// // aConstraints.gridheight = 3;
	3877	+// aWindowConstraints.gridx = 1;
	3878	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3879	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3880	+// aWindowConstraints.weightx = 0;
	3881	+// aWindowConstraints.gridx = 4;
	3882	+// aWindowConstraints.gridwidth = 1;
	3883	+// // aWindowConstraints.gridheight = 3;
	3884	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3885	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3886	+// bigThree.validate();
	3887	+// scenePanel.setVisible(true);
	3888	+// centralPanel.setVisible(false);
	3889	+// XYZPanel.setVisible(false);
	3890	+ bigThree.ClearUI();
	3891	+ bigThree.add(scenePanel);
	3892	+ bigThree.FlushUI();
	3893	+
	3894	+ cameraView.requestFocusInWindow();
2607	3895	} else
2608		- if (event.getSource() == sixButton)
	3896	+ if (source == sixButton)
2609	3897	{
2610	3898	radio.layout = sixButton;
2611		- bigThree.remove(jtp);
2612		- bigThree.remove(cameraPanel);
2613		- bigThree.remove(XYZPanel);
2614		- aWindowConstraints.gridx = 0;
2615		- aWindowConstraints.gridy = 0;
2616		- aWindowConstraints.gridwidth = 1;
2617		- // aConstraints.gridheight = 3;
2618		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2619		- aWindowConstraints.weightx = 0;
2620		- aWindowConstraints.weighty = 1;
2621		- bigThree.add(jtp, aWindowConstraints);
2622		- aWindowConstraints.weightx = 1;
2623		- aWindowConstraints.gridwidth = 3;
2624		- // aWindowConstraints.gridheight = 3;
2625		- aWindowConstraints.gridx = 1;
2626		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2627		- bigThree.add(cameraPanel, aWindowConstraints);
2628		- aWindowConstraints.weightx = 0;
2629		- aWindowConstraints.gridx = 4;
2630		- aWindowConstraints.gridwidth = 1;
2631		- // aWindowConstraints.gridheight = 3;
2632		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2633		- //bigThree.add(XYZPanel, aConstraints);
2634		- bigThree.revalidate();
	3899	+
	3900	+ if (CameraPane.FULLSCREEN)
	3901	+ fullscreenLayout = radio.layout;
	3902	+
	3903	+// bigThree.remove(scenePanel);
	3904	+// bigThree.remove(centralPanel);
	3905	+// bigThree.remove(XYZPanel);
	3906	+// aWindowConstraints.gridx = 0;
	3907	+// aWindowConstraints.gridy = 0;
	3908	+// aWindowConstraints.gridwidth = 1;
	3909	+// // aConstraints.gridheight = 3;
	3910	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3911	+// aWindowConstraints.weightx = 0;
	3912	+// aWindowConstraints.weighty = 1;
	3913	+// bigThree.add(scenePanel, aWindowConstraints);
	3914	+// aWindowConstraints.weightx = 1;
	3915	+// aWindowConstraints.gridwidth = 3;
	3916	+// // aWindowConstraints.gridheight = 3;
	3917	+// aWindowConstraints.gridx = 1;
	3918	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3919	+// bigThree.add(centralPanel, aWindowConstraints);
	3920	+// aWindowConstraints.weightx = 0;
	3921	+// aWindowConstraints.gridx = 4;
	3922	+// aWindowConstraints.gridwidth = 1;
	3923	+// // aWindowConstraints.gridheight = 3;
	3924	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3925	+// //bigThree.add(XYZPanel, aConstraints);
	3926	+// bigThree.validate();
	3927	+// scenePanel.setVisible(true);
	3928	+// centralPanel.setVisible(true);
	3929	+// XYZPanel.setVisible(false);
	3930	+ bigThree.ClearUI();
	3931	+ bigThree.add(centralPanel);
	3932	+ bigThree.add(scenePanel);
	3933	+ bigThree.FlushUI();
	3934	+
	3935	+ cameraView.requestFocusInWindow();
2635	3936	} else
2636		- if (event.getSource() == sevenButton)
	3937	+ if (source == sevenButton)
2637	3938	{
2638	3939	radio.layout = sevenButton;
2639		- bigThree.remove(jtp);
2640		- bigThree.remove(cameraPanel);
2641		- bigThree.remove(XYZPanel);
2642		- aWindowConstraints.gridx = 0;
2643		- aWindowConstraints.gridy = 0;
2644		- aWindowConstraints.gridwidth = 1;
2645		- // aWindowConstraints.gridheight = 3;
2646		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2647		- aWindowConstraints.weightx = 0;
2648		- aWindowConstraints.weighty = 1;
2649		- bigThree.add(jtp, aWindowConstraints);
2650		- aWindowConstraints.weightx = 1;
2651		- aWindowConstraints.gridwidth = 3;
2652		- // aWindowConstraints.gridheight = 3;
2653		- aWindowConstraints.gridx = 1;
2654		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2655		- bigThree.add(cameraPanel, aWindowConstraints);
2656		- aWindowConstraints.weightx = 0;
2657		- aWindowConstraints.gridx = 4;
2658		- aWindowConstraints.gridwidth = 1;
2659		- // aConstraints.gridheight = 3;
2660		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2661		- bigThree.add(XYZPanel, aWindowConstraints);
2662		- bigThree.revalidate();
	3940	+
	3941	+ if (CameraPane.FULLSCREEN)
	3942	+ fullscreenLayout = radio.layout;
	3943	+
	3944	+// bigThree.remove(scenePanel);
	3945	+// bigThree.remove(centralPanel);
	3946	+// bigThree.remove(XYZPanel);
	3947	+// aWindowConstraints.gridx = 0;
	3948	+// aWindowConstraints.gridy = 0;
	3949	+// aWindowConstraints.gridwidth = 1;
	3950	+// // aWindowConstraints.gridheight = 3;
	3951	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3952	+// aWindowConstraints.weightx = 0;
	3953	+// aWindowConstraints.weighty = 1;
	3954	+// bigThree.add(scenePanel, aWindowConstraints);
	3955	+// aWindowConstraints.weightx = 1;
	3956	+// aWindowConstraints.gridwidth = 3;
	3957	+// // aWindowConstraints.gridheight = 3;
	3958	+// aWindowConstraints.gridx = 1;
	3959	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3960	+// bigThree.add(centralPanel, aWindowConstraints);
	3961	+// aWindowConstraints.weightx = 0;
	3962	+// aWindowConstraints.gridx = 4;
	3963	+// aWindowConstraints.gridwidth = 1;
	3964	+// // aConstraints.gridheight = 3;
	3965	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3966	+// bigThree.add(XYZPanel, aWindowConstraints);
	3967	+// bigThree.validate();
	3968	+// scenePanel.setVisible(true);
	3969	+// centralPanel.setVisible(true);
	3970	+// XYZPanel.setVisible(true);
	3971	+ bigThree.ClearUI();
	3972	+ bigThree.add(scenePanel);
	3973	+ bigThree.add(centralPanel);
	3974	+ bigThree.add(XYZPanel);
	3975	+ bigThree.FlushUI();
	3976	+
	3977	+ cameraView.requestFocusInWindow();
2663	3978	} else
2664		- if (event.getSource() == rootButton)
	3979	+ if (source == rootButton)
2665	3980	{
	3981	+ Replace();
2666	3982	Object3D obj;
2667	3983	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2668	3984	{
..	..	@@ -2671,66 +3987,88 @@
2671	3987	EditObject(obj);
2672	3988	}
2673	3989
	3990	+ cameraView.requestFocusInWindow();
2674	3991	refreshContents(true);
2675	3992	} else
2676		- if (event.getSource() == closeButton)
	3993	+ if (source == closeButton)
2677	3994	{
2678	3995	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3996	+ if (copy.versionlist != null)
	3997	+ Replace();
	3998	+
2679	3999	cRadio ab;
2680	4000	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2681	4001	{
2682	4002	ab = (cRadio)e.nextElement();
2683		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	4003	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2684	4004	{
	4005	+ // Patch to avoid bug with transparency.
	4006	+ if (!ab.hadMaterial)
	4007	+ {
	4008	+ ab.object.material = null;
	4009	+ }
	4010	+
2685	4011	buttonGroup.remove(ab);
2686	4012	radioPanel.remove(ab);
2687	4013
2688		- ab.GetObject().editWindow = null;
	4014	+ //ab.GetObject().editWindow = null;
	4015	+ ab.GetObject().manipWindow = null;
2689	4016	// ab.GetObject().objectUI = null; // ?????????
2690	4017
2691	4018	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2692	4019	break;
2693	4020	}
2694	4021	}
	4022	+
	4023	+ cameraView.requestFocusInWindow();
2695	4024	refreshContents(true);
2696	4025	} else
2697		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	4026	+ if (source == editItem \|\| source == editButton)
2698	4027	{
	4028	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4029	+ {
	4030	+ Object3D child = (Object3D)e.nextElement();
	4031	+ child.pinned = true;
	4032	+ }
	4033	+
2699	4034	EditSelection(false);
2700	4035	} else
2701		- if (event.getSource() == uneditButton)
	4036	+ if (source == uneditButton)
2702	4037	{
2703	4038	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2704	4039	{
2705	4040	Object3D child = (Object3D)e.nextElement();
2706	4041	if(child.editWindow != null)
2707		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4042	+ child.pinned = false;
2708	4043	child.CloseUI();
2709	4044	listUI.remove(child);
	4045	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2710	4046
2711		- child.editWindow = null; // ???????????
	4047	+ //child.editWindow = null; // ???????????
2712	4048	}
2713		- objEditor.ctrlPanel.revalidate();
	4049	+ objEditor.ctrlPanel.FlushUI();
2714	4050	//objEditor.jTree.clearSelection();
2715	4051	//objEditor.ResetSliders();
2716	4052	refreshContents(true);
2717	4053	} else
2718		- if (event.getSource() == clearPanelButton)
	4054	+ if (source == clearPanelButton)
2719	4055	{
2720	4056	assert(copy == group);
2721	4057	//copy.ClearUI();
2722	4058	for (Object3D obj : listUI)
2723	4059	{
	4060	+ obj.pinned = false;
2724	4061	obj.CloseUI();
2725	4062	}
2726	4063	listUI.clear();
	4064	+ SetPinStates(group.selection.size() > 0);
2727	4065	refreshContents(true);
2728	4066	} else
2729		- if (event.getSource() == allParamsButton)
	4067	+ if (source == allParamsButton)
2730	4068	{
2731	4069	assert(copy == group);
2732	4070
2733		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4071	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2734	4072
2735	4073	for (Object3D obj : listUI)
2736	4074	{
..	..	@@ -2747,19 +4085,22 @@
2747	4085
2748	4086	refreshContents(true);
2749	4087	} else
2750		- if (event.getSource() == unselectButton)
	4088	+ if (source == unselectButton)
2751	4089	{
2752	4090	objEditor.jTree.clearSelection();
2753		- // ?? oct 2012 GraphreeD.clipboard.clear();
	4091	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2754	4092	objEditor.ResetSliders();
2755	4093	refreshContents(true);
2756	4094	} else
2757		- if(event.getSource() instanceof cRadio)
	4095	+ if(source instanceof cRadio)
2758	4096	{
	4097	+ if (copy.versionlist != null)
	4098	+ Replace();
	4099	+
2759	4100	group.parent = keepparent;
2760	4101	group.attributes = 0;
2761	4102	//group.editWindow = null;
2762		- /cRadio/ radio = (cRadio)event.getSource();
	4103	+ /cRadio/ radio = (cRadio)source;
2763	4104	Object3D obj = radio.GetObject();
2764	4105	System.out.println("Edit " + obj);
2765	4106	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2779,7 +4120,8 @@
2779	4120	}
2780	4121
2781	4122	copy = group;
2782		- //CameraPane.theRenderer.object = group;
	4123	+
	4124	+ //Globals.theRenderer.object = group;
2783	4125	if(!useclient)
2784	4126	{
2785	4127	cameraView.renderCamera = radio.camera;
..	..	@@ -2788,25 +4130,81 @@
2788	4130	cameraView.cameras[cameraView.cameracount] = radio.camera;
2789	4131	cameraView.targetLookAt.set(radio.camera.lookAt);
2790	4132	cameraView.object = group;
2791		- cameraView.lighttouched = true;
	4133	+ //cameraView.lighttouched = true;
	4134	+ Globals.lighttouched = true;
2792	4135	topView.object = group;
2793	4136	frontView.object = group;
2794	4137	sideView.object = group;
2795	4138	}
2796		- group.editWindow = this;
	4139	+
	4140	+// fix "+" issue
	4141	+ //group.editWindow = this;
	4142	+ group.manipWindow = this;
	4143	+
2797	4144	/*
2798	4145	currentLayout = radio.layout;
2799	4146	if (currentLayout == null)
2800	4147	currentLayout = sevenButton;
2801	4148	*/
2802	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);
2803	4184	keepparent = group.parent;
2804	4185	// PARENT = NULL or not???
2805	4186	//group.parent = null; // ROOT
2806	4187	//group.attributes = -1;
2807	4188	ResetModel();
	4189	+
	4190	+ cameraView.requestFocusInWindow();
2808	4191	refreshContents(true);
2809		- }
	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	+ }
2810	4208	else
2811	4209	{
2812	4210	//return super.action(event, arg);
..	..	@@ -2815,7 +4213,6 @@
2815	4213	}
2816	4214
2817	4215	boolean useclient = false;
2818		- cRadio radio;
2819	4216
2820	4217	void ToggleRoot()
2821	4218	{
..	..	@@ -2824,7 +4221,7 @@
2824	4221	if (useclient)
2825	4222	{
2826	4223	cameraView.object = client;
2827		- cameraView.lighttouched = true;
	4224	+ Globals.lighttouched = true;
2828	4225	//topView.object = client;
2829	4226	//frontView.object = client;
2830	4227	//sideView.object = client;
..	..	@@ -2832,7 +4229,7 @@
2832	4229	else
2833	4230	{
2834	4231	cameraView.object = group;
2835		- cameraView.lighttouched = true;
	4232	+ Globals.lighttouched = true;
2836	4233	//topView.object = group;
2837	4234	//frontView.object = group;
2838	4235	//sideView.object = group;
..	..	@@ -2867,6 +4264,40 @@
2867	4264	refreshContents();
2868	4265	}
2869	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	+ }
2870	4301
2871	4302	void ResetTransform()
2872	4303	{
..	..	@@ -2883,42 +4314,8 @@
2883	4314	if (obj.toParent == null)
2884	4315	continue;
2885	4316
2886		- if (mask == -1)
2887		- {
2888		- if (obj instanceof Camera) // jan 2014
2889		- {
2890		- LA.matIdentity(obj.toParent);
2891		- LA.matIdentity(obj.fromParent);
2892		- }
2893		- else
2894		- {
2895		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
2896		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
2897		- }
2898		- TouchTransform(obj);
2899		- continue;
2900		- }
2901		- if ((mask&2) != 0) // Scale
2902		- {
2903		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
2904		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
2905		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
2906		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
2907		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
2908		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
2909		- }
2910		- if ((mask&4) != 0) // Rotation
2911		- {
2912		- // ?
2913		- }
2914		- if ((mask&1) != 0) // Translation
2915		- {
2916		- if (obj.toParent != null)
2917		- {
2918		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
2919		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
2920		- }
2921		- }
	4317	+ obj.ResetTransform(mask);
	4318	+
2922	4319	if (obj.parent == null)
2923	4320	{
2924	4321	System.out.println("NULL PARENT!");
..	..	@@ -2979,7 +4376,7 @@
2979	4376	refreshContents();
2980	4377	}
2981	4378
2982		- void ResetCentroid()
	4379	+ void ResetCentroid(boolean full)
2983	4380	{
2984	4381	Object3D obj;
2985	4382	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2994,12 +4391,16 @@
2994	4391	LA.matIdentity(Object3D.mat);
2995	4392	obj.getBounds(minima, maxima, false);
2996	4393	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
2997		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4394	+ if (full)
	4395	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
2998	4396	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
2999	4397	obj.TransformMesh(Object3D.mat);
	4398	+
3000	4399	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3001		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4400	+ if (full)
	4401	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3002	4402	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4403	+
3003	4404	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3004	4405	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3005	4406	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3028,7 +4429,8 @@
3028	4429
3029	4430	int size = obj.MemorySize();
3030	4431
3031		- 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)");
3032	4434	}
3033	4435	}
3034	4436	catch (Exception e)
..	..	@@ -3065,9 +4467,9 @@
3065	4467	obj = (Object3D)e.nextElement();
3066	4468
3067	4469	System.out.println("Object is: " + obj);
3068		- GraphreeD.AnalyzeObject(obj);
	4470	+ Grafreed.AnalyzeObject(obj);
3069	4471	System.out.println("Boundary rep: " + obj.bRep);
3070		- GraphreeD.AnalyzeObject(obj.bRep);
	4472	+ Grafreed.AnalyzeObject(obj.bRep);
3071	4473
3072	4474	// System.err.println((size/1024) + " KB is the size of " + obj);
3073	4475	}
..	..	@@ -3109,6 +4511,20 @@
3109	4511	void GenNormals(boolean crease)
3110	4512	{
3111	4513	group.GenNormalsS(crease);
	4514	+
	4515	+ refreshContents();
	4516	+ }
	4517	+
	4518	+ void GenNormalsMESH()
	4519	+ {
	4520	+ group.GenNormalsMeshS();
	4521	+
	4522	+ refreshContents();
	4523	+ }
	4524	+
	4525	+ void GenNormalsMINE()
	4526	+ {
	4527	+ group.selection.GenNormalsMINE();
3112	4528
3113	4529	refreshContents();
3114	4530	}
..	..	@@ -3157,104 +4573,265 @@
3157	4573
3158	4574	//Object3D buffer;
3159	4575	cVector temp = new cVector();
3160		- BoundaryRep temprep;
3161		- Object3D nodes;
3162		- Vector<Vertex> vertices;
3163		-
3164		- public void Vertex(Object3D node, Vertex v)
3165		- {
3166		- vertices.add(v);
3167		- nodes.addElement(node);
3168		-
3169		- if (temprep.GetCache(v) != null)
3170		- {
3171		- temprep.Remove(v);
3172		- }
3173		- else
3174		- {
3175		- temprep.Remember(v);
3176		- }
3177		- }
3178		-
3179		- public void Face(Object3D node, Face f)
3180		- {
3181		-
3182		- }
3183		-
	4576	+// BoundaryRep temprep;
	4577	+// Object3D nodes;
	4578	+// Vector<Vertex> vertices;
	4579	+//
	4580	+// cGroup buffer;
	4581	+//
	4582	+// public void Vertex(Object3D node, Vertex v)
	4583	+// {
	4584	+//// vertices.add(v);
	4585	+//// nodes.addElement(node);
	4586	+////
	4587	+//// if (temprep.GetCache(v) != null)
	4588	+//// {
	4589	+//// temprep.Remove(v);
	4590	+//// } else
	4591	+//// {
	4592	+//// temprep.Remember(v);
	4593	+//// }
	4594	+//
	4595	+// //Object3D node = nodes.get(index);
	4596	+// temp.set(v); // vertices.get(index)); // temprep.GetVertex(k));
	4597	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	4598	+//
	4599	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	4600	+//
	4601	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	4602	+//
	4603	+// cGroup g = new cGroup();
	4604	+//
	4605	+// if (g.toParent == null)
	4606	+// {
	4607	+// g.toParent = LA.newMatrix();
	4608	+// g.fromParent = LA.newMatrix();
	4609	+// }
	4610	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	4611	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	4612	+//
	4613	+// g.add(GrafreeD.clipboard);
	4614	+//
	4615	+// buffer.add(g);
	4616	+// }
	4617	+//
	4618	+// public void Face(Object3D node, Face f)
	4619	+// {
	4620	+//
	4621	+// }
	4622	+//
	4623	+// void ParseVerticesOld() // ??
	4624	+// {
	4625	+// //if (group.selection.size() != 1)
	4626	+// // return;
	4627	+//
	4628	+// temprep = new BoundaryRep();
	4629	+// nodes = new Object3D();
	4630	+// vertices = new Vector<Vertex>();
	4631	+//
	4632	+// boolean epsequal = GrafreeD.epsequal;
	4633	+// GrafreeD.epsequal = true;
	4634	+//
	4635	+// for (int i=0; i<group.selection.size(); i++)
	4636	+// {
	4637	+// Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	4638	+//
	4639	+// group.selection.get(i).Parse(
	4640	+//this );
	4641	+//
	4642	+// int repsize = temprep.VertexCount();
	4643	+// int tablesize = temprep.vertextable.size();
	4644	+// int nodesize = nodes.size();
	4645	+//
	4646	+// assert(vertices.size() == nodes.size());
	4647	+//
	4648	+// temprep.vertextable.elements();
	4649	+//
	4650	+// java.util.Set<java.util.Map.Entry<Vertex,Vertex>> set = temprep.vertextable.entrySet();
	4651	+//
	4652	+// for (java.util.Map.Entry<Vertex,Vertex> entry : set)
	4653	+// {
	4654	+// cGroup g = new cGroup();
	4655	+//
	4656	+// int index = vertices.indexOf(entry.getValue()); // temprep.vertextable.(k));
	4657	+//
	4658	+// Object3D node = nodes.get(index);
	4659	+// temp.set(vertices.get(index)); // temprep.GetVertex(k));
	4660	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	4661	+//
	4662	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	4663	+//
	4664	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	4665	+//
	4666	+// if (g.toParent == null)
	4667	+// {
	4668	+// g.toParent = LA.newMatrix();
	4669	+// g.fromParent = LA.newMatrix();
	4670	+// }
	4671	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	4672	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	4673	+//
	4674	+// g.add(GrafreeD.clipboard);
	4675	+//
	4676	+// buffer.add(g);
	4677	+// }
	4678	+//
	4679	+// makeSomething(buffer, i==group.selection.size()-1);
	4680	+// }
	4681	+//
	4682	+// GrafreeD.epsequal = epsequal;
	4683	+//
	4684	+// //buffer = null;
	4685	+// temprep = null;
	4686	+// nodes = null;
	4687	+//
	4688	+// refreshContents();
	4689	+// }
	4690	+
3184	4691	void ParseVertices()
3185	4692	{
3186		- //if (group.selection.size() != 1)
3187		- // return;
3188		-
3189		- temprep = new BoundaryRep();
3190		- nodes = new Object3D();
3191		- vertices = new Vector<Vertex>();
3192		-
3193		- boolean epsequal = GraphreeD.epsequal;
3194		- GraphreeD.epsequal = true;
	4693	+ boolean epsequal = Grafreed.epsequal;
	4694	+ Grafreed.epsequal = true;
3195	4695
3196	4696	for (int i=0; i<group.selection.size(); i++)
3197	4697	{
3198		- Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	4698	+ final cGroup buffer = new cGroup(group.selection.get(i).name + "+");
3199	4699
3200		- group.selection.get(i).Parse(this);
3201		-
3202		- int repsize = temprep.VertexCount();
3203		- int tablesize = temprep.vertextable.size();
3204		- int nodesize = nodes.size();
	4700	+ group.selection.get(i).Parse(
	4701	+
	4702	+ new iParse()
	4703	+ {
	4704	+ public void Vertex(Object3D node, Vertex v)
	4705	+ {
	4706	+ temp.set(v);
	4707	+ LA.xformPos(temp, node.GlobalTransformInv(), temp);
3205	4708
3206		- assert(vertices.size() == nodes.size());
3207		-
3208		- temprep.vertextable.elements();
3209		-
3210		- java.util.Set<java.util.Map.Entry<Vertex,Vertex>> set = temprep.vertextable.entrySet();
	4709	+ cGroup g = new cGroup();
3211	4710
3212		- for (java.util.Map.Entry<Vertex,Vertex> entry : set)
3213		- {
3214		- cGroup g = new cGroup();
	4711	+ if (g.toParent == null)
	4712	+ {
	4713	+ g.toParent = LA.newMatrix();
	4714	+ g.fromParent = LA.newMatrix();
	4715	+ }
	4716	+ LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	4717	+ LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3215	4718
3216		- int index = vertices.indexOf(entry.getValue()); // temprep.vertextable.(k));
3217		- Object3D node = nodes.get(index);
3218		- temp.set(vertices.get(index)); // temprep.GetVertex(k));
3219		- // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	4719	+ g.add(Grafreed.clipboard);
3220	4720
3221		- LA.xformPos(temp, node.GlobalTransformInv(), temp);
3222		-
3223		- // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
3224		-
3225		- if (g.toParent == null)
3226		- {
3227		- g.toParent = LA.newMatrix();
3228		- g.fromParent = LA.newMatrix();
3229		- }
3230		- LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3231		- LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	4721	+ buffer.add(g);
	4722	+ }
3232	4723
3233		- g.add(GraphreeD.clipboard);
	4724	+ public void Face(Object3D node, Face f)
	4725	+ {
3234	4726
3235		- buffer.add(g);
3236		- }
	4727	+ }
	4728	+ }
	4729	+ );
3237	4730
3238	4731	makeSomething(buffer, i==group.selection.size()-1);
3239	4732	}
3240	4733
3241		- GraphreeD.epsequal = epsequal;
3242		-
3243		- //buffer = null;
3244		- temprep = null;
3245		- nodes = null;
	4734	+ Grafreed.epsequal = epsequal;
3246	4735
3247	4736	refreshContents();
3248	4737	}
3249		-
	4738	+
	4739	+ void TextureVertices()
	4740	+ {
	4741	+ for (int i=0; i<group.selection.size(); i++)
	4742	+ {
	4743	+ group.selection.get(i).Parse(
	4744	+ new iParse()
	4745	+ {
	4746	+ public void Vertex(Object3D node, Vertex v)
	4747	+ {
	4748	+ cTexture tex = node.GetTextures();
	4749	+ String pigment = Object3D.GetPigment(tex);
	4750	+ //String bump = Object3D.GetBump(tex);
	4751	+
	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	+ }
	4762	+
	4763	+ double s = v.s;
	4764	+
	4765	+ if (s == 1)
	4766	+ s = 0;
	4767	+
	4768	+ double t = v.t;
	4769	+
	4770	+ if (t == 1)
	4771	+ t = 0;
	4772	+
	4773	+ int indexs = (int) (texturedata.getWidth() * s);
	4774	+ int indext = (int) (texturedata.getHeight() * t);
	4775	+
	4776	+ int index = indext * texturedata.getWidth() + indexs;
	4777	+
	4778	+ java.nio.ByteBuffer bytebuf = (java.nio.ByteBuffer)texturedata.getBuffer();
	4779	+
	4780	+ int slide = bytebuf.capacity() / texturedata.getWidth() / texturedata.getHeight();
	4781	+
	4782	+ float scale = bytebuf.get(index*slide) & 0xFF;
	4783	+ scale += bytebuf.get(index*slide+1) & 0xFF;
	4784	+ scale += bytebuf.get(index*slide+2) & 0xFF;
	4785	+ scale /= 3;
	4786	+
	4787	+ scale /= 0xFF;
	4788	+ // c'est quoi ca? scale /= 4;
	4789	+
	4790	+ //v.AO = scale;
	4791	+
	4792	+ v.x += v.norm.x * scale;
	4793	+ v.y += v.norm.y * scale;
	4794	+ v.z += v.norm.z * scale;
	4795	+ }
	4796	+
	4797	+ public void Face(Object3D node, Face f)
	4798	+ {
	4799	+ }
	4800	+ }
	4801	+ );
	4802	+ }
	4803	+
	4804	+ refreshContents();
	4805	+ }
	4806	+
3250	4807	void Align()
3251	4808	{
	4809	+ if (group.selection.size() == 0)
	4810	+ return;
	4811	+
	4812	+ cVector bbmin = new cVector();
	4813	+ cVector bbmax = new cVector();
	4814	+
	4815	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	4816	+
	4817	+ double dx = bbmax.x - bbmin.x;
	4818	+ double dy = bbmax.y - bbmin.y;
	4819	+ double dz = bbmax.z - bbmin.z;
	4820	+
	4821	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	4822	+
3252	4823	for (int i=0; i<group.selection.size(); i++)
3253	4824	{
3254	4825	Object3D obj = group.selection.get(i);
3255	4826
3256		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3257		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	4827	+ if (obj.toParent == null)
	4828	+ {
	4829	+ obj.toParent = LA.newMatrix();
	4830	+ obj.fromParent = LA.newMatrix();
	4831	+ }
	4832	+
	4833	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	4834	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3258	4835	}
3259	4836
3260	4837	refreshContents();
..	..	@@ -3267,7 +4844,7 @@
3267	4844	// ref.SaveSupports();
3268	4845	// Object3D par = ref.parent;
3269	4846	// ref.parent = null;
3270		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	4847	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3271	4848	// ref.parent = par;
3272	4849	// ref.RestoreSupports();
3273	4850
..	..	@@ -3275,11 +4852,11 @@
3275	4852
3276	4853	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3277	4854
3278		- boolean random = CameraPane.RANDOM;
3279		- CameraPane.RANDOM = false; // parse all random nodes
	4855	+ boolean random = CameraPane.SWITCH;
	4856	+ CameraPane.SWITCH = false; // parse all random nodes
3280	4857	lowres.linkVerticesThis(null);
3281	4858	lowres.linkVerticesThis(sn);
3282		- CameraPane.RANDOM = random;
	4859	+ CameraPane.SWITCH = random;
3283	4860
3284	4861	System.err.flush();
3285	4862
..	..	@@ -3297,7 +4874,7 @@
3297	4874	// lowres.SaveSupports();
3298	4875	// par = lowres.parent;
3299	4876	// lowres.parent = null;
3300		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	4877	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3301	4878	Object3D newlow = CloneObject(lowres, false);
3302	4879	newlow.name = sn.switchobject.get(i).name;
3303	4880	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3319,7 +4896,7 @@
3319	4896	return;
3320	4897
3321	4898	Object3D poses = group.selection.get(0);
3322		- Object3D ref = GraphreeD.clipboard.get(0);
	4899	+ Object3D ref = Grafreed.clipboard.get(0);
3323	4900
3324	4901	Object3D newgroup = new Object3D("Po:" + poses.name);
3325	4902
..	..	@@ -3488,7 +5065,7 @@
3488	5065	group.selection.RelinkToSupport(); // july 2014
3489	5066	System.out.println("DONE.");
3490	5067	refreshContents();
3491		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	5068	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3492	5069	}
3493	5070
3494	5071	void ReduceMesh(boolean reduction34)
..	..	@@ -3513,20 +5090,20 @@
3513	5090
3514	5091	void ClipMesh()
3515	5092	{
3516		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	5093	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3517	5094	{
3518		- Object3D content = GraphreeD.clipboard.get(0);
	5095	+ Object3D content = Grafreed.clipboard.get(0);
3519	5096
3520	5097	if (content instanceof cGroup && ((cGroup)content).transientlink )
3521	5098	content = ((cGroup)content).get(0);
3522	5099
3523	5100	// for (int i=0; i<group.selection.size(); i++)
3524	5101	// {
3525		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	5102	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3526	5103	// }
3527		- group.selection.ClipMesh(GraphreeD.clipboard);
	5104	+ group.selection.ClipMesh(Grafreed.clipboard);
3528	5105	}
3529		-// group.selection.ClipMesh(GraphreeD.clipboard);
	5106	+// group.selection.ClipMesh(GrafreeD.clipboard);
3530	5107	System.out.println("DONE.");
3531	5108	refreshContents();
3532	5109	}
..	..	@@ -3541,6 +5118,12 @@
3541	5118	void ClearMaterials()
3542	5119	{
3543	5120	group.selection.ClearMaterials();
	5121	+ refreshContents();
	5122	+ }
	5123	+
	5124	+ void ClearVersions()
	5125	+ {
	5126	+ group.selection.ClearVersions();
3544	5127	refreshContents();
3545	5128	}
3546	5129
..	..	@@ -3571,6 +5154,18 @@
3571	5154	void MarkLeaves(boolean hide)
3572	5155	{
3573	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);
3574	5169	refreshContents();
3575	5170	}
3576	5171
..	..	@@ -3645,28 +5240,25 @@
3645	5240	// }
3646	5241	// }
3647	5242
3648		- static boolean allparams = true;
3649		-
3650		- static Vector<Object3D> listUI = new Vector<Object3D>();
3651		-
3652	5243	void EditSelection(boolean newWindow)
3653	5244	{
	5245	+ if (group.selection == null)
	5246	+ {
	5247	+ EditElement(group, newWindow); // ? new
	5248	+ return;
	5249	+ }
	5250	+
3654	5251	// aConstraints.gridy = 0;
3655	5252	for (int i=0; i<group.selection.size(); i++)
3656	5253	{
3657	5254	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3658	5255	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3659		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5256	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3660	5257
3661	5258	Object3D elem = (Object3D)group.selection.elementAt(i);
3662		- if(elem != group)
	5259	+ if(elem != group \|\| !newWindow)
3663	5260	{
3664		- // if (!(elem instanceof Composite))
3665		- // newWindow = false;
3666		- listUI.add(elem);
3667		- elem.openEditWindow(this, newWindow); //, false);
3668		- System.out.println("edit : " + elem);
3669		- elem.editWindow.refreshContents(true); // ? new
	5261	+ EditElement(elem, newWindow); // ? new
3670	5262	}
3671	5263	}
3672	5264	}
..	..	@@ -3729,9 +5321,7 @@
3729	5321
3730	5322	freezemodel = false;
3731	5323	}
3732		-
3733		- boolean flashIt = true;
3734		-
	5324	+
3735	5325	public void valueChanged(TreeSelectionEvent e)
3736	5326	//public boolean handleEvent(Event event)
3737	5327	{
..	..	@@ -3741,7 +5331,8 @@
3741	5331	//new Exception().printStackTrace();
3742	5332
3743	5333	freezemodel = true;
3744		-
	5334	+ ClearUnpinned();
	5335	+
3745	5336	/**/
3746	5337	//switch (event.id)
3747	5338	{
..	..	@@ -3749,7 +5340,6 @@
3749	5340	//case 702: // Event.LIST_DESELECT
3750	5341	group.deselectAll();
3751	5342	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3752		- objEditor.ClearInfo(); // .GetMaterial());
3753	5343	if (tps != null)
3754	5344	{
3755	5345	for (int i=0; i < tps.length; i++)
..	..	@@ -3758,33 +5348,39 @@
3758	5348
3759	5349	//if (child.parent != null)
3760	5350	//child.parent.addSelectee(child);
	5351	+ objEditor.SetMaterial(child);
3761	5352	group.addSelectee(child);
3762		- objEditor.SetMaterial(child); // .GetMaterial());
3763		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3764		- System.err.println("info : " + child.GetPath());
3765	5353	}
3766	5354	}
3767		- else
3768		- {
3769		- objEditor.SetMaterial(group); // .GetMaterial());
3770		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3771		- System.err.println("info : " + group.GetPath());
3772		- }
	5355	+// else
	5356	+// {
	5357	+// objEditor.SetMaterial(group); // .GetMaterial());
	5358	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5359	+// System.err.println("info : " + group.GetPath());
	5360	+// }
3773	5361
3774		- objEditor.SetText(); // jan 2014
3775		-
3776		- if (flashIt && !CameraPane.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))
3777	5363	CameraPane.flash = true;
3778	5364
3779		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5365	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3780	5366	// a camera
3781	5367	{
3782		- CameraPane.camerachangeframe = 0; // don't refuse it
3783		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3784		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3785		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	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	+ }
	5373	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	5374	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3786	5375	}
3787	5376
	5377	+ if (tps != null && tps.length == 1)
	5378	+ {
	5379	+ EditSelection(false);
	5380	+ }
	5381	+
	5382	+ SetPinStates(tps != null && tps.length > 0);
	5383	+
3788	5384	refreshContents();
3789	5385	//return true;
3790	5386	}
..	..	@@ -3793,6 +5389,53 @@
3793	5389
3794	5390	freezemodel = false;
3795	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	+ }
3796	5439
3797	5440	void linkSomething(Object3D thing)
3798	5441	{
..	..	@@ -3864,16 +5507,19 @@
3864	5507	{
3865	5508	if (group.selection.isEmpty())
3866	5509	return;
3867		- GraphreeD.clipboardIsTempGroup = false;
	5510	+
	5511	+ Grafreed.clipboardIsTempGroup = false;
3868	5512	Composite tGroup = null;
3869	5513	if (group.selection.size() > 0) // 1)
3870	5514	{
3871	5515	tGroup = new cGroup();
3872		- GraphreeD.clipboardIsTempGroup = true;
	5516	+ Grafreed.clipboardIsTempGroup = true;
3873	5517	}
3874	5518
3875	5519	if (cut)
3876	5520	{
	5521	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5522	+// Save();
3877	5523	//int indices[] = jList.getSelectedIndices();
3878	5524	//for (int i = indices.length - 1; i >= 0; i--)
3879	5525	//jList.remove(indices[i]);
..	..	@@ -3909,16 +5555,16 @@
3909	5555	//System.out.println("cut " + child);
3910	5556	//System.out.println("parent = " + child.parent);
3911	5557	// tmp.addChild(child);
3912		- if (GraphreeD.clipboardIsTempGroup)
	5558	+ if (Grafreed.clipboardIsTempGroup)
3913	5559	tGroup.add/Child/(tmp);
3914	5560	else
3915		- GraphreeD.clipboard = tmp;
	5561	+ Grafreed.clipboard = tmp;
3916	5562	}
3917	5563	else
3918		- if (GraphreeD.clipboardIsTempGroup)
	5564	+ if (Grafreed.clipboardIsTempGroup)
3919	5565	tGroup.add/Child/(child);
3920	5566	else
3921		- GraphreeD.clipboard = child;
	5567	+ Grafreed.clipboard = child;
3922	5568	}
3923	5569
3924	5570	//ResetModel();
..	..	@@ -3950,21 +5596,23 @@
3950	5596	//System.out.println("cut " + elem);
3951	5597	//System.out.println("parent = " + elem.parent);
3952	5598	// tmp.addChild(elem);
3953		- if (GraphreeD.clipboardIsTempGroup)
	5599	+ if (Grafreed.clipboardIsTempGroup)
3954	5600	tGroup.add/Child/(tmp);
3955	5601	else
3956		- GraphreeD.clipboard = tmp;
	5602	+ Grafreed.clipboard = tmp;
3957	5603	}
3958	5604	else
3959		- if (GraphreeD.clipboardIsTempGroup)
	5605	+ if (Grafreed.clipboardIsTempGroup)
3960	5606	tGroup.add/Child/(child);
3961	5607	else
3962		- GraphreeD.clipboard = child;
	5608	+ Grafreed.clipboard = child;
3963	5609	}
3964	5610
3965	5611	}
3966		- if (GraphreeD.clipboardIsTempGroup)
3967		- GraphreeD.clipboard = tGroup;
	5612	+
	5613	+ if (Grafreed.clipboardIsTempGroup)
	5614	+ Grafreed.clipboard = tGroup;
	5615	+
3968	5616	if (cut)
3969	5617	{
3970	5618	ResetModel();
..	..	@@ -3974,11 +5622,15 @@
3974	5622
3975	5623	void paste(boolean expand)
3976	5624	{
3977		- // if (GraphreeD.clipboard == null)
	5625	+ if (Globals.REPLACEONMAKE)
	5626	+ Save();
	5627	+ boolean keep = Globals.REPLACEONMAKE;
	5628	+ Globals.REPLACEONMAKE = false;
	5629	+ // if (GrafreeD.clipboard == null)
3978	5630	// return;
3979	5631	boolean first = true;
3980	5632
3981		- if (GraphreeD.clipboardIsTempGroup)
	5633	+ if (Grafreed.clipboardIsTempGroup)
3982	5634	{
3983	5635	Composite temp;
3984	5636
..	..	@@ -3989,7 +5641,7 @@
3989	5641	temp = (Composite)Applet3D.clipboard.deepCopy();
3990	5642	*/
3991	5643	Object3D elem;
3992		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5644	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
3993	5645	{
3994	5646	Object3D child = (Object3D)e.nextElement();
3995	5647
..	..	@@ -4003,7 +5655,7 @@
4003	5655	else
4004	5656	elem = child.deepCopy(); // ?
4005	5657	child.parent = keepparent;
4006		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	5658	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4007	5659	// elem = elem.get(0);
4008	5660	makeSomething(elem, true); // ?? first);
4009	5661	//group.addChild(elem);
..	..	@@ -4023,23 +5675,24 @@
4023	5675	//Object3D cb = Applet3D.clipboard;
4024	5676	//temp.addChild(cb);
4025	5677	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4026		- assert(GraphreeD.clipboard.parent == null);
4027		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
4028		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
4029		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
4030		- makeSomething(expand?GraphreeD.clipboard.get(0).copyExpand():GraphreeD.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());
4031	5683	else
4032		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4033		- GraphreeD.clipboard.get(0).parent = keepparent;
	5684	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5685	+ Grafreed.clipboard.get(0).parent = keepparent;
4034	5686	}
4035	5687
	5688	+ Globals.REPLACEONMAKE = keep;
4036	5689	ResetModel();
4037	5690	refreshContents();
4038	5691	}
4039	5692
4040		- void pasteInto(boolean copyit)
	5693	+ void pasteInto(boolean copyit, boolean clone)
4041	5694	{
4042		-// if (GraphreeD.clipboard == null)
	5695	+// if (GrafreeD.clipboard == null)
4043	5696	// return;
4044	5697
4045	5698	if (group.selection.size() != 1)
..	..	@@ -4066,15 +5719,22 @@
4066	5719	if (copyit)
4067	5720	{
4068	5721	// paste(false);
4069		- CloneClipboard(false); // sept 2014
	5722	+ if (clone)
	5723	+ {
	5724	+ CloneClipboard(false); // sept 2014
	5725	+ }
	5726	+ else
	5727	+ {
	5728	+ paste(false);
	5729	+ }
4070	5730	}
4071	5731	else
4072	5732	{
4073	5733	boolean first = true;
4074	5734
4075		- if (GraphreeD.clipboardIsTempGroup)
	5735	+ if (Grafreed.clipboardIsTempGroup)
4076	5736	{
4077		- Composite temp = (Composite)GraphreeD.clipboard;
	5737	+ Composite temp = (Composite)Grafreed.clipboard;
4078	5738	Object3D copy;
4079	5739	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4080	5740	{
..	..	@@ -4084,7 +5744,7 @@
4084	5744	}
4085	5745	} else
4086	5746	{
4087		- linkSomething(GraphreeD.clipboard); //.get(0));
	5747	+ linkSomething(Grafreed.clipboard); //.get(0));
4088	5748	}
4089	5749	}
4090	5750	}
..	..	@@ -4161,6 +5821,10 @@
4161	5821
4162	5822	void group(Object3D csg, boolean grab)
4163	5823	{
	5824	+ if (Globals.REPLACEONMAKE)
	5825	+ Save();
	5826	+ boolean keep = Globals.REPLACEONMAKE;
	5827	+ Globals.REPLACEONMAKE = false;
4164	5828	if (//false) // why??
4165	5829	!group.selection.isEmpty())
4166	5830	{
..	..	@@ -4274,8 +5938,34 @@
4274	5938	//node.add(csg);
4275	5939	//makeSomething(node);
4276	5940	makeSomething(csg);
	5941	+ Globals.REPLACEONMAKE = keep;
4277	5942	}
4278	5943
	5944	+ void Ungroup(Object3D g)
	5945	+ {
	5946	+ if (Globals.REPLACEONMAKE)
	5947	+ Save();
	5948	+ boolean keep = Globals.REPLACEONMAKE;
	5949	+ Globals.REPLACEONMAKE = false;
	5950	+ if (g instanceof HiddenObject)
	5951	+ {
	5952	+ HiddenObject h = (HiddenObject) g;
	5953	+
	5954	+ for (int i=0; i<h.ActualSize(); i++)
	5955	+ {
	5956	+ objEditor.makeSomething(h.get(i), false);
	5957	+ }
	5958	+ }
	5959	+ else
	5960	+ {
	5961	+ for (int i=0; i<g.Size(); i++)
	5962	+ {
	5963	+ objEditor.makeSomething(g.get(i), false);
	5964	+ }
	5965	+ }
	5966	+ Globals.REPLACEONMAKE = keep;
	5967	+ }
	5968	+
4279	5969	void ungroup()
4280	5970	{
4281	5971	/*
..	..	@@ -4469,21 +6159,6 @@
4469	6159	}
4470	6160	*/
4471	6161
4472		- void ImportGFD()
4473		- {
4474		- FileDialog browser = new FileDialog(objEditor.frame, "Import GraphreeD", FileDialog.LOAD);
4475		- browser.show();
4476		- String filename = browser.getFile();
4477		- if (filename != null && filename.length() > 0)
4478		- {
4479		- String fullname = browser.getDirectory() + filename;
4480		-
4481		- //Object3D readobj =
4482		- objEditor.ReadGFD(fullname, objEditor);
4483		- //makeSomething(readobj);
4484		- }
4485		- }
4486		-
4487	6162	/*
4488	6163	public void Callback(Object obj)
4489	6164	{
..	..	@@ -4507,26 +6182,9 @@
4507	6182	}
4508	6183	*/
4509	6184
4510		- void ImportVRMLX3D()
4511		- {
4512		- if (GraphreeD.standAlone)
4513		- {
4514		- /**/
4515		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4516		- browser.show();
4517		- String filename = browser.getFile();
4518		- if (filename != null && filename.length() > 0)
4519		- {
4520		- String fullname = browser.getDirectory() + filename;
4521		- LoadVRMLX3D(fullname);
4522		- }
4523		- /**/
4524		- }
4525		- }
4526		-
4527	6185	String GetFile(String dialogName)
4528	6186	{
4529		- if (GraphreeD.standAlone)
	6187	+ if (Grafreed.standAlone)
4530	6188	{
4531	6189	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4532	6190	browser.show();
..	..	@@ -4590,10 +6248,48 @@
4590	6248	cButton flashSelectionButton;
4591	6249	cButton editButton;
4592	6250	cButton uneditButton;
	6251	+ JCheckBox allParamsButton;
4593	6252	cButton clearpanelButton;
4594		- cButton allParamsButton;
4595	6253	cButton unselectButton;
4596	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	+
4597	6293	cButton screenfitButton;
4598	6294	cButton screenfitpointButton;
4599	6295	cButton snapobjectButton;
..	..	@@ -4605,14 +6301,6 @@
4605	6301
4606	6302	cButton setsupportButton;
4607	6303
4608		- cButton twoButton;
4609		- cButton sixButton;
4610		- cButton threeButton;
4611		- cButton sevenButton;
4612		- cButton fourButton; // full panel
4613		- cButton oneButton; // full XYZ
4614		- //cButton currentLayout;
4615		-
4616	6304	//
4617	6305	//Composite
4618	6306	Object3D // to do !!
..	..	@@ -4622,10 +6310,12 @@
4622	6310	//JTree jTree;
4623	6311	private MenuItem lookAtItem;
4624	6312	private MenuItem lookFromItem;
4625		- private MenuItem switchItem;
4626		- private MenuItem cutItem;
4627		- private MenuItem duplicateItem;
4628		- 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;
4629	6319	private MenuItem cloneSupportItem;
4630	6320	private MenuItem overwriteGeoItem;
4631	6321	private MenuItem overwriteMatItem;
..	..	@@ -4635,8 +6325,9 @@
4635	6325	private MenuItem resetsupportItem;
4636	6326	private MenuItem resetreferencesItem;
4637	6327	private MenuItem linkverticesItem;
	6328	+ private MenuItem relinkverticesItem;
4638	6329	private MenuItem setMasterItem;
4639		- private MenuItem resetMeshItem;
	6330	+ private MenuItem resetAllItem;
4640	6331	private MenuItem stepAllItem;
4641	6332	private MenuItem revertMeshItem;
4642	6333	private MenuItem poseMeshItem;
..	..	@@ -4645,16 +6336,19 @@
4645	6336	private MenuItem cloneGeometriesItem;
4646	6337	private MenuItem shareGeometriesItem;
4647	6338	private MenuItem mergeGeometriesItem;
4648		- private MenuItem copyItem;
	6339	+ private JMenuItem copyItem;
4649	6340	private MenuItem pasteItem;
4650		- private MenuItem pasteLinkItem;
4651		- private MenuItem pasteCloneItem;
4652		- private MenuItem pasteExpandItem;
4653		- private MenuItem clearItem;
	6341	+ private JMenuItem pasteIntoItem;
	6342	+ private JMenuItem pasteLinkItem;
	6343	+ private JMenuItem pasteCloneItem;
	6344	+ private JMenuItem pasteExpandItem;
	6345	+ private JMenuItem deleteItem;
4654	6346	private MenuItem clearAllItem;
4655	6347	private MenuItem genUVItem;
	6348	+ private MenuItem genNormalsMESHItem;
4656	6349	private MenuItem genNormalsCADItem;
4657	6350	private MenuItem genNormalsORGANItem;
	6351	+ private MenuItem genNormalsMINEItem;
4658	6352	private MenuItem stripifyItem;
4659	6353	private MenuItem unstripifyItem;
4660	6354	private MenuItem trimItem;
..	..	@@ -4674,6 +6368,7 @@
4674	6368	private MenuItem clipMeshItem;
4675	6369	private MenuItem smoothMeshItem;
4676	6370	private MenuItem clearMaterialsItem;
	6371	+ private MenuItem clearVersionsItem;
4677	6372
4678	6373	private MenuItem liveleavesItem;
4679	6374	private MenuItem unliveleavesItem;
..	..	@@ -4683,6 +6378,10 @@
4683	6378	private MenuItem showleavesItem;
4684	6379	private MenuItem markleavesItem;
4685	6380	private MenuItem unmarkleavesItem;
	6381	+ private MenuItem rewindleavesItem;
	6382	+ private MenuItem unrewindleavesItem;
	6383	+ private MenuItem randomleavesItem;
	6384	+ private MenuItem unrandomleavesItem;
4686	6385
4687	6386	private MenuItem flipVItem;
4688	6387	private MenuItem unflipVItem;
..	..	@@ -4693,15 +6392,21 @@
4693	6392	private MenuItem maxTexturesItem;
4694	6393	private MenuItem panoTexturesItem;
4695	6394
	6395	+ private MenuItem textureRatioRItem;
	6396	+ private MenuItem textureRatioGItem;
	6397	+ private MenuItem textureRatioBItem;
4696	6398	private MenuItem resetCentroidItem;
4697		- private MenuItem transformgeometryItem;
	6399	+ private MenuItem resetCentroidXZItem;
4698	6400	private MenuItem resetTransformItem;
4699		- private MenuItem grabItem;
	6401	+ private MenuItem transformGeometryItem;
	6402	+ private MenuItem transformChildrenItem;
	6403	+ private MenuItem hideItem;
	6404	+ private JMenuItem grabItem;
4700	6405	private MenuItem backItem;
4701	6406	private MenuItem frontItem;
4702	6407	private MenuItem cameraItem;
4703	6408	private MenuItem compositeItem;
4704		- private MenuItem randomItem;
	6409	+ private MenuItem switchItem;
4705	6410	private MenuItem physicsItem;
4706	6411	private MenuItem frameselectorItem;
4707	6412	private MenuItem scriptNodeItem;
..	..	@@ -4709,13 +6414,14 @@
4709	6414	private MenuItem switchTransfoItem;
4710	6415	private MenuItem morphItem;
4711	6416	private MenuItem linkerItem;
4712		- private MenuItem ungroupItem;
	6417	+ private JMenuItem ungroupItem;
4713	6418	private MenuItem editItem;
4714	6419	private MenuItem openWindowItem;
4715	6420	private MenuItem editLeafItem;
4716	6421
4717	6422	private MenuItem resetParentItem;
4718	6423	private MenuItem repairParentItem;
	6424	+ private MenuItem repairShadowItem;
4719	6425	private MenuItem sortbysizeItem;
4720	6426	private MenuItem sortbynameItem;
4721	6427
..	..	@@ -4724,20 +6430,25 @@
4724	6430	private MenuItem attachBumpItem;
4725	6431	private MenuItem detachBumpItem;
4726	6432	private MenuItem pigmentBumpItem;
	6433	+ private MenuItem embedTexturesItem;
	6434	+ private MenuItem deEmbedTexturesItem;
4727	6435
4728	6436	private MenuItem particleItem;
4729	6437	private MenuItem ragdollItem;
4730	6438	private MenuItem ragdoll2Item;
	6439	+ private MenuItem heightFieldItem;
	6440	+ private MenuItem textureFieldItem;
4731	6441	private MenuItem gridItem;
4732	6442	private MenuItem rectoidItem;
4733	6443	private MenuItem ellipsoidItem;
4734	6444	private MenuItem coneItem;
4735	6445	private MenuItem torusItem;
4736	6446	private MenuItem superItem;
	6447	+ private MenuItem kleinItem;
4737	6448	private MenuItem blobItem;
4738	6449	private MenuItem latheItem;
4739	6450	private MenuItem bezierItem;
4740		- private MenuItem checkerItem;
	6451	+ private MenuItem overlayItem;
4741	6452	private MenuItem meshItem;
4742	6453	// private MenuItem meshGroupItem;
4743	6454	private MenuItem springItem;
..	..	@@ -4746,6 +6457,7 @@
4746	6457	private MenuItem csgItem;
4747	6458	private MenuItem templateItem;
4748	6459	private MenuItem textureItem;
	6460	+ private MenuItem billboardItem;
4749	6461	private MenuItem shadowXItem;
4750	6462	private MenuItem shadowYItem;
4751	6463	private MenuItem shadowZItem;
..	..	@@ -4758,11 +6470,6 @@
4758	6470	private MenuItem doubleItem;
4759	6471	private MenuItem tripleItem;
4760	6472
4761		- private MenuItem importGFDItem;
4762		- private MenuItem importVRMLX3DItem;
4763		- private MenuItem import3DSItem;
4764		- private MenuItem importOBJItem;
4765		-
4766	6473	private MenuItem computeAOItem;
4767	6474	private MenuItem recompileItem;
4768	6475	private MenuItem editScriptItem;
..	..	@@ -4772,4 +6479,8 @@
4772	6479	private MenuItem analyzeItem;
4773	6480	private MenuItem dumpItem;
4774	6481	//boolean freezemodel = false;
	6482	+
	6483	+ Menu cameraMenu;
	6484	+ MenuItem editCameraItem;
	6485	+ MenuItem restoreCameraItem;
4775	6486	}