~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,6 +405,16 @@
60	405	this.copy = this.group = group;
61	406	//selectees = this.group.selectees;
62	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	+
63	418	if(ui)
64	419	SetupUI(objEditor);
65	420	}
..	..	@@ -80,6 +435,14 @@
80	435	SetupViews(objEditor);
81	436
82	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	+// }
83	446	}
84	447
85	448	void CloneSelection(boolean supports)
..	..	@@ -169,33 +532,35 @@
169	532	// menu.add("-");
170	533	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
171	534	duplicateItem.addActionListener(this);
172		- cloneItem = menu.add(new MenuItem("Clone"));
	535	+
	536	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
173	537	cloneItem.addActionListener(this);
174		- if (Globals.ADVANCED)
	538	+ //if (Globals.ADVANCED)
175	539	{
176	540	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
177	541	cloneSupportItem.addActionListener(this);
178	542	}
	543	+ oe.jTree.popup.addSeparator();
179	544	menu.add("-");
180		- cutItem = menu.add(new MenuItem("Cut"));
	545	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
181	546	cutItem.addActionListener(this);
182		- copyItem = menu.add(new MenuItem("Copy"));
	547	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
183	548	copyItem.addActionListener(this);
184	549	pasteItem = menu.add(new MenuItem("Paste"));
185	550	pasteItem.addActionListener(this);
186	551
187		- menu.add("-");
188		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	552	+ oe.jTree.popup.addSeparator();
	553	+ //menu.add("-");
	554	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
189	555	pasteIntoItem.addActionListener(this);
190		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	556	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
191	557	pasteLinkItem.addActionListener(this);
192		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	558	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
193	559	pasteCloneItem.addActionListener(this);
194		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	560	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
195	561	// pasteExpandItem.addActionListener(this);
196		- menu.add("-");
197		- clearItem = menu.add(new MenuItem("Clear"));
198		- clearItem.addActionListener(this);
	562	+ //menu.add("-");
	563	+ oe.jTree.popup.addSeparator();
199	564
200	565	if (Globals.ADVANCED)
201	566	{
..	..	@@ -281,11 +646,9 @@
281	646	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
282	647	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
283	648	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
284		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
285	649	oe.cameraMenu.add("-");
286	650	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
287	651	openWindowItem.addActionListener(this);
288		- editLeafItem.addActionListener(this);
289	652	lookAtItem.addActionListener(this);
290	653	//lookFromItem.addActinoListener(this);
291	654	//switchViewItem.addActionListener(this);
..	..	@@ -332,9 +695,8 @@
332	695	setMasterItem.addActionListener(this);
333	696	}
334	697
335		- oe.menuBar.add(menu = new Menu("Group"));
336		-// grabItem = menu.add(new MenuItem("Grab"));
337		-// grabItem.addActionListener(this);
	698	+ oe.menuBar.add(menu = new Menu("Order"));
	699	+
338	700	backItem = menu.add(new MenuItem("Back"));
339	701	backItem.addActionListener(this);
340	702	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -342,13 +704,21 @@
342	704	// compositeItem = menu.add(new MenuItem("Composite"));
343	705	// compositeItem.addActionListener(this);
344	706
	707	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	708	+ grabItem.addActionListener(this);
	709	+
345	710	if (Globals.ADVANCED)
346	711	{
347	712	hideItem = menu.add(new MenuItem("Hidden Group"));
348	713	hideItem.addActionListener(this);
349	714	}
350		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	715	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
351	716	ungroupItem.addActionListener(this);
	717	+
	718	+ oe.jTree.popup.addSeparator();
	719	+
	720	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	721	+ deleteItem.addActionListener(this);
352	722
353	723	// menu.add("-");
354	724	//
..	..	@@ -385,9 +755,9 @@
385	755	shadowYItem.addActionListener(this);
386	756	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
387	757	shadowZItem.addActionListener(this);
	758	+
388	759	attributeItem = menu.add(new MenuItem("Attribute"));
389	760	attributeItem.addActionListener(this);
390		-
391	761	if (Globals.ADVANCED)
392	762	{
393	763	menu.add("-");
..	..	@@ -399,11 +769,18 @@
399	769	pointflowItem.addActionListener(this);
400	770	}
401	771	menu.add("-");
	772	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	773	+ textureRatioRItem.addActionListener(this);
	774	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	775	+ textureRatioGItem.addActionListener(this);
	776	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	777	+ textureRatioBItem.addActionListener(this);
	778	+ menu.add("-");
402	779	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
403	780	resetTransformItem.addActionListener(this);
404	781	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
405	782	resetCentroidItem.addActionListener(this);
406		- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	783	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
407	784	resetCentroidXZItem.addActionListener(this);
408	785	transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
409	786	transformGeometryItem.addActionListener(this);
..	..	@@ -421,7 +798,7 @@
421	798	genNormalsMESHItem.addActionListener(this);
422	799	if (Globals.ADVANCED)
423	800	{
424		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	801	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
425	802	genNormalsMINEItem.addActionListener(this);
426	803	}
427	804	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -455,6 +832,8 @@
455	832	}
456	833
457	834	oe.menuBar.add(menu = new Menu("Attributes"));
	835	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	836	+ clearVersionsItem.addActionListener(this);
458	837	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
459	838	clearMaterialsItem.addActionListener(this);
460	839	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -477,9 +856,9 @@
477	856	hideleavesItem.addActionListener(this);
478	857	showleavesItem = menu.add(new MenuItem("Show Leaves"));
479	858	showleavesItem.addActionListener(this);
480		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	859	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
481	860	markleavesItem.addActionListener(this);
482		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	861	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
483	862	unmarkleavesItem.addActionListener(this);
484	863	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
485	864	rewindleavesItem.addActionListener(this);
..	..	@@ -514,10 +893,15 @@
514	893	attachBumpItem.addActionListener(this);
515	894	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
516	895	pigmentBumpItem.addActionListener(this);
	896	+ //embedTexturesItem
517	897	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
518	898	detachPigmentItem.addActionListener(this);
519	899	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
520	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);
521	905	menu.add("-");
522	906	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
523	907	sortbysizeItem.addActionListener(this);
..	..	@@ -528,6 +912,9 @@
528	912	shareGeometriesItem.addActionListener(this);
529	913	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
530	914	mergeGeometriesItem.addActionListener(this);
	915	+ menu.add("-");
	916	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	917	+ editLeafItem.addActionListener(this);
531	918	if (Globals.ADVANCED)
532	919	{
533	920	// Pretty much the same as duplicate and clone.
..	..	@@ -544,6 +931,79 @@
544	931	buildToolsMenu(menu);
545	932	}
546	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	+ }
547	1007
548	1008	void SetupUI2(ObjEditor oe)
549	1009	{
..	..	@@ -562,11 +1022,6 @@
562	1022	//new Exception().printStackTrace();
563	1023
564	1024	oe.radioPanel = new JPanel(new GridBagLayout());
565		- oe.aConstraints.weightx = 1;
566		- oe.aConstraints.weighty = 0;
567		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
568		- oe.aConstraints.gridwidth = 100;
569		- oe.aConstraints.gridheight = 1;
570	1025	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
571	1026
572	1027	oe.buttonGroup = new ButtonGroup();
..	..	@@ -587,9 +1042,9 @@
587	1042	oe.radioPanel.add(dummyButton);
588	1043	oe.buttonGroup.add(dummyButton);
589	1044	*/
590		- cGridBag copyOptionsPanel = new cGridBag();
	1045	+ cGridBag versionManagerPanel = new cGridBag();
591	1046
592		- copyOptionsPanel.preferredHeight = 1;
	1047	+ versionManagerPanel.preferredHeight = 4;
593	1048
594	1049	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
595	1050
..	..	@@ -599,58 +1054,102 @@
599	1054
600	1055	if (Globals.ADVANCED)
601	1056	{
602		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603		- maxButton.setToolTipText("Maximize window");
604		- maxButton.addActionListener(this);
	1057	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+// maxButton.setToolTipText("Maximize window");
	1059	+// maxButton.addActionListener(this);
605	1060	}
606	1061
607		- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608		- fullButton.setToolTipText("Full-screen window");
609		- fullButton.addActionListener(this);
	1062	+ cButton gcButton;
610	1063
611		- oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	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);
612	1106	screenfitButton.setToolTipText("Screen fit");
613	1107	screenfitButton.addActionListener(this);
614	1108
615		- oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1109	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
616	1110	restoreCameraButton.setToolTipText("Restore viewpoint");
617	1111	restoreCameraButton.addActionListener(this);
618	1112
619		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620		- saveButton.setToolTipText("New version");
621		- saveButton.addActionListener(this);
	1113	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1114	+ saveVersionButton.setToolTipText("Duplicate current version");
	1115	+ saveVersionButton.addActionListener(this);
622	1116
623		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624		- undoButton.setToolTipText("Previous version");
625		- undoButton.addActionListener(this);
626		- undoButton.setEnabled(false);
	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);
627	1126
628	1127	cGridBag updown = new cGridBag().setVertical(true);
629		- updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
630		- restoreButton.setToolTipText("Restore current");
	1128	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ restoreButton.setToolTipText("Undo (restore current version)");
631	1130	restoreButton.addActionListener(this);
632	1131	restoreButton.setEnabled(false);
633	1132
634		- updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
635		- replaceButton.setToolTipText("Replace current");
	1133	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1134	+ replaceButton.setToolTipText("Save (replace current version)");
636	1135	replaceButton.addActionListener(this);
637	1136	replaceButton.setEnabled(false);
638	1137
639		- copyOptionsPanel.add(updown);
	1138	+ versionManagerPanel.add(updown);
640	1139
641		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642		- redoButton.setToolTipText("Next version");
643		- redoButton.addActionListener(this);
644		- redoButton.setEnabled(false);
	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);
645	1148
646	1149	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
647	1150	liveCB.setToolTipText("Enable animation");
648	1151	liveCB.addItemListener(this);
649	1152
650		- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
651		- oneStepButton.setToolTipText("Animate one step forward");
652		- oneStepButton.addActionListener(this);
653		-
654	1153	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
655	1154	fastCB.setToolTipText("Fast mode");
656	1155	fastCB.addItemListener(this);
..	..	@@ -666,142 +1165,137 @@
666	1165
667	1166	if (Globals.ADVANCED)
668	1167	{
669		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1168	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
670	1169	snapobjectButton.addActionListener(this);
671	1170	snapobjectButton.setToolTipText("Snap Object");
	1171	+
	1172	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1173	+ fourButton.addActionListener(this);
	1174	+ fourButton.setToolTipText("Show control panel only");
672	1175	}
673	1176
674	1177	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
675	1178
676		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
677		- twoButton.setToolTipText("Show center view only");
678		- twoButton.addActionListener(this);
679		- this.fullscreenLayout = twoButton;
680		-
681		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682		- fourButton.addActionListener(this);
683		- fourButton.setToolTipText("Show left panel only");
684		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
685		- sixButton.setToolTipText("2-column layout left");
686		- sixButton.addActionListener(this);
687		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
688		- threeButton.setToolTipText("2-column layout right");
689		- threeButton.addActionListener(this);
690		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
691		- sevenButton.setToolTipText("3-column layout");
692		- sevenButton.addActionListener(this);
693		- //
694	1179
695		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
696		- rootButton.setToolTipText("Edit selection in new tab");
	1180	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1181	+ rootButton.setToolTipText("Open selection in new tab");
697	1182	rootButton.addActionListener(this);
698	1183
699		- oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1184	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
700	1185	closeButton.setToolTipText("Close tab");
701	1186	closeButton.addActionListener(this);
702	1187	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
703	1188	//clearButton.addActionListener(this);
704	1189
	1190	+ cGridBag row1 = new cGridBag();
	1191	+
705	1192	// INSERT
706		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
707		- gridButton.setToolTipText("Create grid");
	1193	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ gridButton.setToolTipText("Create ground");
708	1195	gridButton.addActionListener(this);
709	1196
710		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1197	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
711	1198	boxButton.setToolTipText("Create box");
712	1199	boxButton.addActionListener(this);
713	1200
714		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
715		- sphereButton.setToolTipText("Create sphere");
716		- sphereButton.addActionListener(this);
717		-
718		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
719		- coneButton.setToolTipText("Create cone");
720		- coneButton.addActionListener(this);
721		-
722		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
723		- torusButton.setToolTipText("Create torus");
724		- torusButton.addActionListener(this);
725		-
726		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1201	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
727	1202	superButton.setToolTipText("Create superellipsoid");
728	1203	superButton.addActionListener(this);
729	1204
730		- if (Globals.ADVANCED)
	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)
731	1218	{
732		- oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1219	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
733	1220	kleinButton.setToolTipText("Create Klein bottle");
734	1221	kleinButton.addActionListener(this);
735	1222	}
736	1223
737		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
738	1225	particlesButton.setToolTipText("Create particle system");
739	1226	particlesButton.addActionListener(this);
740	1227
741		- oe.toolboxPanel.Return();
	1228	+ oe.toolboxPanel.add(row1);
742	1229
743		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1230	+ cGridBag row2 = new cGridBag();
	1231	+
	1232	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
744	1233	groupButton.setToolTipText("Create group");
745	1234	groupButton.addActionListener(this);
746	1235
747		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1236	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
748	1237	compositeButton.setToolTipText("Create composite");
749	1238	compositeButton.addActionListener(this);
750	1239
751		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1240	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
752	1241	switchButton.setToolTipText("Create item switcher");
753	1242	switchButton.addActionListener(this);
754	1243
755		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1244	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
756	1245	loopButton.setToolTipText("Create loop");
757	1246	loopButton.addActionListener(this);
758	1247
759		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1248	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
760	1249	textureButton.setToolTipText("Create texture");
761	1250	textureButton.addActionListener(this);
762	1251
763		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1252	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
764	1253	overlayButton.setToolTipText("Create overlay");
765	1254	overlayButton.addActionListener(this);
766	1255
767		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1256	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
768	1257	lightButton.setToolTipText("Create light");
769	1258	lightButton.addActionListener(this);
770	1259
771		- for (int i=6; --i>=0;)
772		- {
773		- oe.toolboxPanel.Return();
774		- oe.toolboxPanel.add(new cGridBag());
775		- oe.toolboxPanel.add(new cGridBag());
776		- oe.toolboxPanel.add(new cGridBag());
777		- oe.toolboxPanel.add(new cGridBag());
778		- oe.toolboxPanel.add(new cGridBag());
779		- oe.toolboxPanel.add(new cGridBag());
780		- oe.toolboxPanel.add(new cGridBag());
781		- }
	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);
782	1276
783	1277	// EDIT panel
784		- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1278	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
785	1279	editButton.setToolTipText("Pin selection controls");
786	1280	editButton.addActionListener(this);
787	1281
788		- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
789		- uneditButton.setToolTipText("Remove selection controls");
	1282	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1283	+ uneditButton.setToolTipText("Unpin and remove selection controls");
790	1284	uneditButton.addActionListener(this);
791	1285
792	1286	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
793		- allParamsButton.setToolTipText("Show all controle");
	1287	+ allParamsButton.setToolTipText("Show all controls");
794	1288	allParamsButton.addActionListener(this);
795	1289
796		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
797		- clearPanelButton.setToolTipText("Clear edit panel");
	1290	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1291	+ clearPanelButton.setToolTipText("Clear all controls");
798	1292	clearPanelButton.addActionListener(this);
799	1293
800		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
801		- unselectButton.setToolTipText("Unselect");
802		- unselectButton.addActionListener(this);
	1294	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1295	+ //unselectButton.setToolTipText("Unselect");
	1296	+ //unselectButton.addActionListener(this);
803	1297
804		- editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1298	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
805	1299	flashSelectionButton.setToolTipText("Highlight selection");
806	1300	flashSelectionButton.addActionListener(this);
807	1301
..	..	@@ -824,6 +1318,8 @@
824	1318
825	1319	cGridBag jSPPanel = new cGridBag();
826	1320
	1321	+ jSPPanel.preferredHeight = 20;
	1322	+
827	1323	JScrollPane jSP;
828	1324	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
829	1325	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -832,14 +1328,14 @@
832	1328	oe.treePanel.add(jSPPanel);
833	1329	oe.treePanel.Return();
834	1330
835		- oe.treePanel.add(copyOptionsPanel);
	1331	+ oe.treePanel.add(versionManagerPanel);
836	1332	oe.treePanel.Return();
837		- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 10, 0);
838		- versionField = (cNumberSlider)sliderPane.getComponent(1);
839		- sliderPane.preferredHeight = 1;
	1333	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1334	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1335	+ versionSliderPane.preferredHeight = 3;
840	1336
841		-// mainPanel.setDividerLocation(0.5); //1.0);
842		-// mainPanel.setResizeWeight(0.5);
	1337	+// mainPanel.setDividerLocation(0.1); //1.0);
	1338	+ mainPanel.setResizeWeight(0.4);
843	1339
844	1340	//jList.addListSelectionListener(this);
845	1341	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -847,7 +1343,7 @@
847	1343	//jTree.setEditable(true);
848	1344	oe.jTree.setDragEnabled(true);
849	1345	//jTree.setPreferredSize(new Dimension(10,10));
850		- jSP.setPreferredSize(new Dimension(100,200));
	1346	+ //jSP.setPreferredSize(new Dimension(100,200));
851	1347
852	1348	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
853	1349
..	..	@@ -859,7 +1355,7 @@
859	1355	dgr.addDragGestureListener(this);
860	1356	}catch(Exception e) {}
861	1357	*/
862		- radio.layout = sevenButton;
	1358	+ radio.layout = threeButton; // sixButton;
863	1359	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
864	1360	}
865	1361
..	..	@@ -910,9 +1406,12 @@
910	1406	smoothCB.setToolTipText("Snapping delay");
911	1407	smoothCB.addItemListener(this);
912	1408
913		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
914		- slowCB.setToolTipText("Smooth interpolation");
915		- slowCB.addItemListener(this);
	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);
916	1415
917	1416	// constraints.gridy += 1;
918	1417	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -991,6 +1490,14 @@
991	1490
992	1491	void EditObject(Object3D obj)
993	1492	{
	1493	+ //assert(obj instanceof Composite);
	1494	+
	1495	+// if (obj.versionlist == null)
	1496	+// {
	1497	+// obj.versionlist = new Object3D[100];
	1498	+// obj.versionindex = -1;
	1499	+// }
	1500	+
994	1501	cRadio radioButton = new cRadio(obj.name);
995	1502
996	1503	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1001,7 +1508,7 @@
1001	1508	}
1002	1509
1003	1510	radioButton.SetObject(obj);
1004		- radioButton.layout = sevenButton;
	1511	+ radioButton.layout = threeButton; // sixButton;
1005	1512	radioButton.SetCamera(cameraView.renderCamera, false);
1006	1513	radioButton.addActionListener(this);
1007	1514	radioPanel.add(radioButton);
..	..	@@ -1015,6 +1522,7 @@
1015	1522
1016	1523	oe.SetupViews();
1017	1524
	1525	+ if (Globals.DEBUG)
1018	1526	System.out.println("SetupViews");
1019	1527	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1020	1528	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1026,6 +1534,8 @@
1026	1534	cCheckBox localCB;
1027	1535	cCheckBox crowdCB;
1028	1536	cCheckBox smoothCB;
	1537	+ cCheckBox minshaderCB;
	1538	+
1029	1539	cToggleButton fastCB;
1030	1540	cCheckBox slowCB;
1031	1541	cCheckBox boxCB;
..	..	@@ -1096,6 +1606,12 @@
1096	1606	{
1097	1607	cameraView.ToggleInertia();
1098	1608	cameraView.repaint();
	1609	+ }
	1610	+ else if(e.getSource() == minshaderCB)
	1611	+ {
	1612	+ Globals.MINSHADER ^= true;
	1613	+ cameraView.programInitialized = false;
	1614	+ cameraView.repaint();
1099	1615	}
1100	1616	else if(e.getSource() == localCB)
1101	1617	{
..	..	@@ -1373,7 +1889,12 @@
1373	1889	TreePath path;
1374	1890
1375	1891	public TransferableTreePath(TreePath tp) {
1376		- 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);
1377	1898	}
1378	1899
1379	1900	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1605,24 +2126,24 @@
1605	2126	switch(axis)
1606	2127	{
1607	2128	case 0 :
1608		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1609		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1610		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1611		- 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;
1612	2133	norm = cVector.X;
1613	2134	break;
1614	2135	case 1 :
1615		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1616		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1617		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1618		- 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;
1619	2140	norm = cVector.Y;
1620	2141	break;
1621	2142	case 2 :
1622		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1623		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1624		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1625		- 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;
1626	2147	norm = cVector.Z;
1627	2148	break;
1628	2149	}
..	..	@@ -1663,7 +2184,11 @@
1663	2184	shadow.material = new cMaterial(obj.material);
1664	2185	shadow.material.diffuse = 0.0001f;
1665	2186	shadow.material.specular = 0.0001f;
1666		- //shadow.projectedVertices[1].x = 300;
	2187	+ shadow.material.opacity = 0.75f;
	2188	+
	2189	+ AllocProjectedVertices(shadow);
	2190	+
	2191	+ shadow.projectedVertices[1].x = 300;
1667	2192
1668	2193	makeSomething(shadow);
1669	2194	}
..	..	@@ -1680,6 +2205,16 @@
1680	2205	listUI.remove(i);
1681	2206	}
1682	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
1683	2218	}
1684	2219
1685	2220	/**
..	..	@@ -2109,6 +2644,23 @@
2109	2644	{
2110	2645	makeSomething(new Light());
2111	2646	} else
	2647	+// if (source == skybox1Button \|\|
	2648	+// source == skybox2Button \|\|
	2649	+// source == skybox3Button \|\|
	2650	+// source == skybox4Button \|\|
	2651	+// source == skybox5Button \|\|
	2652	+// source == skybox6Button \|\|
	2653	+// source == skybox7Button \|\|
	2654	+// source == skybox11Button \|\|
	2655	+// source == skybox12Button \|\|
	2656	+// source == skybox13Button \|\|
	2657	+// source == skybox14Button \|\|
	2658	+// source == skybox15Button \|\|
	2659	+// source == skybox16Button \|\|
	2660	+// source == skybox17Button)
	2661	+// {
	2662	+// ChangeSkybox(source);
	2663	+// } else
2112	2664	if (source == csgItem)
2113	2665	{
2114	2666	group(new CSG());
..	..	@@ -2157,27 +2709,35 @@
2157	2709	} else
2158	2710	if (source == loopItem \|\| source == loopButton)
2159	2711	{
	2712	+ if (!group.selection.isEmpty())
	2713	+ {
2160	2714	Composite csg = new GroupLeaf();
2161		- csg.count = 5;
2162	2715	group(csg);
	2716	+ csg.count = 5;
2163	2717	Composite child = new cGroup("Branch");
2164	2718	csg.addChild(child);
2165	2719	child.addChild(csg);
	2720	+ }
2166	2721	} else
2167	2722	if (source == doubleItem)
2168	2723	{
	2724	+ if (!group.selection.isEmpty())
	2725	+ {
2169	2726	Composite csg = new GroupLeaf("Fork");
2170		- csg.count = 5;
2171	2727	group(csg);
	2728	+ csg.count = 5;
2172	2729	Composite child = new cGroup("Branch A");
2173	2730	csg.addChild(child);
2174	2731	child.addChild(csg);
2175	2732	child = new cGroup("Branch B");
2176	2733	csg.addChild(child);
2177	2734	child.addChild(csg);
	2735	+ }
2178	2736	} else
2179	2737	if (source == tripleItem)
2180	2738	{
	2739	+ if (!group.selection.isEmpty())
	2740	+ {
2181	2741	Composite csg = new GroupLeaf("Trident");
2182	2742	csg.count = 4;
2183	2743	group(csg);
..	..	@@ -2190,11 +2750,12 @@
2190	2750	child = new cGroup();
2191	2751	csg.addChild(child);
2192	2752	child.addChild(csg);
	2753	+ }
2193	2754	} else
2194	2755	if (source == computeAOItem)
2195	2756	{
2196	2757	Globals.drawMode = CameraPane.OCCLUSION;
2197		- Globals.theRenderer.repaint();
	2758	+ cameraView.repaint();
2198	2759	} else
2199	2760	if (source == recompileItem)
2200	2761	{
..	..	@@ -2209,7 +2770,7 @@
2209	2770	if (source == invariantsItem)
2210	2771	{
2211	2772	System.out.println("Invariants:");
2212		- Grafreed.grafreeD.universe.invariants();
	2773	+ Grafreed.grafreed.universe.invariants();
2213	2774	} else
2214	2775	if (source == memoryItem)
2215	2776	{
..	..	@@ -2236,37 +2797,56 @@
2236	2797	{
2237	2798	Maximize();
2238	2799	} else
2239		- if (source == fullButton)
	2800	+ if (source == fullScreenButton)
2240	2801	{
2241	2802	ToggleFullScreen();
2242	2803	} else
2243		- if (source == undoButton)
	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)
2244	2817	{
2245	2818	// Go to previous version
2246	2819	//if (!Undo())
2247	2820	//java.awt.Toolkit.getDefaultToolkit().beep();
2248		- Undo();
	2821	+ PreviousVersion();
2249	2822	} else
2250	2823	if (source == restoreButton)
2251	2824	{
2252	2825	// Restore current version
2253	2826	Restore();
	2827	+ //restoreButton.setEnabled(false);
2254	2828	} else
2255	2829	if (source == replaceButton)
2256	2830	{
2257	2831	// Overwrite current version
2258	2832	Replace();
	2833	+ //replaceButton.setEnabled(false);
2259	2834	} else
2260		- if (source == redoButton)
	2835	+ if (source == nextVersionButton)
2261	2836	{
2262	2837	// Go to next version
2263		- Redo();
	2838	+ NextVersion();
2264	2839	} else
2265		- if (source == saveButton)
	2840	+ if (source == saveVersionButton)
2266	2841	{
2267	2842	// Save a new version
2268	2843	if (!Save(true))
2269	2844	java.awt.Toolkit.getDefaultToolkit().beep();
	2845	+ } else
	2846	+ if (source == deleteVersionButton)
	2847	+ {
	2848	+ // Delete a new version
	2849	+ DeleteVersion();
2270	2850	} else
2271	2851	if (source == oneStepButton)
2272	2852	{
..	..	@@ -2321,11 +2901,11 @@
2321	2901	} else
2322	2902	if (source == undoItem)
2323	2903	{
2324		- Undo();
	2904	+ PreviousVersion();
2325	2905	} else
2326	2906	if (source == redoItem)
2327	2907	{
2328		- Redo();
	2908	+ NextVersion();
2329	2909	} else
2330	2910	if (source == duplicateItem)
2331	2911	{
..	..	@@ -2646,7 +3226,7 @@
2646	3226	{
2647	3227	StepAll();
2648	3228	} else
2649		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3229	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2650	3230	{
2651	3231	//int indices[] = jList.getSelectedIndices();
2652	3232	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2806,22 +3386,34 @@
2806	3386	} else
2807	3387	if (source == ungroupItem \|\| source == ungroupButton)
2808	3388	{
2809		- boolean hasRoot = false;
	3389	+ boolean canUngroup = true;
2810	3390
2811	3391	for (int i=0; i<group.selection.size(); i++)
2812	3392	{
2813		- if (group.selection.get(i) == group)
	3393	+ Object3D selectedItem = group.selection.get(i);
	3394	+
	3395	+ if (selectedItem.Size() == 0)
2814	3396	{
2815		- hasRoot = true;
	3397	+ // Cannot ungroup leaves
	3398	+ canUngroup = false;
	3399	+ break;
	3400	+ }
	3401	+
	3402	+ if (selectedItem == group)
	3403	+ {
	3404	+ // Cannot ungroup root
	3405	+ canUngroup = false;
2816	3406	break;
2817	3407	}
2818	3408	}
2819	3409
2820		- if (!hasRoot)
	3410	+ if (canUngroup)
2821	3411	{
2822	3412	for (int i=0; i<group.selection.size(); i++)
2823	3413	{
2824		- Ungroup(group.selection.get(i));
	3414	+ Object3D selectedItem = group.selection.get(i);
	3415	+
	3416	+ Ungroup(selectedItem);
2825	3417	}
2826	3418
2827	3419	ClearSelection(false);
..	..	@@ -2872,6 +3464,10 @@
2872	3464	if (source == clearMaterialsItem)
2873	3465	{
2874	3466	ClearMaterials();
	3467	+ } else
	3468	+ if (source == clearVersionsItem)
	3469	+ {
	3470	+ ClearVersions();
2875	3471	} else
2876	3472	if (source == liveleavesItem)
2877	3473	{
..	..	@@ -3013,6 +3609,18 @@
3013	3609	{
3014	3610	TransformChildren();
3015	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
3016	3624	if (source == resetTransformItem)
3017	3625	{
3018	3626	ResetTransform();
..	..	@@ -3128,7 +3736,7 @@
3128	3736	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3129	3737	{
3130	3738	obj = (Object3D)e.nextElement();
3131		- obj.SetBumpTexture(null);
	3739	+ obj.ResetBumpTexture();
3132	3740	}
3133	3741
3134	3742	refreshContents();
..	..	@@ -3142,6 +3750,31 @@
3142	3750	obj.SetBumpTexture(obj.GetPigmentTexture());
3143	3751	}
3144	3752
	3753	+ refreshContents();
	3754	+ } else
	3755	+ if (source == embedTexturesItem)
	3756	+ {
	3757	+ Object3D obj;
	3758	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3759	+ {
	3760	+ obj = (Object3D)e.nextElement();
	3761	+ obj.EmbedTextures(true);
	3762	+ }
	3763	+
	3764	+ refreshContents();
	3765	+ } else
	3766	+ if (source == deEmbedTexturesItem)
	3767	+ {
	3768	+ Object3D obj;
	3769	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3770	+ {
	3771	+ obj = (Object3D)e.nextElement();
	3772	+ obj.EmbedTextures(false);
	3773	+ }
	3774	+
	3775	+ CameraPane.texturepigment.clear();
	3776	+ CameraPane.texturebump.clear();
	3777	+
3145	3778	refreshContents();
3146	3779	} else
3147	3780	if (source == flashSelectionButton)
..	..	@@ -3159,38 +3792,7 @@
3159	3792	if (CameraPane.FULLSCREEN)
3160	3793	fullscreenLayout = radio.layout;
3161	3794
3162		- // bug
3163		- //gridPanel.setDividerLocation(1.0);
3164		- //bigPanel.setDividerLocation(0.0);
3165		-// bigThree.remove(scenePanel);
3166		-// bigThree.remove(centralPanel);
3167		-// bigThree.remove(XYZPanel);
3168		-// aWindowConstraints.gridx = 0;
3169		-// aWindowConstraints.gridy = 0;
3170		-// aWindowConstraints.gridwidth = 1;
3171		-// // aConstraints.gridheight = 3;
3172		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3173		-// aWindowConstraints.weightx = 0;
3174		-// aWindowConstraints.weighty = 1;
3175		-// //bigThree.add(jtp, aWindowConstraints);
3176		-// aWindowConstraints.weightx = 1;
3177		-// aWindowConstraints.gridwidth = 3;
3178		-// // aConstraints.gridheight = 3;
3179		-// aWindowConstraints.gridx = 1;
3180		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3181		-// bigThree.add(centralPanel, aWindowConstraints);
3182		-// aWindowConstraints.weightx = 0;
3183		-// aWindowConstraints.gridx = 4;
3184		-// aWindowConstraints.gridwidth = 1;
3185		-// // aConstraints.gridheight = 3;
3186		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3187		-// //bigThree.add(XYZPanel, aWindowConstraints);
3188		-// scenePanel.setVisible(false);
3189		-// centralPanel.setVisible(true);
3190		-// XYZPanel.setVisible(false);
3191		- bigThree.ClearUI();
3192		- bigThree.add(centralPanel);
3193		- bigThree.FlushUI();
	3795	+ Show3DView();
3194	3796
3195	3797	cameraView.requestFocusInWindow();
3196	3798
..	..	@@ -3245,8 +3847,8 @@
3245	3847	// centralPanel.setVisible(true);
3246	3848	// XYZPanel.setVisible(true);
3247	3849	bigThree.ClearUI();
	3850	+ bigThree.add(scenePanel);
3248	3851	bigThree.add(centralPanel);
3249		- bigThree.add(XYZPanel);
3250	3852	bigThree.FlushUI();
3251	3853
3252	3854	cameraView.requestFocusInWindow();
..	..	@@ -3326,8 +3928,8 @@
3326	3928	// centralPanel.setVisible(true);
3327	3929	// XYZPanel.setVisible(false);
3328	3930	bigThree.ClearUI();
3329		- bigThree.add(scenePanel);
3330	3931	bigThree.add(centralPanel);
	3932	+ bigThree.add(scenePanel);
3331	3933	bigThree.FlushUI();
3332	3934
3333	3935	cameraView.requestFocusInWindow();
..	..	@@ -3376,6 +3978,7 @@
3376	3978	} else
3377	3979	if (source == rootButton)
3378	3980	{
	3981	+ Replace();
3379	3982	Object3D obj;
3380	3983	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3381	3984	{
..	..	@@ -3390,6 +3993,9 @@
3390	3993	if (source == closeButton)
3391	3994	{
3392	3995	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3996	+ if (copy.versionlist != null)
	3997	+ Replace();
	3998	+
3393	3999	cRadio ab;
3394	4000	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3395	4001	{
..	..	@@ -3433,10 +4039,10 @@
3433	4039	{
3434	4040	Object3D child = (Object3D)e.nextElement();
3435	4041	if(child.editWindow != null)
3436		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3437	4042	child.pinned = false;
3438	4043	child.CloseUI();
3439	4044	listUI.remove(child);
	4045	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3440	4046
3441	4047	//child.editWindow = null; // ???????????
3442	4048	}
..	..	@@ -3455,6 +4061,7 @@
3455	4061	obj.CloseUI();
3456	4062	}
3457	4063	listUI.clear();
	4064	+ SetPinStates(group.selection.size() > 0);
3458	4065	refreshContents(true);
3459	4066	} else
3460	4067	if (source == allParamsButton)
..	..	@@ -3487,6 +4094,9 @@
3487	4094	} else
3488	4095	if(source instanceof cRadio)
3489	4096	{
	4097	+ if (copy.versionlist != null)
	4098	+ Replace();
	4099	+
3490	4100	group.parent = keepparent;
3491	4101	group.attributes = 0;
3492	4102	//group.editWindow = null;
..	..	@@ -3511,8 +4121,6 @@
3511	4121
3512	4122	copy = group;
3513	4123
3514		- SetUndoStates();
3515		-
3516	4124	//Globals.theRenderer.object = group;
3517	4125	if(!useclient)
3518	4126	{
..	..	@@ -3540,9 +4148,38 @@
3540	4148	*/
3541	4149	radio.layout.doClick();
3542	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	+
3543	4177	ClearUnpinned();
3544		- SetPinStates(group.selection.size() > 0);
3545		- if (group.selection.size() == 1)
	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)
3546	4183	EditSelection(false);
3547	4184	keepparent = group.parent;
3548	4185	// PARENT = NULL or not???
..	..	@@ -3555,11 +4192,13 @@
3555	4192	} else if (event.getSource() == editCameraItem)
3556	4193	{
3557	4194	cameraView.ProtectCamera();
	4195	+ cameraView.requestFocusInWindow();
3558	4196	cameraView.repaint();
3559	4197	return;
3560	4198	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3561	4199	{
3562	4200	cameraView.RevertCamera();
	4201	+ cameraView.requestFocusInWindow();
3563	4202	cameraView.repaint();
3564	4203	return;
3565	4204	// } else if (event.getSource() == textureButton)
..	..	@@ -3648,6 +4287,18 @@
3648	4287	refreshContents();
3649	4288	}
3650	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	+ }
	4301	+
3651	4302	void ResetTransform()
3652	4303	{
3653	4304	ResetTransform(-1);
..	..	@@ -3663,42 +4314,8 @@
3663	4314	if (obj.toParent == null)
3664	4315	continue;
3665	4316
3666		- if (mask == -1)
3667		- {
3668		- if (obj instanceof Camera) // jan 2014
3669		- {
3670		- LA.matIdentity(obj.toParent);
3671		- LA.matIdentity(obj.fromParent);
3672		- }
3673		- else
3674		- {
3675		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
3676		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
3677		- }
3678		- TouchTransform(obj);
3679		- continue;
3680		- }
3681		- if ((mask&2) != 0) // Scale
3682		- {
3683		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3684		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3685		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3686		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3687		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3688		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3689		- }
3690		- if ((mask&4) != 0) // Rotation
3691		- {
3692		- // ?
3693		- }
3694		- if ((mask&1) != 0) // Translation
3695		- {
3696		- if (obj.toParent != null)
3697		- {
3698		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
3699		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
3700		- }
3701		- }
	4317	+ obj.ResetTransform(mask);
	4318	+
3702	4319	if (obj.parent == null)
3703	4320	{
3704	4321	System.out.println("NULL PARENT!");
..	..	@@ -4136,7 +4753,7 @@
4136	4753
4137	4754	try
4138	4755	{
4139		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4756	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4140	4757	}
4141	4758	catch (Exception e)
4142	4759	{
..	..	@@ -4206,6 +4823,12 @@
4206	4823	for (int i=0; i<group.selection.size(); i++)
4207	4824	{
4208	4825	Object3D obj = group.selection.get(i);
	4826	+
	4827	+ if (obj.toParent == null)
	4828	+ {
	4829	+ obj.toParent = LA.newMatrix();
	4830	+ obj.fromParent = LA.newMatrix();
	4831	+ }
4209	4832
4210	4833	LA.matTranslate(obj.toParent, i * scale, 0, 0);
4211	4834	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
..	..	@@ -4498,6 +5121,12 @@
4498	5121	refreshContents();
4499	5122	}
4500	5123
	5124	+ void ClearVersions()
	5125	+ {
	5126	+ group.selection.ClearVersions();
	5127	+ refreshContents();
	5128	+ }
	5129	+
4501	5130	void FlipV(boolean flip)
4502	5131	{
4503	5132	group.selection.FlipV(flip);
..	..	@@ -4613,6 +5242,12 @@
4613	5242
4614	5243	void EditSelection(boolean newWindow)
4615	5244	{
	5245	+ if (group.selection == null)
	5246	+ {
	5247	+ EditElement(group, newWindow); // ? new
	5248	+ return;
	5249	+ }
	5250	+
4616	5251	// aConstraints.gridy = 0;
4617	5252	for (int i=0; i<group.selection.size(); i++)
4618	5253	{
..	..	@@ -4623,12 +5258,7 @@
4623	5258	Object3D elem = (Object3D)group.selection.elementAt(i);
4624	5259	if(elem != group \|\| !newWindow)
4625	5260	{
4626		- // if (!(elem instanceof Composite))
4627		- // newWindow = false;
4628		- listUI.add(elem);
4629		- elem.openEditWindow(this, newWindow); //, false);
4630		- System.out.println("edit : " + elem);
4631		- elem.editWindow.refreshContents(true); // ? new
	5261	+ EditElement(elem, newWindow); // ? new
4632	5262	}
4633	5263	}
4634	5264	}
..	..	@@ -4691,9 +5321,7 @@
4691	5321
4692	5322	freezemodel = false;
4693	5323	}
4694		-
4695		- boolean flashIt = true;
4696		-
	5324	+
4697	5325	public void valueChanged(TreeSelectionEvent e)
4698	5326	//public boolean handleEvent(Event event)
4699	5327	{
..	..	@@ -4737,7 +5365,7 @@
4737	5365	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4738	5366	// a camera
4739	5367	{
4740		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5368	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
4741	5369	{
4742	5370	CameraPane.camerachangeframe = 0; // don't refuse it
4743	5371	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4766,13 +5394,31 @@
4766	5394	{
4767	5395	editButton.setEnabled(enabled);
4768	5396	uneditButton.setEnabled(enabled);
4769		- unselectButton.setEnabled(enabled);
	5397	+ //unselectButton.setEnabled(enabled);
4770	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);
4771	5416	}
4772	5417
4773	5418	void refreshContents(boolean cp)
4774	5419	{
4775		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	5420	+ if (Globals.SHOWINFO)
	5421	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4776	5422	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4777	5423	{
4778	5424	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -4782,7 +5428,7 @@
4782	5428	Object3D child = (Object3D) group.selection.get(i);
4783	5429
4784	5430	objEditor.AddInfo(child, this, true);
4785		- System.err.println("info : " + child.GetPath());
	5431	+// System.err.println("info : " + child.GetPath());
4786	5432	}
4787	5433
4788	5434	objEditor.SetText(); // jan 2014
..	..	@@ -5608,7 +6254,6 @@
5608	6254
5609	6255	cButton restoreCameraButton;
5610	6256
5611		- cButton saveButton;
5612	6257	cButton oneStepButton;
5613	6258
5614	6259	cButton groupButton;
..	..	@@ -5617,6 +6262,22 @@
5617	6262	cButton switchButton;
5618	6263	cButton loopButton;
5619	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;
5620	6281
5621	6282	cButton gridButton;
5622	6283	cButton boxButton;
..	..	@@ -5650,11 +6311,11 @@
5650	6311	private MenuItem lookAtItem;
5651	6312	private MenuItem lookFromItem;
5652	6313	private MenuItem switchViewItem;
5653		- private MenuItem cutItem;
	6314	+ private JMenuItem cutItem;
5654	6315	private MenuItem undoItem;
5655	6316	private MenuItem redoItem;
5656	6317	private JMenuItem duplicateItem;
5657		- private MenuItem cloneItem;
	6318	+ private JMenuItem cloneItem;
5658	6319	private MenuItem cloneSupportItem;
5659	6320	private MenuItem overwriteGeoItem;
5660	6321	private MenuItem overwriteMatItem;
..	..	@@ -5675,13 +6336,13 @@
5675	6336	private MenuItem cloneGeometriesItem;
5676	6337	private MenuItem shareGeometriesItem;
5677	6338	private MenuItem mergeGeometriesItem;
5678		- private MenuItem copyItem;
	6339	+ private JMenuItem copyItem;
5679	6340	private MenuItem pasteItem;
5680		- private MenuItem pasteIntoItem;
5681		- private MenuItem pasteLinkItem;
5682		- private MenuItem pasteCloneItem;
5683		- private MenuItem pasteExpandItem;
5684		- private MenuItem clearItem;
	6341	+ private JMenuItem pasteIntoItem;
	6342	+ private JMenuItem pasteLinkItem;
	6343	+ private JMenuItem pasteCloneItem;
	6344	+ private JMenuItem pasteExpandItem;
	6345	+ private JMenuItem deleteItem;
5685	6346	private MenuItem clearAllItem;
5686	6347	private MenuItem genUVItem;
5687	6348	private MenuItem genNormalsMESHItem;
..	..	@@ -5707,6 +6368,7 @@
5707	6368	private MenuItem clipMeshItem;
5708	6369	private MenuItem smoothMeshItem;
5709	6370	private MenuItem clearMaterialsItem;
	6371	+ private MenuItem clearVersionsItem;
5710	6372
5711	6373	private MenuItem liveleavesItem;
5712	6374	private MenuItem unliveleavesItem;
..	..	@@ -5730,13 +6392,16 @@
5730	6392	private MenuItem maxTexturesItem;
5731	6393	private MenuItem panoTexturesItem;
5732	6394
	6395	+ private MenuItem textureRatioRItem;
	6396	+ private MenuItem textureRatioGItem;
	6397	+ private MenuItem textureRatioBItem;
5733	6398	private MenuItem resetCentroidItem;
5734	6399	private MenuItem resetCentroidXZItem;
5735	6400	private MenuItem resetTransformItem;
5736	6401	private MenuItem transformGeometryItem;
5737	6402	private MenuItem transformChildrenItem;
5738	6403	private MenuItem hideItem;
5739		- private MenuItem grabItem;
	6404	+ private JMenuItem grabItem;
5740	6405	private MenuItem backItem;
5741	6406	private MenuItem frontItem;
5742	6407	private MenuItem cameraItem;
..	..	@@ -5749,7 +6414,7 @@
5749	6414	private MenuItem switchTransfoItem;
5750	6415	private MenuItem morphItem;
5751	6416	private MenuItem linkerItem;
5752		- private MenuItem ungroupItem;
	6417	+ private JMenuItem ungroupItem;
5753	6418	private MenuItem editItem;
5754	6419	private MenuItem openWindowItem;
5755	6420	private MenuItem editLeafItem;
..	..	@@ -5765,6 +6430,8 @@
5765	6430	private MenuItem attachBumpItem;
5766	6431	private MenuItem detachBumpItem;
5767	6432	private MenuItem pigmentBumpItem;
	6433	+ private MenuItem embedTexturesItem;
	6434	+ private MenuItem deEmbedTexturesItem;
5768	6435
5769	6436	private MenuItem particleItem;
5770	6437	private MenuItem ragdollItem;