~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,360 @@
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", !Grafreed.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, !Grafreed.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();
	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	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
	379	+ }
	380	+
26	381	//ObjEditor objEditor;
27	382	public void closeUI2()
28	383	{
..	..	@@ -60,10 +415,12 @@
60	415	this.copy = this.group = group;
61	416	//selectees = this.group.selectees;
62	417
63		- if (copy.versions == null)
	418	+ if (copy.versionlist == null)
64	419	{
65		- copy.versions = new byte[100][];
	420	+ copy.versionlist = new Object3D[100];
66	421	copy.versionindex = -1;
	422	+
	423	+ Save(true);
67	424	}
68	425
69	426	if(ui)
..	..	@@ -87,9 +444,9 @@
87	444
88	445	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
89	446
90		- if (copy.versions == null)
	447	+ if (copy.versionlist == null)
91	448	{
92		- copy.versions = new byte[100][];
	449	+ copy.versionlist = new Object3D[100];
93	450	copy.versionindex = -1;
94	451
95	452	Save(true);
..	..	@@ -183,32 +540,37 @@
183	540	// menu.add("-");
184	541	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
185	542	duplicateItem.addActionListener(this);
186		- cloneItem = menu.add(new MenuItem("Clone"));
	543	+
	544	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
187	545	cloneItem.addActionListener(this);
188		- if (Globals.ADVANCED)
	546	+ //if (Globals.ADVANCED)
189	547	{
190	548	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
191	549	cloneSupportItem.addActionListener(this);
192	550	}
	551	+ oe.jTree.popup.addSeparator();
193	552	menu.add("-");
194		- cutItem = menu.add(new MenuItem("Cut"));
	553	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
195	554	cutItem.addActionListener(this);
196		- copyItem = menu.add(new MenuItem("Copy"));
	555	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
197	556	copyItem.addActionListener(this);
198	557	pasteItem = menu.add(new MenuItem("Paste"));
199	558	pasteItem.addActionListener(this);
200	559
201		- menu.add("-");
202		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	560	+ oe.jTree.popup.addSeparator();
	561	+ //menu.add("-");
	562	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
203	563	pasteIntoItem.addActionListener(this);
204		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	564	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
205	565	pasteLinkItem.addActionListener(this);
206		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	566	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
207	567	pasteCloneItem.addActionListener(this);
208		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	568	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
209	569	// pasteExpandItem.addActionListener(this);
210		- menu.add("-");
211		- deleteItem = menu.add(new MenuItem("Delete"));
	570	+ //menu.add("-");
	571	+ oe.jTree.popup.addSeparator();
	572	+
	573	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
212	574	deleteItem.addActionListener(this);
213	575
214	576	if (Globals.ADVANCED)
..	..	@@ -295,11 +657,9 @@
295	657	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
296	658	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
297	659	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
298		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
299	660	oe.cameraMenu.add("-");
300	661	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
301	662	openWindowItem.addActionListener(this);
302		- editLeafItem.addActionListener(this);
303	663	lookAtItem.addActionListener(this);
304	664	//lookFromItem.addActinoListener(this);
305	665	//switchViewItem.addActionListener(this);
..	..	@@ -361,7 +721,7 @@
361	721	hideItem = menu.add(new MenuItem("Hidden Group"));
362	722	hideItem.addActionListener(this);
363	723	}
364		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	724	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
365	725	ungroupItem.addActionListener(this);
366	726
367	727	// menu.add("-");
..	..	@@ -528,10 +888,15 @@
528	888	attachBumpItem.addActionListener(this);
529	889	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
530	890	pigmentBumpItem.addActionListener(this);
	891	+ //embedTexturesItem
531	892	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
532	893	detachPigmentItem.addActionListener(this);
533	894	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
534	895	detachBumpItem.addActionListener(this);
	896	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	897	+ embedTexturesItem.addActionListener(this);
	898	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	899	+ deEmbedTexturesItem.addActionListener(this);
535	900	menu.add("-");
536	901	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
537	902	sortbysizeItem.addActionListener(this);
..	..	@@ -542,6 +907,9 @@
542	907	shareGeometriesItem.addActionListener(this);
543	908	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
544	909	mergeGeometriesItem.addActionListener(this);
	910	+ menu.add("-");
	911	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	912	+ editLeafItem.addActionListener(this);
545	913	if (Globals.ADVANCED)
546	914	{
547	915	// Pretty much the same as duplicate and clone.
..	..	@@ -558,6 +926,73 @@
558	926	buildToolsMenu(menu);
559	927	}
560	928
	929	+ JTabbedPane resourcecontainer;
	930	+ cGridBag currenttab;
	931	+ boolean added; // patch for jar
	932	+
	933	+ int tabcount = 0;
	934	+ int colcount = 0;
	935	+ int rowcount = 0;
	936	+ int texturecount = 0;
	937	+
	938	+ int columns = 5;
	939	+ int rows = 7;
	940	+
	941	+ public void ResourceCallBack(String[] path)
	942	+ {
	943	+ for (int i = 0; i < path.length; i++)
	944	+ System.out.print(path[i] + "/");
	945	+ System.out.println();
	946	+
	947	+ if (//rowcount == 0 \|\|
	948	+ path.length == 1)
	949	+ {
	950	+ currenttab = new cGridBag();
	951	+ added = false;
	952	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	953	+ currenttab.setName(tabname);
	954	+ rowcount = 1;
	955	+ colcount = 0;
	956	+ texturecount = 0;
	957	+ }
	958	+
	959	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	960	+ {
	961	+ if (!added)
	962	+ {
	963	+ added = true;
	964	+ resourcecontainer.add(currenttab);
	965	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	966	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	967	+ }
	968	+
	969	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	970	+
	971	+ if (++colcount >= columns)
	972	+ {
	973	+ colcount = 0;
	974	+ currenttab.Return();
	975	+
	976	+ if (rowcount++ >= rows)
	977	+ {
	978	+ rowcount = 0;
	979	+ }
	980	+ }
	981	+ }
	982	+ else
	983	+ {
	984	+// if (!path[path.length-1].equals("icons"))
	985	+// resourcecontainer.Return();
	986	+ }
	987	+ }
	988	+
	989	+ void CreateTexturePanel(cGridBag container)
	990	+ {
	991	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	992	+ container.add(resourcecontainer);
	993	+
	994	+ Grafreed.ParseResources("textures", this);
	995	+ }
561	996
562	997	void SetupUI2(ObjEditor oe)
563	998	{
..	..	@@ -576,11 +1011,6 @@
576	1011	//new Exception().printStackTrace();
577	1012
578	1013	oe.radioPanel = new JPanel(new GridBagLayout());
579		- oe.aConstraints.weightx = 1;
580		- oe.aConstraints.weighty = 0;
581		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
582		- oe.aConstraints.gridwidth = 100;
583		- oe.aConstraints.gridheight = 1;
584	1014	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
585	1015
586	1016	oe.buttonGroup = new ButtonGroup();
..	..	@@ -603,7 +1033,7 @@
603	1033	*/
604	1034	cGridBag copyOptionsPanel = new cGridBag();
605	1035
606		- copyOptionsPanel.preferredHeight = 1;
	1036	+ copyOptionsPanel.preferredHeight = 2;
607	1037
608	1038	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
609	1039
..	..	@@ -613,10 +1043,49 @@
613	1043
614	1044	if (Globals.ADVANCED)
615	1045	{
616		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
617		- maxButton.setToolTipText("Maximize window");
618		- maxButton.addActionListener(this);
	1046	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1047	+// maxButton.setToolTipText("Maximize window");
	1048	+// maxButton.addActionListener(this);
619	1049	}
	1050	+
	1051	+ cButton gcButton;
	1052	+
	1053	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+// gcButton.setToolTipText("Garbage collect");
	1055	+// gcButton.addActionListener(new ActionListener()
	1056	+// {
	1057	+// public void actionPerformed(ActionEvent e)
	1058	+// {
	1059	+// System.gc();
	1060	+// }
	1061	+// });
	1062	+
	1063	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1064	+ collapseButton.setToolTipText("Collapse toolbar");
	1065	+ collapseButton.addActionListener(this);
	1066	+
	1067	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1069	+ maximize3DButton.addActionListener(this);
	1070	+
	1071	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ twoButton.setToolTipText("Show 3D view only");
	1073	+ twoButton.addActionListener(this);
	1074	+ this.fullscreenLayout = twoButton;
	1075	+
	1076	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ threeButton.setToolTipText("Show controls and 3D view");
	1078	+ threeButton.addActionListener(this);
	1079	+ if (Globals.ADVANCED)
	1080	+ {
	1081	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1082	+ sixButton.setToolTipText("Show 3D view and controls");
	1083	+ sixButton.addActionListener(this);
	1084	+ }
	1085	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1086	+// sevenButton.setToolTipText("3-column layout");
	1087	+// sevenButton.addActionListener(this);
	1088	+ //
620	1089
621	1090	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
622	1091	fullButton.setToolTipText("Full-screen window");
..	..	@@ -630,41 +1099,45 @@
630	1099	restoreCameraButton.setToolTipText("Restore viewpoint");
631	1100	restoreCameraButton.addActionListener(this);
632	1101
633		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- saveButton.setToolTipText("New version");
635		- saveButton.addActionListener(this);
	1102	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ saveVersionButton.setToolTipText("Duplicate current version");
	1104	+ saveVersionButton.addActionListener(this);
636	1105
637		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
638		- undoButton.setToolTipText("Previous version");
639		- undoButton.addActionListener(this);
640		- undoButton.setEnabled(false);
	1106	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1107	+ deleteVersionButton.setToolTipText("Delete current version");
	1108	+ deleteVersionButton.addActionListener(this);
	1109	+
	1110	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1111	+ previousVersionButton.setToolTipText("Previous version");
	1112	+ previousVersionButton.addActionListener(this);
	1113	+ previousVersionButton.setEnabled(false);
641	1114
642	1115	cGridBag updown = new cGridBag().setVertical(true);
643	1116	updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
644		- restoreButton.setToolTipText("Restore current");
	1117	+ restoreButton.setToolTipText("Undo (restore current version)");
645	1118	restoreButton.addActionListener(this);
646		- restoreButton.setEnabled(false);
	1119	+ //restoreButton.setEnabled(false);
647	1120
648	1121	updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
649		- replaceButton.setToolTipText("Replace current");
	1122	+ replaceButton.setToolTipText("Save (replace current version)");
650	1123	replaceButton.addActionListener(this);
651		- replaceButton.setEnabled(false);
	1124	+ //replaceButton.setEnabled(false);
652	1125
653	1126	copyOptionsPanel.add(updown);
654	1127
655		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
656		- redoButton.setToolTipText("Next version");
657		- redoButton.addActionListener(this);
658		- redoButton.setEnabled(false);
	1128	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ nextVersionButton.setToolTipText("Next version");
	1130	+ nextVersionButton.addActionListener(this);
	1131	+ nextVersionButton.setEnabled(false);
	1132	+
	1133	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1134	+ oneStepButton.setToolTipText("Animate one step forward");
	1135	+ oneStepButton.addActionListener(this);
659	1136
660	1137	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
661	1138	liveCB.setToolTipText("Enable animation");
662	1139	liveCB.addItemListener(this);
663	1140
664		- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
665		- oneStepButton.setToolTipText("Animate one step forward");
666		- oneStepButton.addActionListener(this);
667		-
668	1141	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
669	1142	fastCB.setToolTipText("Fast mode");
670	1143	fastCB.addItemListener(this);
..	..	@@ -683,29 +1156,14 @@
683	1156	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
684	1157	snapobjectButton.addActionListener(this);
685	1158	snapobjectButton.setToolTipText("Snap Object");
	1159	+
	1160	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1161	+ fourButton.addActionListener(this);
	1162	+ fourButton.setToolTipText("Show control panel only");
686	1163	}
687	1164
688	1165	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
689	1166
690		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
691		- fourButton.addActionListener(this);
692		- fourButton.setToolTipText("Show left panel only");
693		-
694		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
695		- twoButton.setToolTipText("Show right view only");
696		- twoButton.addActionListener(this);
697		- this.fullscreenLayout = twoButton;
698		-
699		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
700		- sixButton.setToolTipText("Show left and right");
701		- sixButton.addActionListener(this);
702		-// oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
703		-// threeButton.setToolTipText("2-column layout right");
704		-// threeButton.addActionListener(this);
705		-// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
706		-// sevenButton.setToolTipText("3-column layout");
707		-// sevenButton.addActionListener(this);
708		- //
709	1167
710	1168	oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
711	1169	rootButton.setToolTipText("Open selection in new tab");
..	..	@@ -717,28 +1175,30 @@
717	1175	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
718	1176	//clearButton.addActionListener(this);
719	1177
	1178	+ cGridBag row1 = new cGridBag();
	1179	+
720	1180	// INSERT
721		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
722		- gridButton.setToolTipText("Create grid");
	1181	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1182	+ gridButton.setToolTipText("Create ground");
723	1183	gridButton.addActionListener(this);
724	1184
725		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1185	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
726	1186	boxButton.setToolTipText("Create box");
727	1187	boxButton.addActionListener(this);
728	1188
729		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1189	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
730	1190	sphereButton.setToolTipText("Create sphere");
731	1191	sphereButton.addActionListener(this);
732	1192
733		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1193	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
734	1194	coneButton.setToolTipText("Create cone");
735	1195	coneButton.addActionListener(this);
736	1196
737		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1197	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
738	1198	torusButton.setToolTipText("Create torus");
739	1199	torusButton.addActionListener(this);
740	1200
741		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1201	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
742	1202	superButton.setToolTipText("Create superellipsoid");
743	1203	superButton.addActionListener(this);
744	1204
..	..	@@ -749,51 +1209,53 @@
749	1209	kleinButton.addActionListener(this);
750	1210	}
751	1211
752		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1212	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
753	1213	particlesButton.setToolTipText("Create particle system");
754	1214	particlesButton.addActionListener(this);
755	1215
756		- oe.toolboxPanel.Return();
	1216	+ oe.toolboxPanel.add(row1);
757	1217
758		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1218	+ cGridBag row2 = new cGridBag();
	1219	+
	1220	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
759	1221	groupButton.setToolTipText("Create group");
760	1222	groupButton.addActionListener(this);
761	1223
762		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
763	1225	compositeButton.setToolTipText("Create composite");
764	1226	compositeButton.addActionListener(this);
765	1227
766		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1228	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
767	1229	switchButton.setToolTipText("Create item switcher");
768	1230	switchButton.addActionListener(this);
769	1231
770		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1232	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
771	1233	loopButton.setToolTipText("Create loop");
772	1234	loopButton.addActionListener(this);
773	1235
774		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1236	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
775	1237	textureButton.setToolTipText("Create texture");
776	1238	textureButton.addActionListener(this);
777	1239
778		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1240	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
779	1241	overlayButton.setToolTipText("Create overlay");
780	1242	overlayButton.addActionListener(this);
781	1243
782		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1244	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
783	1245	lightButton.setToolTipText("Create light");
784	1246	lightButton.addActionListener(this);
785	1247
786		- for (int i=6; --i>=0;)
787		- {
788		- oe.toolboxPanel.Return();
789		- oe.toolboxPanel.add(new cGridBag());
790		- oe.toolboxPanel.add(new cGridBag());
791		- oe.toolboxPanel.add(new cGridBag());
792		- oe.toolboxPanel.add(new cGridBag());
793		- oe.toolboxPanel.add(new cGridBag());
794		- oe.toolboxPanel.add(new cGridBag());
795		- oe.toolboxPanel.add(new cGridBag());
796		- }
	1248	+ oe.toolboxPanel.add(row2);
	1249	+
	1250	+ cGridBag textures = new cGridBag();
	1251	+
	1252	+ CreateTexturePanel(textures);
	1253	+
	1254	+ oe.toolboxPanel.add(textures);
	1255	+
	1256	+ textures.preferredHeight = 100;
	1257	+
	1258	+ CreateSkyboxPanel(oe.skyboxPanel);
797	1259
798	1260	// EDIT panel
799	1261	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -801,20 +1263,20 @@
801	1263	editButton.addActionListener(this);
802	1264
803	1265	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
804		- uneditButton.setToolTipText("Remove selection controls");
	1266	+ uneditButton.setToolTipText("Unpin and remove selection controls");
805	1267	uneditButton.addActionListener(this);
806	1268
807	1269	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
808		- allParamsButton.setToolTipText("Show all controle");
	1270	+ allParamsButton.setToolTipText("Show all controls");
809	1271	allParamsButton.addActionListener(this);
810	1272
811		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
812		- clearPanelButton.setToolTipText("Clear edit panel");
	1273	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1274	+ clearPanelButton.setToolTipText("Clear all controls");
813	1275	clearPanelButton.addActionListener(this);
814	1276
815		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
816		- unselectButton.setToolTipText("Unselect");
817		- unselectButton.addActionListener(this);
	1277	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1278	+ //unselectButton.setToolTipText("Unselect");
	1279	+ //unselectButton.addActionListener(this);
818	1280
819	1281	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
820	1282	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -853,8 +1315,8 @@
853	1315	versionSlider = (cNumberSlider)sliderPane.getComponent(1);
854	1316	sliderPane.preferredHeight = 1;
855	1317
856		-// mainPanel.setDividerLocation(0.5); //1.0);
857		-// mainPanel.setResizeWeight(0.5);
	1318	+// mainPanel.setDividerLocation(0.1); //1.0);
	1319	+ mainPanel.setResizeWeight(0.4);
858	1320
859	1321	//jList.addListSelectionListener(this);
860	1322	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -862,7 +1324,7 @@
862	1324	//jTree.setEditable(true);
863	1325	oe.jTree.setDragEnabled(true);
864	1326	//jTree.setPreferredSize(new Dimension(10,10));
865		- jSP.setPreferredSize(new Dimension(100,200));
	1327	+ //jSP.setPreferredSize(new Dimension(100,200));
866	1328
867	1329	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
868	1330
..	..	@@ -874,7 +1336,7 @@
874	1336	dgr.addDragGestureListener(this);
875	1337	}catch(Exception e) {}
876	1338	*/
877		- radio.layout = sixButton; // sevenButton;
	1339	+ radio.layout = threeButton; // sixButton;
878	1340	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
879	1341	}
880	1342
..	..	@@ -925,9 +1387,12 @@
925	1387	smoothCB.setToolTipText("Snapping delay");
926	1388	smoothCB.addItemListener(this);
927	1389
928		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
929		- slowCB.setToolTipText("Smooth interpolation");
930		- slowCB.addItemListener(this);
	1390	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1391	+// slowCB.setToolTipText("Smooth interpolation");
	1392	+// slowCB.addItemListener(this);
	1393	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1394	+ minshaderCB.setToolTipText("Minimal fast shader");
	1395	+ minshaderCB.addItemListener(this);
931	1396
932	1397	// constraints.gridy += 1;
933	1398	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -1006,6 +1471,14 @@
1006	1471
1007	1472	void EditObject(Object3D obj)
1008	1473	{
	1474	+ assert(obj instanceof Composite);
	1475	+
	1476	+// if (obj.versionlist == null)
	1477	+// {
	1478	+// obj.versionlist = new Object3D[100];
	1479	+// obj.versionindex = -1;
	1480	+// }
	1481	+
1009	1482	cRadio radioButton = new cRadio(obj.name);
1010	1483
1011	1484	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1016,7 +1489,7 @@
1016	1489	}
1017	1490
1018	1491	radioButton.SetObject(obj);
1019		- radioButton.layout = sixButton; // sevenButton;
	1492	+ radioButton.layout = threeButton; // sixButton;
1020	1493	radioButton.SetCamera(cameraView.renderCamera, false);
1021	1494	radioButton.addActionListener(this);
1022	1495	radioPanel.add(radioButton);
..	..	@@ -1041,6 +1514,8 @@
1041	1514	cCheckBox localCB;
1042	1515	cCheckBox crowdCB;
1043	1516	cCheckBox smoothCB;
	1517	+ cCheckBox minshaderCB;
	1518	+
1044	1519	cToggleButton fastCB;
1045	1520	cCheckBox slowCB;
1046	1521	cCheckBox boxCB;
..	..	@@ -1111,6 +1586,12 @@
1111	1586	{
1112	1587	cameraView.ToggleInertia();
1113	1588	cameraView.repaint();
	1589	+ }
	1590	+ else if(e.getSource() == minshaderCB)
	1591	+ {
	1592	+ Globals.MINSHADER ^= true;
	1593	+ cameraView.programInitialized = false;
	1594	+ cameraView.repaint();
1114	1595	}
1115	1596	else if(e.getSource() == localCB)
1116	1597	{
..	..	@@ -1388,7 +1869,12 @@
1388	1869	TreePath path;
1389	1870
1390	1871	public TransferableTreePath(TreePath tp) {
1391		- path = tp;
	1872	+ Object[] objs = new Object[tp.getPathCount()];
	1873	+ for (int i=0; i<objs.length; i++)
	1874	+ {
	1875	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1876	+ }
	1877	+ path = new TreePath(objs);
1392	1878	}
1393	1879
1394	1880	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -2134,6 +2620,23 @@
2134	2620	{
2135	2621	makeSomething(new Light());
2136	2622	} else
	2623	+// if (source == skybox1Button \|\|
	2624	+// source == skybox2Button \|\|
	2625	+// source == skybox3Button \|\|
	2626	+// source == skybox4Button \|\|
	2627	+// source == skybox5Button \|\|
	2628	+// source == skybox6Button \|\|
	2629	+// source == skybox7Button \|\|
	2630	+// source == skybox11Button \|\|
	2631	+// source == skybox12Button \|\|
	2632	+// source == skybox13Button \|\|
	2633	+// source == skybox14Button \|\|
	2634	+// source == skybox15Button \|\|
	2635	+// source == skybox16Button \|\|
	2636	+// source == skybox17Button)
	2637	+// {
	2638	+// ChangeSkybox(source);
	2639	+// } else
2137	2640	if (source == csgItem)
2138	2641	{
2139	2642	group(new CSG());
..	..	@@ -2182,27 +2685,35 @@
2182	2685	} else
2183	2686	if (source == loopItem \|\| source == loopButton)
2184	2687	{
	2688	+ if (!group.selection.isEmpty())
	2689	+ {
2185	2690	Composite csg = new GroupLeaf();
2186	2691	csg.count = 5;
2187		- group(csg);
2188	2692	Composite child = new cGroup("Branch");
2189	2693	csg.addChild(child);
2190	2694	child.addChild(csg);
	2695	+ group(csg);
	2696	+ }
2191	2697	} else
2192	2698	if (source == doubleItem)
2193	2699	{
	2700	+ if (!group.selection.isEmpty())
	2701	+ {
2194	2702	Composite csg = new GroupLeaf("Fork");
2195	2703	csg.count = 5;
2196		- group(csg);
2197	2704	Composite child = new cGroup("Branch A");
2198	2705	csg.addChild(child);
2199	2706	child.addChild(csg);
2200	2707	child = new cGroup("Branch B");
2201	2708	csg.addChild(child);
2202	2709	child.addChild(csg);
	2710	+ group(csg);
	2711	+ }
2203	2712	} else
2204	2713	if (source == tripleItem)
2205	2714	{
	2715	+ if (!group.selection.isEmpty())
	2716	+ {
2206	2717	Composite csg = new GroupLeaf("Trident");
2207	2718	csg.count = 4;
2208	2719	group(csg);
..	..	@@ -2215,11 +2726,12 @@
2215	2726	child = new cGroup();
2216	2727	csg.addChild(child);
2217	2728	child.addChild(csg);
	2729	+ }
2218	2730	} else
2219	2731	if (source == computeAOItem)
2220	2732	{
2221	2733	Globals.drawMode = CameraPane.OCCLUSION;
2222		- Globals.theRenderer.repaint();
	2734	+ cameraView.repaint();
2223	2735	} else
2224	2736	if (source == recompileItem)
2225	2737	{
..	..	@@ -2234,7 +2746,7 @@
2234	2746	if (source == invariantsItem)
2235	2747	{
2236	2748	System.out.println("Invariants:");
2237		- Grafreed.grafreeD.universe.invariants();
	2749	+ Grafreed.grafreed.universe.invariants();
2238	2750	} else
2239	2751	if (source == memoryItem)
2240	2752	{
..	..	@@ -2265,33 +2777,52 @@
2265	2777	{
2266	2778	ToggleFullScreen();
2267	2779	} else
2268		- if (source == undoButton)
	2780	+ if (source == collapseButton)
	2781	+ {
	2782	+ this.expandedLayout = radio.layout;
	2783	+ CollapseToolbar();
	2784	+ } else
	2785	+ if (source == maximize3DButton)
	2786	+ {
	2787	+ this.expandedLayout = radio.layout;
	2788	+ radio.layout = twoButton;
	2789	+ Show3DView();
	2790	+ CollapseToolbar();
	2791	+ } else
	2792	+ if (source == previousVersionButton)
2269	2793	{
2270	2794	// Go to previous version
2271	2795	//if (!Undo())
2272	2796	//java.awt.Toolkit.getDefaultToolkit().beep();
2273		- Undo();
	2797	+ PreviousVersion();
2274	2798	} else
2275	2799	if (source == restoreButton)
2276	2800	{
2277	2801	// Restore current version
2278	2802	Restore();
	2803	+ //restoreButton.setEnabled(false);
2279	2804	} else
2280	2805	if (source == replaceButton)
2281	2806	{
2282	2807	// Overwrite current version
2283	2808	Replace();
	2809	+ //replaceButton.setEnabled(false);
2284	2810	} else
2285		- if (source == redoButton)
	2811	+ if (source == nextVersionButton)
2286	2812	{
2287	2813	// Go to next version
2288		- Redo();
	2814	+ NextVersion();
2289	2815	} else
2290		- if (source == saveButton)
	2816	+ if (source == saveVersionButton)
2291	2817	{
2292	2818	// Save a new version
2293	2819	if (!Save(true))
2294	2820	java.awt.Toolkit.getDefaultToolkit().beep();
	2821	+ } else
	2822	+ if (source == deleteVersionButton)
	2823	+ {
	2824	+ // Delete a new version
	2825	+ DeleteVersion();
2295	2826	} else
2296	2827	if (source == oneStepButton)
2297	2828	{
..	..	@@ -2346,11 +2877,11 @@
2346	2877	} else
2347	2878	if (source == undoItem)
2348	2879	{
2349		- Undo();
	2880	+ PreviousVersion();
2350	2881	} else
2351	2882	if (source == redoItem)
2352	2883	{
2353		- Redo();
	2884	+ NextVersion();
2354	2885	} else
2355	2886	if (source == duplicateItem)
2356	2887	{
..	..	@@ -2831,22 +3362,34 @@
2831	3362	} else
2832	3363	if (source == ungroupItem \|\| source == ungroupButton)
2833	3364	{
2834		- boolean hasRoot = false;
	3365	+ boolean canUngroup = true;
2835	3366
2836	3367	for (int i=0; i<group.selection.size(); i++)
2837	3368	{
2838		- if (group.selection.get(i) == group)
	3369	+ Object3D selectedItem = group.selection.get(i);
	3370	+
	3371	+ if (selectedItem.Size() == 0)
2839	3372	{
2840		- hasRoot = true;
	3373	+ // Cannot ungroup leaves
	3374	+ canUngroup = false;
	3375	+ break;
	3376	+ }
	3377	+
	3378	+ if (selectedItem == group)
	3379	+ {
	3380	+ // Cannot ungroup root
	3381	+ canUngroup = false;
2841	3382	break;
2842	3383	}
2843	3384	}
2844	3385
2845		- if (!hasRoot)
	3386	+ if (canUngroup)
2846	3387	{
2847	3388	for (int i=0; i<group.selection.size(); i++)
2848	3389	{
2849		- Ungroup(group.selection.get(i));
	3390	+ Object3D selectedItem = group.selection.get(i);
	3391	+
	3392	+ Ungroup(selectedItem);
2850	3393	}
2851	3394
2852	3395	ClearSelection(false);
..	..	@@ -3153,7 +3696,7 @@
3153	3696	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3154	3697	{
3155	3698	obj = (Object3D)e.nextElement();
3156		- obj.SetBumpTexture(null);
	3699	+ obj.ResetBumpTexture();
3157	3700	}
3158	3701
3159	3702	refreshContents();
..	..	@@ -3167,6 +3710,31 @@
3167	3710	obj.SetBumpTexture(obj.GetPigmentTexture());
3168	3711	}
3169	3712
	3713	+ refreshContents();
	3714	+ } else
	3715	+ if (source == embedTexturesItem)
	3716	+ {
	3717	+ Object3D obj;
	3718	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3719	+ {
	3720	+ obj = (Object3D)e.nextElement();
	3721	+ obj.EmbedTextures(true);
	3722	+ }
	3723	+
	3724	+ refreshContents();
	3725	+ } else
	3726	+ if (source == deEmbedTexturesItem)
	3727	+ {
	3728	+ Object3D obj;
	3729	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3730	+ {
	3731	+ obj = (Object3D)e.nextElement();
	3732	+ obj.EmbedTextures(false);
	3733	+ }
	3734	+
	3735	+ CameraPane.texturepigment.clear();
	3736	+ CameraPane.texturebump.clear();
	3737	+
3170	3738	refreshContents();
3171	3739	} else
3172	3740	if (source == flashSelectionButton)
..	..	@@ -3184,38 +3752,7 @@
3184	3752	if (CameraPane.FULLSCREEN)
3185	3753	fullscreenLayout = radio.layout;
3186	3754
3187		- // bug
3188		- //gridPanel.setDividerLocation(1.0);
3189		- //bigPanel.setDividerLocation(0.0);
3190		-// bigThree.remove(scenePanel);
3191		-// bigThree.remove(centralPanel);
3192		-// bigThree.remove(XYZPanel);
3193		-// aWindowConstraints.gridx = 0;
3194		-// aWindowConstraints.gridy = 0;
3195		-// aWindowConstraints.gridwidth = 1;
3196		-// // aConstraints.gridheight = 3;
3197		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3198		-// aWindowConstraints.weightx = 0;
3199		-// aWindowConstraints.weighty = 1;
3200		-// //bigThree.add(jtp, aWindowConstraints);
3201		-// aWindowConstraints.weightx = 1;
3202		-// aWindowConstraints.gridwidth = 3;
3203		-// // aConstraints.gridheight = 3;
3204		-// aWindowConstraints.gridx = 1;
3205		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3206		-// bigThree.add(centralPanel, aWindowConstraints);
3207		-// aWindowConstraints.weightx = 0;
3208		-// aWindowConstraints.gridx = 4;
3209		-// aWindowConstraints.gridwidth = 1;
3210		-// // aConstraints.gridheight = 3;
3211		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3212		-// //bigThree.add(XYZPanel, aWindowConstraints);
3213		-// scenePanel.setVisible(false);
3214		-// centralPanel.setVisible(true);
3215		-// XYZPanel.setVisible(false);
3216		- bigThree.ClearUI();
3217		- bigThree.add(centralPanel);
3218		- bigThree.FlushUI();
	3755	+ Show3DView();
3219	3756
3220	3757	cameraView.requestFocusInWindow();
3221	3758
..	..	@@ -3270,8 +3807,8 @@
3270	3807	// centralPanel.setVisible(true);
3271	3808	// XYZPanel.setVisible(true);
3272	3809	bigThree.ClearUI();
	3810	+ bigThree.add(scenePanel);
3273	3811	bigThree.add(centralPanel);
3274		- bigThree.add(XYZPanel);
3275	3812	bigThree.FlushUI();
3276	3813
3277	3814	cameraView.requestFocusInWindow();
..	..	@@ -3351,8 +3888,8 @@
3351	3888	// centralPanel.setVisible(true);
3352	3889	// XYZPanel.setVisible(false);
3353	3890	bigThree.ClearUI();
3354		- bigThree.add(scenePanel);
3355	3891	bigThree.add(centralPanel);
	3892	+ bigThree.add(scenePanel);
3356	3893	bigThree.FlushUI();
3357	3894
3358	3895	cameraView.requestFocusInWindow();
..	..	@@ -3401,6 +3938,7 @@
3401	3938	} else
3402	3939	if (source == rootButton)
3403	3940	{
	3941	+ Replace();
3404	3942	Object3D obj;
3405	3943	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3406	3944	{
..	..	@@ -3458,10 +3996,10 @@
3458	3996	{
3459	3997	Object3D child = (Object3D)e.nextElement();
3460	3998	if(child.editWindow != null)
3461		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3462	3999	child.pinned = false;
3463	4000	child.CloseUI();
3464	4001	listUI.remove(child);
	4002	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3465	4003
3466	4004	//child.editWindow = null; // ???????????
3467	4005	}
..	..	@@ -3480,6 +4018,7 @@
3480	4018	obj.CloseUI();
3481	4019	}
3482	4020	listUI.clear();
	4021	+ SetPinStates(group.selection.size() > 0);
3483	4022	refreshContents(true);
3484	4023	} else
3485	4024	if (source == allParamsButton)
..	..	@@ -3536,8 +4075,6 @@
3536	4075
3537	4076	copy = group;
3538	4077
3539		- SetUndoStates();
3540		-
3541	4078	//Globals.theRenderer.object = group;
3542	4079	if(!useclient)
3543	4080	{
..	..	@@ -3565,7 +4102,20 @@
3565	4102	*/
3566	4103	radio.layout.doClick();
3567	4104
	4105	+ assert(copy instanceof Composite);
	4106	+
	4107	+ if (copy.versionlist == null)
	4108	+ {
	4109	+ copy.versionlist = new Object3D[100];
	4110	+ copy.versionindex = -1;
	4111	+
	4112	+ Save(true);
	4113	+ }
	4114	+
	4115	+ SetVersionStates();
	4116	+
3568	4117	ClearUnpinned();
	4118	+
3569	4119	//Grafreed.Assert(group != null);
3570	4120	//Grafreed.Assert(group.selection != null);
3571	4121	SetPinStates(group.selection == null \|\| group.selection.size() > 0);
..	..	@@ -3582,11 +4132,13 @@
3582	4132	} else if (event.getSource() == editCameraItem)
3583	4133	{
3584	4134	cameraView.ProtectCamera();
	4135	+ cameraView.requestFocusInWindow();
3585	4136	cameraView.repaint();
3586	4137	return;
3587	4138	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3588	4139	{
3589	4140	cameraView.RevertCamera();
	4141	+ cameraView.requestFocusInWindow();
3590	4142	cameraView.repaint();
3591	4143	return;
3592	4144	// } else if (event.getSource() == textureButton)
..	..	@@ -4163,7 +4715,7 @@
4163	4715
4164	4716	try
4165	4717	{
4166		- texturedata = Globals.theRenderer.GetTextureData(tex.pigmenttexture, pigment, false, node.texres);
	4718	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4167	4719	}
4168	4720	catch (Exception e)
4169	4721	{
..	..	@@ -4719,9 +5271,7 @@
4719	5271
4720	5272	freezemodel = false;
4721	5273	}
4722		-
4723		- boolean flashIt = true;
4724		-
	5274	+
4725	5275	public void valueChanged(TreeSelectionEvent e)
4726	5276	//public boolean handleEvent(Event event)
4727	5277	{
..	..	@@ -4794,13 +5344,29 @@
4794	5344	{
4795	5345	editButton.setEnabled(enabled);
4796	5346	uneditButton.setEnabled(enabled);
4797		- unselectButton.setEnabled(enabled);
	5347	+ //unselectButton.setEnabled(enabled);
4798	5348	flashSelectionButton.setEnabled(enabled);
	5349	+
	5350	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5351	+
	5352	+ boolean allComposites = true;
	5353	+
	5354	+ if (group.selection != null)
	5355	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5356	+ {
	5357	+ if (!(e.nextElement() instanceof Composite))
	5358	+ {
	5359	+ allComposites = false;
	5360	+ break;
	5361	+ }
	5362	+ }
	5363	+
	5364	+ rootButton.setEnabled(allComposites);
4799	5365	}
4800	5366
4801	5367	void refreshContents(boolean cp)
4802	5368	{
4803		- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5369	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4804	5370	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4805	5371	{
4806	5372	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -4810,7 +5376,7 @@
4810	5376	Object3D child = (Object3D) group.selection.get(i);
4811	5377
4812	5378	objEditor.AddInfo(child, this, true);
4813		- System.err.println("info : " + child.GetPath());
	5379	+// System.err.println("info : " + child.GetPath());
4814	5380	}
4815	5381
4816	5382	objEditor.SetText(); // jan 2014
..	..	@@ -5636,7 +6202,6 @@
5636	6202
5637	6203	cButton restoreCameraButton;
5638	6204
5639		- cButton saveButton;
5640	6205	cButton oneStepButton;
5641	6206
5642	6207	cButton groupButton;
..	..	@@ -5645,6 +6210,22 @@
5645	6210	cButton switchButton;
5646	6211	cButton loopButton;
5647	6212	cButton textureButton;
	6213	+
	6214	+ cButton skybox1Button;
	6215	+ cButton skybox2Button;
	6216	+ cButton skybox3Button;
	6217	+ cButton skybox4Button;
	6218	+ cButton skybox5Button;
	6219	+ cButton skybox6Button;
	6220	+ cButton skybox7Button;
	6221	+
	6222	+ cButton skybox11Button;
	6223	+ cButton skybox12Button;
	6224	+ cButton skybox13Button;
	6225	+ cButton skybox14Button;
	6226	+ cButton skybox15Button;
	6227	+ cButton skybox16Button;
	6228	+ cButton skybox17Button;
5648	6229
5649	6230	cButton gridButton;
5650	6231	cButton boxButton;
..	..	@@ -5678,11 +6259,11 @@
5678	6259	private MenuItem lookAtItem;
5679	6260	private MenuItem lookFromItem;
5680	6261	private MenuItem switchViewItem;
5681		- private MenuItem cutItem;
	6262	+ private JMenuItem cutItem;
5682	6263	private MenuItem undoItem;
5683	6264	private MenuItem redoItem;
5684	6265	private JMenuItem duplicateItem;
5685		- private MenuItem cloneItem;
	6266	+ private JMenuItem cloneItem;
5686	6267	private MenuItem cloneSupportItem;
5687	6268	private MenuItem overwriteGeoItem;
5688	6269	private MenuItem overwriteMatItem;
..	..	@@ -5703,13 +6284,13 @@
5703	6284	private MenuItem cloneGeometriesItem;
5704	6285	private MenuItem shareGeometriesItem;
5705	6286	private MenuItem mergeGeometriesItem;
5706		- private MenuItem copyItem;
	6287	+ private JMenuItem copyItem;
5707	6288	private MenuItem pasteItem;
5708		- private MenuItem pasteIntoItem;
5709		- private MenuItem pasteLinkItem;
5710		- private MenuItem pasteCloneItem;
5711		- private MenuItem pasteExpandItem;
5712		- private MenuItem deleteItem;
	6289	+ private JMenuItem pasteIntoItem;
	6290	+ private JMenuItem pasteLinkItem;
	6291	+ private JMenuItem pasteCloneItem;
	6292	+ private JMenuItem pasteExpandItem;
	6293	+ private JMenuItem deleteItem;
5713	6294	private MenuItem clearAllItem;
5714	6295	private MenuItem genUVItem;
5715	6296	private MenuItem genNormalsMESHItem;
..	..	@@ -5777,7 +6358,7 @@
5777	6358	private MenuItem switchTransfoItem;
5778	6359	private MenuItem morphItem;
5779	6360	private MenuItem linkerItem;
5780		- private MenuItem ungroupItem;
	6361	+ private JMenuItem ungroupItem;
5781	6362	private MenuItem editItem;
5782	6363	private MenuItem openWindowItem;
5783	6364	private MenuItem editLeafItem;
..	..	@@ -5793,6 +6374,8 @@
5793	6374	private MenuItem attachBumpItem;
5794	6375	private MenuItem detachBumpItem;
5795	6376	private MenuItem pigmentBumpItem;
	6377	+ private MenuItem embedTexturesItem;
	6378	+ private MenuItem deEmbedTexturesItem;
5796	6379
5797	6380	private MenuItem particleItem;
5798	6381	private MenuItem ragdollItem;