~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -23,6 +24,350 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	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	+
26	371	//ObjEditor objEditor;
27	372	public void closeUI2()
28	373	{
..	..	@@ -60,11 +405,15 @@
60	405	this.copy = this.group = group;
61	406	//selectees = this.group.selectees;
62	407
63		- if (copy.versions == null)
64		- {
65		- copy.versions = new byte[100][];
66		- copy.versionindex = -1;
67		- }
	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	+// }
68	417
69	418	if(ui)
70	419	SetupUI(objEditor);
..	..	@@ -87,13 +436,13 @@
87	436
88	437	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
89	438
90		- if (copy.versions == null)
91		- {
92		- copy.versions = new byte[100][];
93		- copy.versionindex = -1;
94		-
95		- Save(true);
96		- }
	439	+// if (copy.versionlist == null)
	440	+// {
	441	+// copy.versionlist = new Object3D[100];
	442	+// copy.versionindex = -1;
	443	+//
	444	+// //Save(true);
	445	+// }
97	446	}
98	447
99	448	void CloneSelection(boolean supports)
..	..	@@ -134,11 +483,16 @@
134	483
135	484	Object3D parent = obj.parent;
136	485	obj.parent = null;
	486	+
137	487	// Object3D support = obj.support;
138	488	// obj.support = null;
139	489	if (!supports)
140	490	obj.SaveSupports();
	491	+
141	492	Object3D clone = (Object3D)Grafreed.clone(obj);
	493	+
	494	+ clone.ResetUUIDs();
	495	+
142	496	obj.parent = parent;
143	497	// obj.support = support;
144	498	// clone.support = support; // aout 2013
..	..	@@ -183,33 +537,37 @@
183	537	// menu.add("-");
184	538	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
185	539	duplicateItem.addActionListener(this);
186		- cloneItem = menu.add(new MenuItem("Clone"));
	540	+
	541	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
187	542	cloneItem.addActionListener(this);
188		- if (Globals.ADVANCED)
	543	+ //if (Globals.ADVANCED)
189	544	{
190	545	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
191	546	cloneSupportItem.addActionListener(this);
192	547	}
	548	+ oe.jTree.popup.addSeparator();
193	549	menu.add("-");
194		- cutItem = menu.add(new MenuItem("Cut"));
	550	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
195	551	cutItem.addActionListener(this);
196		- copyItem = menu.add(new MenuItem("Copy"));
	552	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
197	553	copyItem.addActionListener(this);
198	554	pasteItem = menu.add(new MenuItem("Paste"));
199	555	pasteItem.addActionListener(this);
200	556
201		- menu.add("-");
202		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	557	+ oe.jTree.popup.addSeparator();
	558	+ //menu.add("-");
	559	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
203	560	pasteIntoItem.addActionListener(this);
204		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	561	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
205	562	pasteLinkItem.addActionListener(this);
206		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	563	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
207	564	pasteCloneItem.addActionListener(this);
208		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
209		-// pasteExpandItem.addActionListener(this);
210		- menu.add("-");
211		- deleteItem = menu.add(new MenuItem("Delete"));
212		- deleteItem.addActionListener(this);
	565	+// CRASH
	566	+ pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
	567	+//
	568	+ pasteExpandItem.addActionListener(this);
	569	+ //menu.add("-");
	570	+ oe.jTree.popup.addSeparator();
213	571
214	572	if (Globals.ADVANCED)
215	573	{
..	..	@@ -295,11 +653,9 @@
295	653	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
296	654	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
297	655	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
298		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
299	656	oe.cameraMenu.add("-");
300	657	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
301	658	openWindowItem.addActionListener(this);
302		- editLeafItem.addActionListener(this);
303	659	lookAtItem.addActionListener(this);
304	660	//lookFromItem.addActinoListener(this);
305	661	//switchViewItem.addActionListener(this);
..	..	@@ -346,9 +702,8 @@
346	702	setMasterItem.addActionListener(this);
347	703	}
348	704
349		- oe.menuBar.add(menu = new Menu("Group"));
350		-// grabItem = menu.add(new MenuItem("Grab"));
351		-// grabItem.addActionListener(this);
	705	+ oe.menuBar.add(menu = new Menu("Order"));
	706	+
352	707	backItem = menu.add(new MenuItem("Back"));
353	708	backItem.addActionListener(this);
354	709	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -356,13 +711,21 @@
356	711	// compositeItem = menu.add(new MenuItem("Composite"));
357	712	// compositeItem.addActionListener(this);
358	713
	714	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	715	+ grabItem.addActionListener(this);
	716	+
359	717	if (Globals.ADVANCED)
360	718	{
361	719	hideItem = menu.add(new MenuItem("Hidden Group"));
362	720	hideItem.addActionListener(this);
363	721	}
364		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	722	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
365	723	ungroupItem.addActionListener(this);
	724	+
	725	+ oe.jTree.popup.addSeparator();
	726	+
	727	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	728	+ deleteItem.addActionListener(this);
366	729
367	730	// menu.add("-");
368	731	//
..	..	@@ -399,9 +762,9 @@
399	762	shadowYItem.addActionListener(this);
400	763	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
401	764	shadowZItem.addActionListener(this);
	765	+
402	766	attributeItem = menu.add(new MenuItem("Attribute"));
403	767	attributeItem.addActionListener(this);
404		-
405	768	if (Globals.ADVANCED)
406	769	{
407	770	menu.add("-");
..	..	@@ -413,11 +776,18 @@
413	776	pointflowItem.addActionListener(this);
414	777	}
415	778	menu.add("-");
	779	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	780	+ textureRatioRItem.addActionListener(this);
	781	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	782	+ textureRatioGItem.addActionListener(this);
	783	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	784	+ textureRatioBItem.addActionListener(this);
	785	+ menu.add("-");
416	786	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
417	787	resetTransformItem.addActionListener(this);
418	788	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
419	789	resetCentroidItem.addActionListener(this);
420		- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	790	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
421	791	resetCentroidXZItem.addActionListener(this);
422	792	transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
423	793	transformGeometryItem.addActionListener(this);
..	..	@@ -433,7 +803,7 @@
433	803	genNormalsCADItem.addActionListener(this);
434	804	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
435	805	genNormalsMESHItem.addActionListener(this);
436		- if (Globals.ADVANCED)
	806	+ //if (Globals.ADVANCED)
437	807	{
438	808	genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
439	809	genNormalsMINEItem.addActionListener(this);
..	..	@@ -469,6 +839,8 @@
469	839	}
470	840
471	841	oe.menuBar.add(menu = new Menu("Attributes"));
	842	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	843	+ clearVersionsItem.addActionListener(this);
472	844	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
473	845	clearMaterialsItem.addActionListener(this);
474	846	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -491,9 +863,9 @@
491	863	hideleavesItem.addActionListener(this);
492	864	showleavesItem = menu.add(new MenuItem("Show Leaves"));
493	865	showleavesItem.addActionListener(this);
494		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	866	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
495	867	markleavesItem.addActionListener(this);
496		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	868	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
497	869	unmarkleavesItem.addActionListener(this);
498	870	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
499	871	rewindleavesItem.addActionListener(this);
..	..	@@ -547,6 +919,9 @@
547	919	shareGeometriesItem.addActionListener(this);
548	920	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
549	921	mergeGeometriesItem.addActionListener(this);
	922	+ menu.add("-");
	923	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	924	+ editLeafItem.addActionListener(this);
550	925	if (Globals.ADVANCED)
551	926	{
552	927	// Pretty much the same as duplicate and clone.
..	..	@@ -563,6 +938,84 @@
563	938	buildToolsMenu(menu);
564	939	}
565	940
	941	+ JTabbedPane resourcecontainer;
	942	+ cGridBag currenttab;
	943	+ //boolean added; // patch for jar
	944	+
	945	+ int totalcount = 0;
	946	+
	947	+ int tabcount = 0;
	948	+ int colcount = 0;
	949	+ int rowcount = 0;
	950	+ int texturecount = 0;
	951	+
	952	+ int columns = 5;
	953	+ int rows = 7;
	954	+
	955	+ public void ResourceCallBack(String[] path)
	956	+ {
	957	+// for (int i = 0; i < path.length; i++)
	958	+// System.out.print(path[i] + "/");
	959	+// System.out.println();
	960	+
	961	+ if (//rowcount == 0 \|\|
	962	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	963	+ {
	964	+ currenttab = new cGridBag();
	965	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	966	+ currenttab.setName(tabname);
	967	+ //added = false;
	968	+ resourcecontainer.add(currenttab);
	969	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture " + tabname);
	970	+ rowcount = 1;
	971	+ colcount = 0;
	972	+ texturecount = 0;
	973	+ }
	974	+
	975	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	976	+ {
	977	+ //if (!added)
	978	+ {
	979	+ //added = true;
	980	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	981	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	982	+ }
	983	+
	984	+ columns = 5;
	985	+
	986	+ if (path[0].contains("D&R") \|\| path[0].contains("Paint"))
	987	+ columns = 4;
	988	+
	989	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	990	+ totalcount++;
	991	+
	992	+ if (++colcount >= columns)
	993	+ {
	994	+ colcount = 0;
	995	+ currenttab.Return();
	996	+
	997	+ if (rowcount++ >= rows)
	998	+ {
	999	+ rowcount = 0;
	1000	+ }
	1001	+ }
	1002	+ }
	1003	+ else
	1004	+ {
	1005	+// if (!path[path.length-1].equals("icons"))
	1006	+// resourcecontainer.Return();
	1007	+ }
	1008	+ }
	1009	+
	1010	+ void CreateTexturePanel(cGridBag container)
	1011	+ {
	1012	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1013	+ container.add(resourcecontainer);
	1014	+
	1015	+ Grafreed.ParseResources("textures", this);
	1016	+
	1017	+ // 935. System.out.println("Total = " + totalcount);
	1018	+ }
566	1019
567	1020	void SetupUI2(ObjEditor oe)
568	1021	{
..	..	@@ -581,11 +1034,6 @@
581	1034	//new Exception().printStackTrace();
582	1035
583	1036	oe.radioPanel = new JPanel(new GridBagLayout());
584		- oe.aConstraints.weightx = 1;
585		- oe.aConstraints.weighty = 0;
586		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
587		- oe.aConstraints.gridwidth = 100;
588		- oe.aConstraints.gridheight = 1;
589	1037	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
590	1038
591	1039	oe.buttonGroup = new ButtonGroup();
..	..	@@ -606,9 +1054,9 @@
606	1054	oe.radioPanel.add(dummyButton);
607	1055	oe.buttonGroup.add(dummyButton);
608	1056	*/
609		- cGridBag copyOptionsPanel = new cGridBag();
	1057	+ cGridBag versionManagerPanel = new cGridBag();
610	1058
611		- copyOptionsPanel.preferredHeight = 1;
	1059	+ versionManagerPanel.preferredHeight = 4;
612	1060
613	1061	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
614	1062
..	..	@@ -618,58 +1066,102 @@
618	1066
619	1067	if (Globals.ADVANCED)
620	1068	{
621		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
622		- maxButton.setToolTipText("Maximize window");
623		- maxButton.addActionListener(this);
	1069	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1070	+// maxButton.setToolTipText("Maximize window");
	1071	+// maxButton.addActionListener(this);
624	1072	}
625	1073
626		- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
627		- fullButton.setToolTipText("Full-screen window");
628		- fullButton.addActionListener(this);
	1074	+ cButton gcButton;
629	1075
630		- oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1076	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+// gcButton.setToolTipText("Garbage collect");
	1078	+// gcButton.addActionListener(new ActionListener()
	1079	+// {
	1080	+// public void actionPerformed(ActionEvent e)
	1081	+// {
	1082	+// System.gc();
	1083	+// }
	1084	+// });
	1085	+
	1086	+ oe.toolbarPanel.add(fullScreenButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1087	+ fullScreenButton.setToolTipText("Full-screen window");
	1088	+ fullScreenButton.addActionListener(this);
	1089	+
	1090	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1091	+ collapseButton.setToolTipText("Collapse toolbar");
	1092	+ collapseButton.addActionListener(this);
	1093	+
	1094	+// oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1095	+// maximize3DButton.setToolTipText("Maximize 3D view");
	1096	+// maximize3DButton.addActionListener(this);
	1097	+
	1098	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1099	+ twoButton.setToolTipText("Show 3D view only");
	1100	+ twoButton.addActionListener(this);
	1101	+ this.fullscreenLayout = twoButton;
	1102	+
	1103	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1104	+ threeButton.setToolTipText("Show controls and 3D view");
	1105	+ threeButton.addActionListener(this);
	1106	+ if (Globals.ADVANCED)
	1107	+ {
	1108	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1109	+ sixButton.setToolTipText("Show 3D view and controls");
	1110	+ sixButton.addActionListener(this);
	1111	+ }
	1112	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1113	+// sevenButton.setToolTipText("3-column layout");
	1114	+// sevenButton.addActionListener(this);
	1115	+ //
	1116	+
	1117	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
631	1118	screenfitButton.setToolTipText("Screen fit");
632	1119	screenfitButton.addActionListener(this);
633	1120
634		- oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1121	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
635	1122	restoreCameraButton.setToolTipText("Restore viewpoint");
636	1123	restoreCameraButton.addActionListener(this);
637	1124
638		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
639		- saveButton.setToolTipText("New version");
640		- saveButton.addActionListener(this);
	1125	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1126	+ saveVersionButton.setToolTipText("Duplicate current version");
	1127	+ saveVersionButton.addActionListener(this);
641	1128
642		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
643		- undoButton.setToolTipText("Previous version");
644		- undoButton.addActionListener(this);
645		- undoButton.setEnabled(false);
	1129	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ deleteVersionButton.setToolTipText("Delete current version");
	1131	+ deleteVersionButton.addActionListener(this);
	1132	+ deleteVersionButton.setEnabled(false);
	1133	+
	1134	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1135	+ previousVersionButton.setToolTipText("Previous version");
	1136	+ previousVersionButton.addActionListener(this);
	1137	+ previousVersionButton.setEnabled(false);
646	1138
647	1139	cGridBag updown = new cGridBag().setVertical(true);
648		- updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
649		- restoreButton.setToolTipText("Restore current");
	1140	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1141	+ restoreButton.setToolTipText("Undo (restore current version)");
650	1142	restoreButton.addActionListener(this);
651	1143	restoreButton.setEnabled(false);
652	1144
653		- updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654		- replaceButton.setToolTipText("Replace current");
	1145	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1146	+ replaceButton.setToolTipText("Save (replace current version)");
655	1147	replaceButton.addActionListener(this);
656	1148	replaceButton.setEnabled(false);
657	1149
658		- copyOptionsPanel.add(updown);
	1150	+ versionManagerPanel.add(updown);
659	1151
660		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
661		- redoButton.setToolTipText("Next version");
662		- redoButton.addActionListener(this);
663		- redoButton.setEnabled(false);
	1152	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1153	+ nextVersionButton.setToolTipText("Next version");
	1154	+ nextVersionButton.addActionListener(this);
	1155	+ nextVersionButton.setEnabled(false);
	1156	+
	1157	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1158	+ oneStepButton.setToolTipText("Animate one step forward");
	1159	+ oneStepButton.addActionListener(this);
664	1160
665	1161	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
666	1162	liveCB.setToolTipText("Enable animation");
667	1163	liveCB.addItemListener(this);
668	1164
669		- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
670		- oneStepButton.setToolTipText("Animate one step forward");
671		- oneStepButton.addActionListener(this);
672		-
673	1165	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
674	1166	fastCB.setToolTipText("Fast mode");
675	1167	fastCB.addItemListener(this);
..	..	@@ -685,143 +1177,139 @@
685	1177
686	1178	if (Globals.ADVANCED)
687	1179	{
688		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
689	1181	snapobjectButton.addActionListener(this);
690	1182	snapobjectButton.setToolTipText("Snap Object");
691	1183
692		- oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1184	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
693	1185	fourButton.addActionListener(this);
694	1186	fourButton.setToolTipText("Show control panel only");
695	1187	}
696	1188
697	1189	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
698	1190
699		- oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
700		- twoButton.setToolTipText("Show 3D view only");
701		- twoButton.addActionListener(this);
702		- this.fullscreenLayout = twoButton;
703		-
704		- oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
705		- threeButton.setToolTipText("Show controls and 3D view");
706		- threeButton.addActionListener(this);
707		- oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
708		- sixButton.setToolTipText("Show 3D view and controls");
709		- sixButton.addActionListener(this);
710		-// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
711		-// sevenButton.setToolTipText("3-column layout");
712		-// sevenButton.addActionListener(this);
713		- //
714	1191
715		- oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1192	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
716	1193	rootButton.setToolTipText("Open selection in new tab");
717	1194	rootButton.addActionListener(this);
718	1195
719		- oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1196	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
720	1197	closeButton.setToolTipText("Close tab");
721	1198	closeButton.addActionListener(this);
722	1199	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
723	1200	//clearButton.addActionListener(this);
724	1201
	1202	+ cGridBag row1 = new cGridBag();
	1203	+ row1.preferredHeight = 8;
	1204	+
725	1205	// INSERT
726		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
727		- gridButton.setToolTipText("Create grid");
	1206	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ gridButton.setToolTipText("Create ground");
728	1208	gridButton.addActionListener(this);
729	1209
730		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
731	1211	boxButton.setToolTipText("Create box");
732	1212	boxButton.addActionListener(this);
733	1213
734		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
735		- sphereButton.setToolTipText("Create sphere");
736		- sphereButton.addActionListener(this);
737		-
738		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
739		- coneButton.setToolTipText("Create cone");
740		- coneButton.addActionListener(this);
741		-
742		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
743		- torusButton.setToolTipText("Create torus");
744		- torusButton.addActionListener(this);
745		-
746		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1214	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
747	1215	superButton.setToolTipText("Create superellipsoid");
748	1216	superButton.addActionListener(this);
749	1217
750		- if (Globals.ADVANCED)
	1218	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1219	+ sphereButton.setToolTipText("Create sphere");
	1220	+ sphereButton.addActionListener(this);
	1221	+
	1222	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1223	+ coneButton.setToolTipText("Create cone");
	1224	+ coneButton.addActionListener(this);
	1225	+
	1226	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1227	+ torusButton.setToolTipText("Create torus");
	1228	+ torusButton.addActionListener(this);
	1229	+
	1230	+ if (false) //Globals.ADVANCED)
751	1231	{
752		- oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1232	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
753	1233	kleinButton.setToolTipText("Create Klein bottle");
754	1234	kleinButton.addActionListener(this);
755	1235	}
756	1236
757		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
758	1238	particlesButton.setToolTipText("Create particle system");
759	1239	particlesButton.addActionListener(this);
760	1240
761		- oe.toolboxPanel.Return();
	1241	+ oe.toolboxPanel.add(row1);
762	1242
763		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1243	+ cGridBag row2 = new cGridBag();
	1244	+ row2.preferredHeight = 8;
	1245	+
	1246	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
764	1247	groupButton.setToolTipText("Create group");
765	1248	groupButton.addActionListener(this);
766	1249
767		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1250	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
768	1251	compositeButton.setToolTipText("Create composite");
769	1252	compositeButton.addActionListener(this);
770	1253
771		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1254	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
772	1255	switchButton.setToolTipText("Create item switcher");
773	1256	switchButton.addActionListener(this);
774	1257
775		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1258	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
776	1259	loopButton.setToolTipText("Create loop");
777	1260	loopButton.addActionListener(this);
778	1261
779		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1262	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
780	1263	textureButton.setToolTipText("Create texture");
781	1264	textureButton.addActionListener(this);
782	1265
783		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1266	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
784	1267	overlayButton.setToolTipText("Create overlay");
785	1268	overlayButton.addActionListener(this);
786	1269
787		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1270	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
788	1271	lightButton.setToolTipText("Create light");
789	1272	lightButton.addActionListener(this);
790	1273
791		- for (int i=6; --i>=0;)
792		- {
793		- oe.toolboxPanel.Return();
794		- oe.toolboxPanel.add(new cGridBag());
795		- oe.toolboxPanel.add(new cGridBag());
796		- oe.toolboxPanel.add(new cGridBag());
797		- oe.toolboxPanel.add(new cGridBag());
798		- oe.toolboxPanel.add(new cGridBag());
799		- oe.toolboxPanel.add(new cGridBag());
800		- oe.toolboxPanel.add(new cGridBag());
801		- }
	1274	+ oe.toolboxPanel.add(row2);
	1275	+
	1276	+ cGridBag textures = new cGridBag();
	1277	+
	1278	+ CreateTexturePanel(textures);
	1279	+
	1280	+ int tabCount = resourcecontainer.getTabCount();
	1281	+
	1282	+ if (tabCount > 0)
	1283	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1284	+
	1285	+ oe.toolboxPanel.add(textures);
	1286	+
	1287	+ textures.preferredHeight = 100;
	1288	+
	1289	+ CreateSkyboxPanel(oe.skyboxPanel);
802	1290
803	1291	// EDIT panel
804		- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1292	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
805	1293	editButton.setToolTipText("Pin selection controls");
806	1294	editButton.addActionListener(this);
807	1295
808		- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
809		- uneditButton.setToolTipText("Remove selection controls");
	1296	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1297	+ uneditButton.setToolTipText("Unpin and remove selection controls");
810	1298	uneditButton.addActionListener(this);
811	1299
812	1300	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
813		- allParamsButton.setToolTipText("Show all controle");
	1301	+ allParamsButton.setToolTipText("Show all controls");
814	1302	allParamsButton.addActionListener(this);
815	1303
816		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
817		- clearPanelButton.setToolTipText("Clear edit panel");
	1304	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1305	+ clearPanelButton.setToolTipText("Clear all controls");
818	1306	clearPanelButton.addActionListener(this);
819	1307
820		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
821		- unselectButton.setToolTipText("Unselect");
822		- unselectButton.addActionListener(this);
	1308	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1309	+ //unselectButton.setToolTipText("Unselect");
	1310	+ //unselectButton.addActionListener(this);
823	1311
824		- editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1312	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
825	1313	flashSelectionButton.setToolTipText("Highlight selection");
826	1314	flashSelectionButton.addActionListener(this);
827	1315
..	..	@@ -844,6 +1332,8 @@
844	1332
845	1333	cGridBag jSPPanel = new cGridBag();
846	1334
	1335	+ jSPPanel.preferredHeight = 20;
	1336	+
847	1337	JScrollPane jSP;
848	1338	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
849	1339	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -852,14 +1342,15 @@
852	1342	oe.treePanel.add(jSPPanel);
853	1343	oe.treePanel.Return();
854	1344
855		- oe.treePanel.add(copyOptionsPanel);
	1345	+ oe.treePanel.add(versionManagerPanel);
856	1346	oe.treePanel.Return();
857		- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
858		- versionSlider = (cNumberSlider)sliderPane.getComponent(1);
859		- sliderPane.preferredHeight = 1;
860	1347
861		-// mainPanel.setDividerLocation(0.5); //1.0);
862		-// mainPanel.setResizeWeight(0.5);
	1348	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1349	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1350	+ versionSliderPane.preferredHeight = 3;
	1351	+
	1352	+// mainPanel.setDividerLocation(0.1); //1.0);
	1353	+ mainPanel.setResizeWeight(0.4);
863	1354
864	1355	//jList.addListSelectionListener(this);
865	1356	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -867,7 +1358,7 @@
867	1358	//jTree.setEditable(true);
868	1359	oe.jTree.setDragEnabled(true);
869	1360	//jTree.setPreferredSize(new Dimension(10,10));
870		- jSP.setPreferredSize(new Dimension(100,200));
	1361	+ //jSP.setPreferredSize(new Dimension(100,200));
871	1362
872	1363	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
873	1364
..	..	@@ -879,7 +1370,7 @@
879	1370	dgr.addDragGestureListener(this);
880	1371	}catch(Exception e) {}
881	1372	*/
882		- radio.layout = sixButton; // sevenButton;
	1373	+ radio.layout = threeButton; // sixButton;
883	1374	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
884	1375	}
885	1376
..	..	@@ -913,7 +1404,7 @@
913	1404	// supportCB.setToolTipText("Enable rigging");
914	1405	// supportCB.addItemListener(this);
915	1406
916		- panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1407	+ panel.add(freezeCB = new cCheckBox("Fast cam", Globals.FREEZEONMOVE)); //, constraints);
917	1408	freezeCB.setToolTipText("Fast moving camera");
918	1409	freezeCB.addItemListener(this);
919	1410
..	..	@@ -922,42 +1413,44 @@
922	1413
923	1414	panel.Return();
924	1415
	1416	+ if (Globals.ADVANCED)
	1417	+ {
925	1418	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
926	1419	crowdCB.setToolTipText("Used for crowds");
927	1420	crowdCB.addItemListener(this);
	1421	+ }
928	1422
929	1423	panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
930	1424	smoothCB.setToolTipText("Snapping delay");
931	1425	smoothCB.addItemListener(this);
932	1426
933		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
934		- slowCB.setToolTipText("Smooth interpolation");
935		- slowCB.addItemListener(this);
	1427	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1428	+// slowCB.setToolTipText("Smooth interpolation");
	1429	+// slowCB.addItemListener(this);
	1430	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1431	+ minshaderCB.setToolTipText("Minimal fast shader");
	1432	+ minshaderCB.addItemListener(this);
936	1433
937		-// constraints.gridy += 1;
938	1434	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
939	1435	// speakerMocapCB.addItemListener(this);
940	1436
941		- panel.Return();
942		-
943	1437	if (false)
944	1438	{
945	1439	// handled in scripts
946		- //constraints.gridy += 1;
947	1440	panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
948	1441	speakerCameraCB.addItemListener(this);
949	1442
950		- //constraints.gridy += 1;
951	1443	panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
952	1444	speakerFocusCB.addItemListener(this);
953	1445
954		- //constraints.gridy += 1;
955		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
956		- smoothfocusCB.addItemListener(this);
957	1446	panel.Return();
958	1447	}
959	1448
960		-//constraints.gridx += 1;
	1449	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1450	+ smoothfocusCB.addItemListener(this);
	1451	+
	1452	+ panel.Return();
	1453	+
961	1454	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
962	1455	// debugCB.addItemListener(this);
963	1456
..	..	@@ -1011,6 +1504,14 @@
1011	1504
1012	1505	void EditObject(Object3D obj)
1013	1506	{
	1507	+ //assert(obj instanceof Composite);
	1508	+
	1509	+// if (obj.versionlist == null)
	1510	+// {
	1511	+// obj.versionlist = new Object3D[100];
	1512	+// obj.versionindex = -1;
	1513	+// }
	1514	+
1014	1515	cRadio radioButton = new cRadio(obj.name);
1015	1516
1016	1517	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1021,7 +1522,7 @@
1021	1522	}
1022	1523
1023	1524	radioButton.SetObject(obj);
1024		- radioButton.layout = sixButton; // sevenButton;
	1525	+ radioButton.layout = threeButton; // sixButton;
1025	1526	radioButton.SetCamera(cameraView.renderCamera, false);
1026	1527	radioButton.addActionListener(this);
1027	1528	radioPanel.add(radioButton);
..	..	@@ -1035,6 +1536,7 @@
1035	1536
1036	1537	oe.SetupViews();
1037	1538
	1539	+ if (Globals.DEBUG)
1038	1540	System.out.println("SetupViews");
1039	1541	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1040	1542	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1046,6 +1548,8 @@
1046	1548	cCheckBox localCB;
1047	1549	cCheckBox crowdCB;
1048	1550	cCheckBox smoothCB;
	1551	+ cCheckBox minshaderCB;
	1552	+
1049	1553	cToggleButton fastCB;
1050	1554	cCheckBox slowCB;
1051	1555	cCheckBox boxCB;
..	..	@@ -1116,6 +1620,12 @@
1116	1620	{
1117	1621	cameraView.ToggleInertia();
1118	1622	cameraView.repaint();
	1623	+ }
	1624	+ else if(e.getSource() == minshaderCB)
	1625	+ {
	1626	+ Globals.MINSHADER ^= true;
	1627	+ cameraView.programInitialized = false;
	1628	+ cameraView.repaint();
1119	1629	}
1120	1630	else if(e.getSource() == localCB)
1121	1631	{
..	..	@@ -1393,7 +1903,12 @@
1393	1903	TreePath path;
1394	1904
1395	1905	public TransferableTreePath(TreePath tp) {
1396		- path = tp;
	1906	+ Object[] objs = new Object[tp.getPathCount()];
	1907	+ for (int i=0; i<objs.length; i++)
	1908	+ {
	1909	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1910	+ }
	1911	+ path = new TreePath(objs);
1397	1912	}
1398	1913
1399	1914	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1574,7 +2089,7 @@
1574	2089	Object3D obj = (Object3D)group.selection.elementAt(0);
1575	2090	objEditor.ScreenFit(obj, false);
1576	2091
1577		- cameraView.pingthread.StepToTarget(true);
	2092	+ cameraView.pingthread.StepToTarget(); //true);
1578	2093	refreshContents();
1579	2094	}
1580	2095
..	..	@@ -1611,7 +2126,7 @@
1611	2126	obj.parent.TransformToWorld(maxima); //, maxima);
1612	2127	}
1613	2128
1614		- Object3D shadow = new Object3D("Shadow " + obj.name);
	2129	+ Object3D shadow = new Object3D("Shadow" + obj.name);
1615	2130
1616	2131	shadow.toParent = LA.newMatrix();
1617	2132	shadow.fromParent = LA.newMatrix();
..	..	@@ -1625,24 +2140,24 @@
1625	2140	switch(axis)
1626	2141	{
1627	2142	case 0 :
1628		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1629		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1630		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1631		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2143	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2144	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2145	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2146	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
1632	2147	norm = cVector.X;
1633	2148	break;
1634	2149	case 1 :
1635		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1636		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1637		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1638		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2150	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2151	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2152	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2153	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
1639	2154	norm = cVector.Y;
1640	2155	break;
1641	2156	case 2 :
1642		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1643		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1644		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1645		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2157	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2158	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2159	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2160	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
1646	2161	norm = cVector.Z;
1647	2162	break;
1648	2163	}
..	..	@@ -1683,7 +2198,11 @@
1683	2198	shadow.material = new cMaterial(obj.material);
1684	2199	shadow.material.diffuse = 0.0001f;
1685	2200	shadow.material.specular = 0.0001f;
1686		- //shadow.projectedVertices[1].x = 300;
	2201	+ shadow.material.opacity = 0.75f;
	2202	+
	2203	+ AllocProjectedVertices(shadow);
	2204	+
	2205	+ shadow.projectedVertices[1].x = 300;
1687	2206
1688	2207	makeSomething(shadow);
1689	2208	}
..	..	@@ -2139,6 +2658,23 @@
2139	2658	{
2140	2659	makeSomething(new Light());
2141	2660	} else
	2661	+// if (source == skybox1Button \|\|
	2662	+// source == skybox2Button \|\|
	2663	+// source == skybox3Button \|\|
	2664	+// source == skybox4Button \|\|
	2665	+// source == skybox5Button \|\|
	2666	+// source == skybox6Button \|\|
	2667	+// source == skybox7Button \|\|
	2668	+// source == skybox11Button \|\|
	2669	+// source == skybox12Button \|\|
	2670	+// source == skybox13Button \|\|
	2671	+// source == skybox14Button \|\|
	2672	+// source == skybox15Button \|\|
	2673	+// source == skybox16Button \|\|
	2674	+// source == skybox17Button)
	2675	+// {
	2676	+// ChangeSkybox(source);
	2677	+// } else
2142	2678	if (source == csgItem)
2143	2679	{
2144	2680	group(new CSG());
..	..	@@ -2187,27 +2723,35 @@
2187	2723	} else
2188	2724	if (source == loopItem \|\| source == loopButton)
2189	2725	{
	2726	+ if (!group.selection.isEmpty())
	2727	+ {
2190	2728	Composite csg = new GroupLeaf();
2191		- csg.count = 5;
2192	2729	group(csg);
	2730	+ csg.count = 5;
2193	2731	Composite child = new cGroup("Branch");
2194	2732	csg.addChild(child);
2195	2733	child.addChild(csg);
	2734	+ }
2196	2735	} else
2197	2736	if (source == doubleItem)
2198	2737	{
	2738	+ if (!group.selection.isEmpty())
	2739	+ {
2199	2740	Composite csg = new GroupLeaf("Fork");
2200		- csg.count = 5;
2201	2741	group(csg);
	2742	+ csg.count = 5;
2202	2743	Composite child = new cGroup("Branch A");
2203	2744	csg.addChild(child);
2204	2745	child.addChild(csg);
2205	2746	child = new cGroup("Branch B");
2206	2747	csg.addChild(child);
2207	2748	child.addChild(csg);
	2749	+ }
2208	2750	} else
2209	2751	if (source == tripleItem)
2210	2752	{
	2753	+ if (!group.selection.isEmpty())
	2754	+ {
2211	2755	Composite csg = new GroupLeaf("Trident");
2212	2756	csg.count = 4;
2213	2757	group(csg);
..	..	@@ -2220,11 +2764,12 @@
2220	2764	child = new cGroup();
2221	2765	csg.addChild(child);
2222	2766	child.addChild(csg);
	2767	+ }
2223	2768	} else
2224	2769	if (source == computeAOItem)
2225	2770	{
2226	2771	Globals.drawMode = CameraPane.OCCLUSION;
2227		- Globals.theRenderer.repaint();
	2772	+ cameraView.repaint();
2228	2773	} else
2229	2774	if (source == recompileItem)
2230	2775	{
..	..	@@ -2239,7 +2784,7 @@
2239	2784	if (source == invariantsItem)
2240	2785	{
2241	2786	System.out.println("Invariants:");
2242		- Grafreed.grafreeD.universe.invariants();
	2787	+ Grafreed.grafreed.universe.invariants();
2243	2788	} else
2244	2789	if (source == memoryItem)
2245	2790	{
..	..	@@ -2266,37 +2811,56 @@
2266	2811	{
2267	2812	Maximize();
2268	2813	} else
2269		- if (source == fullButton)
	2814	+ if (source == fullScreenButton)
2270	2815	{
2271	2816	ToggleFullScreen();
2272	2817	} else
2273		- if (source == undoButton)
	2818	+ if (source == collapseButton)
	2819	+ {
	2820	+ this.expandedLayout = radio.layout;
	2821	+ CollapseToolbar();
	2822	+ } else
	2823	+// if (source == maximize3DButton)
	2824	+// {
	2825	+// this.expandedLayout = radio.layout;
	2826	+// radio.layout = twoButton;
	2827	+// CollapseToolbar();
	2828	+// Show3DView();
	2829	+// } else
	2830	+ if (source == previousVersionButton)
2274	2831	{
2275	2832	// Go to previous version
2276	2833	//if (!Undo())
2277	2834	//java.awt.Toolkit.getDefaultToolkit().beep();
2278		- Undo();
	2835	+ PreviousVersion();
2279	2836	} else
2280	2837	if (source == restoreButton)
2281	2838	{
2282	2839	// Restore current version
2283	2840	Restore();
	2841	+ //restoreButton.setEnabled(false);
2284	2842	} else
2285	2843	if (source == replaceButton)
2286	2844	{
2287	2845	// Overwrite current version
2288	2846	Replace();
	2847	+ //replaceButton.setEnabled(false);
2289	2848	} else
2290		- if (source == redoButton)
	2849	+ if (source == nextVersionButton)
2291	2850	{
2292	2851	// Go to next version
2293		- Redo();
	2852	+ NextVersion();
2294	2853	} else
2295		- if (source == saveButton)
	2854	+ if (source == saveVersionButton)
2296	2855	{
2297	2856	// Save a new version
2298		- if (!Save(true))
	2857	+ if (!DuplicateVersion()) //true))
2299	2858	java.awt.Toolkit.getDefaultToolkit().beep();
	2859	+ } else
	2860	+ if (source == deleteVersionButton)
	2861	+ {
	2862	+ // Delete a new version
	2863	+ DeleteVersion();
2300	2864	} else
2301	2865	if (source == oneStepButton)
2302	2866	{
..	..	@@ -2351,11 +2915,11 @@
2351	2915	} else
2352	2916	if (source == undoItem)
2353	2917	{
2354		- Undo();
	2918	+ PreviousVersion();
2355	2919	} else
2356	2920	if (source == redoItem)
2357	2921	{
2358		- Redo();
	2922	+ NextVersion();
2359	2923	} else
2360	2924	if (source == duplicateItem)
2361	2925	{
..	..	@@ -2836,22 +3400,34 @@
2836	3400	} else
2837	3401	if (source == ungroupItem \|\| source == ungroupButton)
2838	3402	{
2839		- boolean hasRoot = false;
	3403	+ boolean canUngroup = true;
2840	3404
2841	3405	for (int i=0; i<group.selection.size(); i++)
2842	3406	{
2843		- if (group.selection.get(i) == group)
	3407	+ Object3D selectedItem = group.selection.get(i);
	3408	+
	3409	+ if (selectedItem.Size() == 0)
2844	3410	{
2845		- hasRoot = true;
	3411	+ // Cannot ungroup leaves
	3412	+ canUngroup = false;
	3413	+ break;
	3414	+ }
	3415	+
	3416	+ if (selectedItem == group)
	3417	+ {
	3418	+ // Cannot ungroup root
	3419	+ canUngroup = false;
2846	3420	break;
2847	3421	}
2848	3422	}
2849	3423
2850		- if (!hasRoot)
	3424	+ if (canUngroup)
2851	3425	{
2852	3426	for (int i=0; i<group.selection.size(); i++)
2853	3427	{
2854		- Ungroup(group.selection.get(i));
	3428	+ Object3D selectedItem = group.selection.get(i);
	3429	+
	3430	+ Ungroup(selectedItem);
2855	3431	}
2856	3432
2857	3433	ClearSelection(false);
..	..	@@ -2902,6 +3478,10 @@
2902	3478	if (source == clearMaterialsItem)
2903	3479	{
2904	3480	ClearMaterials();
	3481	+ } else
	3482	+ if (source == clearVersionsItem)
	3483	+ {
	3484	+ ClearVersions();
2905	3485	} else
2906	3486	if (source == liveleavesItem)
2907	3487	{
..	..	@@ -3042,6 +3622,18 @@
3042	3622	if (source == transformChildrenItem)
3043	3623	{
3044	3624	TransformChildren();
	3625	+ } else
	3626	+ if (source == textureRatioRItem)
	3627	+ {
	3628	+ TextureRatio(0);
	3629	+ } else
	3630	+ if (source == textureRatioGItem)
	3631	+ {
	3632	+ TextureRatio(1);
	3633	+ } else
	3634	+ if (source == textureRatioBItem)
	3635	+ {
	3636	+ TextureRatio(2);
3045	3637	} else
3046	3638	if (source == resetTransformItem)
3047	3639	{
..	..	@@ -3214,38 +3806,7 @@
3214	3806	if (CameraPane.FULLSCREEN)
3215	3807	fullscreenLayout = radio.layout;
3216	3808
3217		- // bug
3218		- //gridPanel.setDividerLocation(1.0);
3219		- //bigPanel.setDividerLocation(0.0);
3220		-// bigThree.remove(scenePanel);
3221		-// bigThree.remove(centralPanel);
3222		-// bigThree.remove(XYZPanel);
3223		-// aWindowConstraints.gridx = 0;
3224		-// aWindowConstraints.gridy = 0;
3225		-// aWindowConstraints.gridwidth = 1;
3226		-// // aConstraints.gridheight = 3;
3227		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3228		-// aWindowConstraints.weightx = 0;
3229		-// aWindowConstraints.weighty = 1;
3230		-// //bigThree.add(jtp, aWindowConstraints);
3231		-// aWindowConstraints.weightx = 1;
3232		-// aWindowConstraints.gridwidth = 3;
3233		-// // aConstraints.gridheight = 3;
3234		-// aWindowConstraints.gridx = 1;
3235		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3236		-// bigThree.add(centralPanel, aWindowConstraints);
3237		-// aWindowConstraints.weightx = 0;
3238		-// aWindowConstraints.gridx = 4;
3239		-// aWindowConstraints.gridwidth = 1;
3240		-// // aConstraints.gridheight = 3;
3241		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3242		-// //bigThree.add(XYZPanel, aWindowConstraints);
3243		-// scenePanel.setVisible(false);
3244		-// centralPanel.setVisible(true);
3245		-// XYZPanel.setVisible(false);
3246		- bigThree.ClearUI();
3247		- bigThree.add(centralPanel);
3248		- bigThree.FlushUI();
	3809	+ Show3DView();
3249	3810
3250	3811	cameraView.requestFocusInWindow();
3251	3812
..	..	@@ -3431,6 +3992,7 @@
3431	3992	} else
3432	3993	if (source == rootButton)
3433	3994	{
	3995	+ Replace();
3434	3996	Object3D obj;
3435	3997	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3436	3998	{
..	..	@@ -3445,6 +4007,9 @@
3445	4007	if (source == closeButton)
3446	4008	{
3447	4009	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	4010	+ if (copy.versionlist != null)
	4011	+ Replace();
	4012	+
3448	4013	cRadio ab;
3449	4014	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3450	4015	{
..	..	@@ -3488,10 +4053,10 @@
3488	4053	{
3489	4054	Object3D child = (Object3D)e.nextElement();
3490	4055	if(child.editWindow != null)
3491		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3492	4056	child.pinned = false;
3493	4057	child.CloseUI();
3494	4058	listUI.remove(child);
	4059	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3495	4060
3496	4061	//child.editWindow = null; // ???????????
3497	4062	}
..	..	@@ -3510,6 +4075,7 @@
3510	4075	obj.CloseUI();
3511	4076	}
3512	4077	listUI.clear();
	4078	+ SetPinStates(group.selection.size() > 0);
3513	4079	refreshContents(true);
3514	4080	} else
3515	4081	if (source == allParamsButton)
..	..	@@ -3542,6 +4108,9 @@
3542	4108	} else
3543	4109	if(source instanceof cRadio)
3544	4110	{
	4111	+ if (copy.versionlist != null)
	4112	+ Replace();
	4113	+
3545	4114	group.parent = keepparent;
3546	4115	group.attributes = 0;
3547	4116	//group.editWindow = null;
..	..	@@ -3566,8 +4135,6 @@
3566	4135
3567	4136	copy = group;
3568	4137
3569		- SetUndoStates();
3570		-
3571	4138	//Globals.theRenderer.object = group;
3572	4139	if(!useclient)
3573	4140	{
..	..	@@ -3595,7 +4162,34 @@
3595	4162	*/
3596	4163	radio.layout.doClick();
3597	4164
	4165	+ //assert(copy instanceof Composite);
	4166	+
	4167	+ if (copy.versionlist == null)
	4168	+ {
	4169	+ copy.versionindex = -1;
	4170	+
	4171	+ // Cannot work with loops
	4172	+ // To fix this issue, we first mark all nodes above the root,
	4173	+ // and check if any of these nodes are reachable below the root.
	4174	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4175	+
	4176	+ if (copy instanceof Composite && !copy.HasTags())
	4177	+ {
	4178	+ if (copy.versionlist == null)
	4179	+ copy.versionlist = new Object3D[100];
	4180	+
	4181	+ //Save(true);
	4182	+ }
	4183	+ else
	4184	+ copy.versionindex = -2;
	4185	+
	4186	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4187	+ }
	4188	+
	4189	+ SetVersionStates();
	4190	+
3598	4191	ClearUnpinned();
	4192	+
3599	4193	//Grafreed.Assert(group != null);
3600	4194	//Grafreed.Assert(group.selection != null);
3601	4195	SetPinStates(group.selection == null \|\| group.selection.size() > 0);
..	..	@@ -3612,11 +4206,13 @@
3612	4206	} else if (event.getSource() == editCameraItem)
3613	4207	{
3614	4208	cameraView.ProtectCamera();
	4209	+ cameraView.requestFocusInWindow();
3615	4210	cameraView.repaint();
3616	4211	return;
3617	4212	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3618	4213	{
3619	4214	cameraView.RevertCamera();
	4215	+ cameraView.requestFocusInWindow();
3620	4216	cameraView.repaint();
3621	4217	return;
3622	4218	// } else if (event.getSource() == textureButton)
..	..	@@ -3705,9 +4301,46 @@
3705	4301	refreshContents();
3706	4302	}
3707	4303
	4304	+ void TextureRatio(int axis)
	4305	+ {
	4306	+ Object3D obj;
	4307	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4308	+ {
	4309	+ obj = (Object3D)e.nextElement();
	4310	+ obj.TextureRatio(axis);
	4311	+ }
	4312	+
	4313	+ refreshContents();
	4314	+ }
	4315	+
3708	4316	void ResetTransform()
3709	4317	{
3710	4318	ResetTransform(-1);
	4319	+ }
	4320	+
	4321	+ void ScaleSelection(int scale)
	4322	+ {
	4323	+ Object3D obj;
	4324	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4325	+ {
	4326	+ obj = (Object3D)e.nextElement();
	4327	+
	4328	+ if (obj.toParent == null)
	4329	+ continue;
	4330	+
	4331	+ obj.Scale(scale);
	4332	+
	4333	+ if (obj.parent == null)
	4334	+ {
	4335	+ System.out.println("NULL PARENT!");
	4336	+ // new Exception().printStackTrace();
	4337	+ }
	4338	+ else
	4339	+ TouchTransform(obj);
	4340	+ //obj.parent.Touch();
	4341	+ }
	4342	+
	4343	+ refreshContents();
3711	4344	}
3712	4345
3713	4346	void ResetTransform(int mask)
..	..	@@ -3720,42 +4353,8 @@
3720	4353	if (obj.toParent == null)
3721	4354	continue;
3722	4355
3723		- if (mask == -1)
3724		- {
3725		- if (obj instanceof Camera) // jan 2014
3726		- {
3727		- LA.matIdentity(obj.toParent);
3728		- LA.matIdentity(obj.fromParent);
3729		- }
3730		- else
3731		- {
3732		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
3733		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
3734		- }
3735		- TouchTransform(obj);
3736		- continue;
3737		- }
3738		- if ((mask&2) != 0) // Scale
3739		- {
3740		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3741		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3742		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3743		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3744		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3745		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3746		- }
3747		- if ((mask&4) != 0) // Rotation
3748		- {
3749		- // ?
3750		- }
3751		- if ((mask&1) != 0) // Translation
3752		- {
3753		- if (obj.toParent != null)
3754		- {
3755		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
3756		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
3757		- }
3758		- }
	4356	+ obj.ResetTransform(mask);
	4357	+
3759	4358	if (obj.parent == null)
3760	4359	{
3761	4360	System.out.println("NULL PARENT!");
..	..	@@ -4264,10 +4863,17 @@
4264	4863	{
4265	4864	Object3D obj = group.selection.get(i);
4266	4865
	4866	+ if (obj.toParent == null)
	4867	+ {
	4868	+ obj.toParent = LA.newMatrix();
	4869	+ obj.fromParent = LA.newMatrix();
	4870	+ }
	4871	+
4267	4872	LA.matTranslate(obj.toParent, i * scale, 0, 0);
4268	4873	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
4269	4874	}
4270	4875
	4876	+ Globals.lighttouched = true;
4271	4877	refreshContents();
4272	4878	}
4273	4879
..	..	@@ -4555,6 +5161,12 @@
4555	5161	refreshContents();
4556	5162	}
4557	5163
	5164	+ void ClearVersions()
	5165	+ {
	5166	+ group.selection.ClearVersions();
	5167	+ refreshContents();
	5168	+ }
	5169	+
4558	5170	void FlipV(boolean flip)
4559	5171	{
4560	5172	group.selection.FlipV(flip);
..	..	@@ -4749,9 +5361,7 @@
4749	5361
4750	5362	freezemodel = false;
4751	5363	}
4752		-
4753		- boolean flashIt = true;
4754		-
	5364	+
4755	5365	public void valueChanged(TreeSelectionEvent e)
4756	5366	//public boolean handleEvent(Event event)
4757	5367	{
..	..	@@ -4795,10 +5405,10 @@
4795	5405	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4796	5406	// a camera
4797	5407	{
4798		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5408	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
4799	5409	{
4800	5410	CameraPane.camerachangeframe = 0; // don't refuse it
4801		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5411	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent(), true);
4802	5412	}
4803	5413	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4804	5414	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
..	..	@@ -4824,13 +5434,31 @@
4824	5434	{
4825	5435	editButton.setEnabled(enabled);
4826	5436	uneditButton.setEnabled(enabled);
4827		- unselectButton.setEnabled(enabled);
	5437	+ //unselectButton.setEnabled(enabled);
4828	5438	flashSelectionButton.setEnabled(enabled);
	5439	+
	5440	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5441	+
	5442	+ boolean allComposites = true;
	5443	+
	5444	+ if (group.selection != null)
	5445	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5446	+ {
	5447	+ Object next = e.nextElement();
	5448	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5449	+ {
	5450	+ allComposites = false;
	5451	+ break;
	5452	+ }
	5453	+ }
	5454	+
	5455	+ rootButton.setEnabled(true); // allComposites);
4829	5456	}
4830	5457
4831	5458	void refreshContents(boolean cp)
4832	5459	{
4833		- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5460	+ if (Globals.SHOWINFO)
	5461	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4834	5462	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4835	5463	{
4836	5464	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -4840,7 +5468,7 @@
4840	5468	Object3D child = (Object3D) group.selection.get(i);
4841	5469
4842	5470	objEditor.AddInfo(child, this, true);
4843		- System.err.println("info : " + child.GetPath());
	5471	+// System.err.println("info : " + child.GetPath());
4844	5472	}
4845	5473
4846	5474	objEditor.SetText(); // jan 2014
..	..	@@ -5666,7 +6294,6 @@
5666	6294
5667	6295	cButton restoreCameraButton;
5668	6296
5669		- cButton saveButton;
5670	6297	cButton oneStepButton;
5671	6298
5672	6299	cButton groupButton;
..	..	@@ -5675,6 +6302,22 @@
5675	6302	cButton switchButton;
5676	6303	cButton loopButton;
5677	6304	cButton textureButton;
	6305	+
	6306	+ cButton skybox1Button;
	6307	+ cButton skybox2Button;
	6308	+ cButton skybox3Button;
	6309	+ cButton skybox4Button;
	6310	+ cButton skybox5Button;
	6311	+ cButton skybox6Button;
	6312	+ cButton skybox7Button;
	6313	+
	6314	+ cButton skybox11Button;
	6315	+ cButton skybox12Button;
	6316	+ cButton skybox13Button;
	6317	+ cButton skybox14Button;
	6318	+ cButton skybox15Button;
	6319	+ cButton skybox16Button;
	6320	+ cButton skybox17Button;
5678	6321
5679	6322	cButton gridButton;
5680	6323	cButton boxButton;
..	..	@@ -5708,11 +6351,11 @@
5708	6351	private MenuItem lookAtItem;
5709	6352	private MenuItem lookFromItem;
5710	6353	private MenuItem switchViewItem;
5711		- private MenuItem cutItem;
	6354	+ private JMenuItem cutItem;
5712	6355	private MenuItem undoItem;
5713	6356	private MenuItem redoItem;
5714	6357	private JMenuItem duplicateItem;
5715		- private MenuItem cloneItem;
	6358	+ private JMenuItem cloneItem;
5716	6359	private MenuItem cloneSupportItem;
5717	6360	private MenuItem overwriteGeoItem;
5718	6361	private MenuItem overwriteMatItem;
..	..	@@ -5733,13 +6376,13 @@
5733	6376	private MenuItem cloneGeometriesItem;
5734	6377	private MenuItem shareGeometriesItem;
5735	6378	private MenuItem mergeGeometriesItem;
5736		- private MenuItem copyItem;
	6379	+ private JMenuItem copyItem;
5737	6380	private MenuItem pasteItem;
5738		- private MenuItem pasteIntoItem;
5739		- private MenuItem pasteLinkItem;
5740		- private MenuItem pasteCloneItem;
5741		- private MenuItem pasteExpandItem;
5742		- private MenuItem deleteItem;
	6381	+ private JMenuItem pasteIntoItem;
	6382	+ private JMenuItem pasteLinkItem;
	6383	+ private JMenuItem pasteCloneItem;
	6384	+ private JMenuItem pasteExpandItem;
	6385	+ private JMenuItem deleteItem;
5743	6386	private MenuItem clearAllItem;
5744	6387	private MenuItem genUVItem;
5745	6388	private MenuItem genNormalsMESHItem;
..	..	@@ -5765,6 +6408,7 @@
5765	6408	private MenuItem clipMeshItem;
5766	6409	private MenuItem smoothMeshItem;
5767	6410	private MenuItem clearMaterialsItem;
	6411	+ private MenuItem clearVersionsItem;
5768	6412
5769	6413	private MenuItem liveleavesItem;
5770	6414	private MenuItem unliveleavesItem;
..	..	@@ -5788,13 +6432,16 @@
5788	6432	private MenuItem maxTexturesItem;
5789	6433	private MenuItem panoTexturesItem;
5790	6434
	6435	+ private MenuItem textureRatioRItem;
	6436	+ private MenuItem textureRatioGItem;
	6437	+ private MenuItem textureRatioBItem;
5791	6438	private MenuItem resetCentroidItem;
5792	6439	private MenuItem resetCentroidXZItem;
5793	6440	private MenuItem resetTransformItem;
5794	6441	private MenuItem transformGeometryItem;
5795	6442	private MenuItem transformChildrenItem;
5796	6443	private MenuItem hideItem;
5797		- private MenuItem grabItem;
	6444	+ private JMenuItem grabItem;
5798	6445	private MenuItem backItem;
5799	6446	private MenuItem frontItem;
5800	6447	private MenuItem cameraItem;
..	..	@@ -5807,7 +6454,7 @@
5807	6454	private MenuItem switchTransfoItem;
5808	6455	private MenuItem morphItem;
5809	6456	private MenuItem linkerItem;
5810		- private MenuItem ungroupItem;
	6457	+ private JMenuItem ungroupItem;
5811	6458	private MenuItem editItem;
5812	6459	private MenuItem openWindowItem;
5813	6460	private MenuItem editLeafItem;