~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,74 @@
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 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	949	+ {
	950	+ currenttab = new cGridBag();
	951	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	952	+ currenttab.setName(tabname);
	953	+ //added = false;
	954	+ resourcecontainer.add(currenttab);
	955	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	956	+ rowcount = 1;
	957	+ colcount = 0;
	958	+ texturecount = 0;
	959	+ }
	960	+
	961	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	962	+ {
	963	+ //if (!added)
	964	+ {
	965	+ //added = true;
	966	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	967	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	968	+ }
	969	+
	970	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	971	+
	972	+ if (++colcount >= columns)
	973	+ {
	974	+ colcount = 0;
	975	+ currenttab.Return();
	976	+
	977	+ if (rowcount++ >= rows)
	978	+ {
	979	+ rowcount = 0;
	980	+ }
	981	+ }
	982	+ }
	983	+ else
	984	+ {
	985	+// if (!path[path.length-1].equals("icons"))
	986	+// resourcecontainer.Return();
	987	+ }
	988	+ }
	989	+
	990	+ void CreateTexturePanel(cGridBag container)
	991	+ {
	992	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	993	+ container.add(resourcecontainer);
	994	+
	995	+ Grafreed.ParseResources("textures", this);
	996	+ }
561	997
562	998	void SetupUI2(ObjEditor oe)
563	999	{
..	..	@@ -576,11 +1012,6 @@
576	1012	//new Exception().printStackTrace();
577	1013
578	1014	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	1015	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
585	1016
586	1017	oe.buttonGroup = new ButtonGroup();
..	..	@@ -603,7 +1034,7 @@
603	1034	*/
604	1035	cGridBag copyOptionsPanel = new cGridBag();
605	1036
606		- copyOptionsPanel.preferredHeight = 1;
	1037	+ copyOptionsPanel.preferredHeight = 2;
607	1038
608	1039	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
609	1040
..	..	@@ -613,10 +1044,49 @@
613	1044
614	1045	if (Globals.ADVANCED)
615	1046	{
616		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
617		- maxButton.setToolTipText("Maximize window");
618		- maxButton.addActionListener(this);
	1047	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1048	+// maxButton.setToolTipText("Maximize window");
	1049	+// maxButton.addActionListener(this);
619	1050	}
	1051	+
	1052	+ cButton gcButton;
	1053	+
	1054	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1055	+// gcButton.setToolTipText("Garbage collect");
	1056	+// gcButton.addActionListener(new ActionListener()
	1057	+// {
	1058	+// public void actionPerformed(ActionEvent e)
	1059	+// {
	1060	+// System.gc();
	1061	+// }
	1062	+// });
	1063	+
	1064	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1065	+ collapseButton.setToolTipText("Collapse toolbar");
	1066	+ collapseButton.addActionListener(this);
	1067	+
	1068	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1069	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1070	+ maximize3DButton.addActionListener(this);
	1071	+
	1072	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1073	+ twoButton.setToolTipText("Show 3D view only");
	1074	+ twoButton.addActionListener(this);
	1075	+ this.fullscreenLayout = twoButton;
	1076	+
	1077	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1078	+ threeButton.setToolTipText("Show controls and 3D view");
	1079	+ threeButton.addActionListener(this);
	1080	+ if (Globals.ADVANCED)
	1081	+ {
	1082	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1083	+ sixButton.setToolTipText("Show 3D view and controls");
	1084	+ sixButton.addActionListener(this);
	1085	+ }
	1086	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1087	+// sevenButton.setToolTipText("3-column layout");
	1088	+// sevenButton.addActionListener(this);
	1089	+ //
620	1090
621	1091	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
622	1092	fullButton.setToolTipText("Full-screen window");
..	..	@@ -630,41 +1100,45 @@
630	1100	restoreCameraButton.setToolTipText("Restore viewpoint");
631	1101	restoreCameraButton.addActionListener(this);
632	1102
633		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- saveButton.setToolTipText("New version");
635		- saveButton.addActionListener(this);
	1103	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1104	+ saveVersionButton.setToolTipText("Duplicate current version");
	1105	+ saveVersionButton.addActionListener(this);
636	1106
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);
	1107	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1108	+ deleteVersionButton.setToolTipText("Delete current version");
	1109	+ deleteVersionButton.addActionListener(this);
	1110	+
	1111	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ previousVersionButton.setToolTipText("Previous version");
	1113	+ previousVersionButton.addActionListener(this);
	1114	+ previousVersionButton.setEnabled(false);
641	1115
642	1116	cGridBag updown = new cGridBag().setVertical(true);
643	1117	updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
644		- restoreButton.setToolTipText("Restore current");
	1118	+ restoreButton.setToolTipText("Undo (restore current version)");
645	1119	restoreButton.addActionListener(this);
646		- restoreButton.setEnabled(false);
	1120	+ //restoreButton.setEnabled(false);
647	1121
648	1122	updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
649		- replaceButton.setToolTipText("Replace current");
	1123	+ replaceButton.setToolTipText("Save (replace current version)");
650	1124	replaceButton.addActionListener(this);
651		- replaceButton.setEnabled(false);
	1125	+ //replaceButton.setEnabled(false);
652	1126
653	1127	copyOptionsPanel.add(updown);
654	1128
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);
	1129	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ nextVersionButton.setToolTipText("Next version");
	1131	+ nextVersionButton.addActionListener(this);
	1132	+ nextVersionButton.setEnabled(false);
	1133	+
	1134	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1135	+ oneStepButton.setToolTipText("Animate one step forward");
	1136	+ oneStepButton.addActionListener(this);
659	1137
660	1138	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
661	1139	liveCB.setToolTipText("Enable animation");
662	1140	liveCB.addItemListener(this);
663	1141
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	1142	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
669	1143	fastCB.setToolTipText("Fast mode");
670	1144	fastCB.addItemListener(this);
..	..	@@ -683,29 +1157,14 @@
683	1157	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
684	1158	snapobjectButton.addActionListener(this);
685	1159	snapobjectButton.setToolTipText("Snap Object");
	1160	+
	1161	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1162	+ fourButton.addActionListener(this);
	1163	+ fourButton.setToolTipText("Show control panel only");
686	1164	}
687	1165
688	1166	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
689	1167
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	1168
710	1169	oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
711	1170	rootButton.setToolTipText("Open selection in new tab");
..	..	@@ -717,30 +1176,32 @@
717	1176	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
718	1177	//clearButton.addActionListener(this);
719	1178
	1179	+ cGridBag row1 = new cGridBag();
	1180	+
720	1181	// INSERT
721		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
722		- gridButton.setToolTipText("Create grid");
	1182	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1183	+ gridButton.setToolTipText("Create ground");
723	1184	gridButton.addActionListener(this);
724	1185
725		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1186	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
726	1187	boxButton.setToolTipText("Create box");
727	1188	boxButton.addActionListener(this);
728	1189
729		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ superButton.setToolTipText("Create superellipsoid");
	1192	+ superButton.addActionListener(this);
	1193	+
	1194	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
730	1195	sphereButton.setToolTipText("Create sphere");
731	1196	sphereButton.addActionListener(this);
732	1197
733		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
734	1199	coneButton.setToolTipText("Create cone");
735	1200	coneButton.addActionListener(this);
736	1201
737		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1202	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
738	1203	torusButton.setToolTipText("Create torus");
739	1204	torusButton.addActionListener(this);
740		-
741		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
742		- superButton.setToolTipText("Create superellipsoid");
743		- superButton.addActionListener(this);
744	1205
745	1206	if (Globals.ADVANCED)
746	1207	{
..	..	@@ -749,51 +1210,53 @@
749	1210	kleinButton.addActionListener(this);
750	1211	}
751	1212
752		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1213	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
753	1214	particlesButton.setToolTipText("Create particle system");
754	1215	particlesButton.addActionListener(this);
755	1216
756		- oe.toolboxPanel.Return();
	1217	+ oe.toolboxPanel.add(row1);
757	1218
758		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1219	+ cGridBag row2 = new cGridBag();
	1220	+
	1221	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
759	1222	groupButton.setToolTipText("Create group");
760	1223	groupButton.addActionListener(this);
761	1224
762		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1225	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
763	1226	compositeButton.setToolTipText("Create composite");
764	1227	compositeButton.addActionListener(this);
765	1228
766		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1229	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
767	1230	switchButton.setToolTipText("Create item switcher");
768	1231	switchButton.addActionListener(this);
769	1232
770		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
771	1234	loopButton.setToolTipText("Create loop");
772	1235	loopButton.addActionListener(this);
773	1236
774		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
775	1238	textureButton.setToolTipText("Create texture");
776	1239	textureButton.addActionListener(this);
777	1240
778		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1241	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
779	1242	overlayButton.setToolTipText("Create overlay");
780	1243	overlayButton.addActionListener(this);
781	1244
782		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1245	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
783	1246	lightButton.setToolTipText("Create light");
784	1247	lightButton.addActionListener(this);
785	1248
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		- }
	1249	+ oe.toolboxPanel.add(row2);
	1250	+
	1251	+ cGridBag textures = new cGridBag();
	1252	+
	1253	+ CreateTexturePanel(textures);
	1254	+
	1255	+ oe.toolboxPanel.add(textures);
	1256	+
	1257	+ textures.preferredHeight = 100;
	1258	+
	1259	+ CreateSkyboxPanel(oe.skyboxPanel);
797	1260
798	1261	// EDIT panel
799	1262	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -801,20 +1264,20 @@
801	1264	editButton.addActionListener(this);
802	1265
803	1266	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
804		- uneditButton.setToolTipText("Remove selection controls");
	1267	+ uneditButton.setToolTipText("Unpin and remove selection controls");
805	1268	uneditButton.addActionListener(this);
806	1269
807	1270	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
808		- allParamsButton.setToolTipText("Show all controle");
	1271	+ allParamsButton.setToolTipText("Show all controls");
809	1272	allParamsButton.addActionListener(this);
810	1273
811		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
812		- clearPanelButton.setToolTipText("Clear edit panel");
	1274	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1275	+ clearPanelButton.setToolTipText("Clear all controls");
813	1276	clearPanelButton.addActionListener(this);
814	1277
815		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
816		- unselectButton.setToolTipText("Unselect");
817		- unselectButton.addActionListener(this);
	1278	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ //unselectButton.setToolTipText("Unselect");
	1280	+ //unselectButton.addActionListener(this);
818	1281
819	1282	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
820	1283	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -853,8 +1316,8 @@
853	1316	versionSlider = (cNumberSlider)sliderPane.getComponent(1);
854	1317	sliderPane.preferredHeight = 1;
855	1318
856		-// mainPanel.setDividerLocation(0.5); //1.0);
857		-// mainPanel.setResizeWeight(0.5);
	1319	+// mainPanel.setDividerLocation(0.1); //1.0);
	1320	+ mainPanel.setResizeWeight(0.4);
858	1321
859	1322	//jList.addListSelectionListener(this);
860	1323	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -862,7 +1325,7 @@
862	1325	//jTree.setEditable(true);
863	1326	oe.jTree.setDragEnabled(true);
864	1327	//jTree.setPreferredSize(new Dimension(10,10));
865		- jSP.setPreferredSize(new Dimension(100,200));
	1328	+ //jSP.setPreferredSize(new Dimension(100,200));
866	1329
867	1330	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
868	1331
..	..	@@ -874,7 +1337,7 @@
874	1337	dgr.addDragGestureListener(this);
875	1338	}catch(Exception e) {}
876	1339	*/
877		- radio.layout = sixButton; // sevenButton;
	1340	+ radio.layout = threeButton; // sixButton;
878	1341	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
879	1342	}
880	1343
..	..	@@ -925,9 +1388,12 @@
925	1388	smoothCB.setToolTipText("Snapping delay");
926	1389	smoothCB.addItemListener(this);
927	1390
928		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
929		- slowCB.setToolTipText("Smooth interpolation");
930		- slowCB.addItemListener(this);
	1391	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1392	+// slowCB.setToolTipText("Smooth interpolation");
	1393	+// slowCB.addItemListener(this);
	1394	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1395	+ minshaderCB.setToolTipText("Minimal fast shader");
	1396	+ minshaderCB.addItemListener(this);
931	1397
932	1398	// constraints.gridy += 1;
933	1399	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -1006,6 +1472,14 @@
1006	1472
1007	1473	void EditObject(Object3D obj)
1008	1474	{
	1475	+ assert(obj instanceof Composite);
	1476	+
	1477	+// if (obj.versionlist == null)
	1478	+// {
	1479	+// obj.versionlist = new Object3D[100];
	1480	+// obj.versionindex = -1;
	1481	+// }
	1482	+
1009	1483	cRadio radioButton = new cRadio(obj.name);
1010	1484
1011	1485	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1016,7 +1490,7 @@
1016	1490	}
1017	1491
1018	1492	radioButton.SetObject(obj);
1019		- radioButton.layout = sixButton; // sevenButton;
	1493	+ radioButton.layout = threeButton; // sixButton;
1020	1494	radioButton.SetCamera(cameraView.renderCamera, false);
1021	1495	radioButton.addActionListener(this);
1022	1496	radioPanel.add(radioButton);
..	..	@@ -1041,6 +1515,8 @@
1041	1515	cCheckBox localCB;
1042	1516	cCheckBox crowdCB;
1043	1517	cCheckBox smoothCB;
	1518	+ cCheckBox minshaderCB;
	1519	+
1044	1520	cToggleButton fastCB;
1045	1521	cCheckBox slowCB;
1046	1522	cCheckBox boxCB;
..	..	@@ -1111,6 +1587,12 @@
1111	1587	{
1112	1588	cameraView.ToggleInertia();
1113	1589	cameraView.repaint();
	1590	+ }
	1591	+ else if(e.getSource() == minshaderCB)
	1592	+ {
	1593	+ Globals.MINSHADER ^= true;
	1594	+ cameraView.programInitialized = false;
	1595	+ cameraView.repaint();
1114	1596	}
1115	1597	else if(e.getSource() == localCB)
1116	1598	{
..	..	@@ -1388,7 +1870,12 @@
1388	1870	TreePath path;
1389	1871
1390	1872	public TransferableTreePath(TreePath tp) {
1391		- path = tp;
	1873	+ Object[] objs = new Object[tp.getPathCount()];
	1874	+ for (int i=0; i<objs.length; i++)
	1875	+ {
	1876	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1877	+ }
	1878	+ path = new TreePath(objs);
1392	1879	}
1393	1880
1394	1881	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1678,7 +2165,11 @@
1678	2165	shadow.material = new cMaterial(obj.material);
1679	2166	shadow.material.diffuse = 0.0001f;
1680	2167	shadow.material.specular = 0.0001f;
1681		- //shadow.projectedVertices[1].x = 300;
	2168	+ shadow.material.opacity = 0.75f;
	2169	+
	2170	+ AllocProjectedVertices(shadow);
	2171	+
	2172	+ shadow.projectedVertices[1].x = 300;
1682	2173
1683	2174	makeSomething(shadow);
1684	2175	}
..	..	@@ -2134,6 +2625,23 @@
2134	2625	{
2135	2626	makeSomething(new Light());
2136	2627	} else
	2628	+// if (source == skybox1Button \|\|
	2629	+// source == skybox2Button \|\|
	2630	+// source == skybox3Button \|\|
	2631	+// source == skybox4Button \|\|
	2632	+// source == skybox5Button \|\|
	2633	+// source == skybox6Button \|\|
	2634	+// source == skybox7Button \|\|
	2635	+// source == skybox11Button \|\|
	2636	+// source == skybox12Button \|\|
	2637	+// source == skybox13Button \|\|
	2638	+// source == skybox14Button \|\|
	2639	+// source == skybox15Button \|\|
	2640	+// source == skybox16Button \|\|
	2641	+// source == skybox17Button)
	2642	+// {
	2643	+// ChangeSkybox(source);
	2644	+// } else
2137	2645	if (source == csgItem)
2138	2646	{
2139	2647	group(new CSG());
..	..	@@ -2182,27 +2690,35 @@
2182	2690	} else
2183	2691	if (source == loopItem \|\| source == loopButton)
2184	2692	{
	2693	+ if (!group.selection.isEmpty())
	2694	+ {
2185	2695	Composite csg = new GroupLeaf();
2186	2696	csg.count = 5;
2187		- group(csg);
2188	2697	Composite child = new cGroup("Branch");
2189	2698	csg.addChild(child);
2190	2699	child.addChild(csg);
	2700	+ group(csg);
	2701	+ }
2191	2702	} else
2192	2703	if (source == doubleItem)
2193	2704	{
	2705	+ if (!group.selection.isEmpty())
	2706	+ {
2194	2707	Composite csg = new GroupLeaf("Fork");
2195	2708	csg.count = 5;
2196		- group(csg);
2197	2709	Composite child = new cGroup("Branch A");
2198	2710	csg.addChild(child);
2199	2711	child.addChild(csg);
2200	2712	child = new cGroup("Branch B");
2201	2713	csg.addChild(child);
2202	2714	child.addChild(csg);
	2715	+ group(csg);
	2716	+ }
2203	2717	} else
2204	2718	if (source == tripleItem)
2205	2719	{
	2720	+ if (!group.selection.isEmpty())
	2721	+ {
2206	2722	Composite csg = new GroupLeaf("Trident");
2207	2723	csg.count = 4;
2208	2724	group(csg);
..	..	@@ -2215,11 +2731,12 @@
2215	2731	child = new cGroup();
2216	2732	csg.addChild(child);
2217	2733	child.addChild(csg);
	2734	+ }
2218	2735	} else
2219	2736	if (source == computeAOItem)
2220	2737	{
2221	2738	Globals.drawMode = CameraPane.OCCLUSION;
2222		- Globals.theRenderer.repaint();
	2739	+ cameraView.repaint();
2223	2740	} else
2224	2741	if (source == recompileItem)
2225	2742	{
..	..	@@ -2234,7 +2751,7 @@
2234	2751	if (source == invariantsItem)
2235	2752	{
2236	2753	System.out.println("Invariants:");
2237		- Grafreed.grafreeD.universe.invariants();
	2754	+ Grafreed.grafreed.universe.invariants();
2238	2755	} else
2239	2756	if (source == memoryItem)
2240	2757	{
..	..	@@ -2265,33 +2782,52 @@
2265	2782	{
2266	2783	ToggleFullScreen();
2267	2784	} else
2268		- if (source == undoButton)
	2785	+ if (source == collapseButton)
	2786	+ {
	2787	+ this.expandedLayout = radio.layout;
	2788	+ CollapseToolbar();
	2789	+ } else
	2790	+ if (source == maximize3DButton)
	2791	+ {
	2792	+ this.expandedLayout = radio.layout;
	2793	+ radio.layout = twoButton;
	2794	+ Show3DView();
	2795	+ CollapseToolbar();
	2796	+ } else
	2797	+ if (source == previousVersionButton)
2269	2798	{
2270	2799	// Go to previous version
2271	2800	//if (!Undo())
2272	2801	//java.awt.Toolkit.getDefaultToolkit().beep();
2273		- Undo();
	2802	+ PreviousVersion();
2274	2803	} else
2275	2804	if (source == restoreButton)
2276	2805	{
2277	2806	// Restore current version
2278	2807	Restore();
	2808	+ //restoreButton.setEnabled(false);
2279	2809	} else
2280	2810	if (source == replaceButton)
2281	2811	{
2282	2812	// Overwrite current version
2283	2813	Replace();
	2814	+ //replaceButton.setEnabled(false);
2284	2815	} else
2285		- if (source == redoButton)
	2816	+ if (source == nextVersionButton)
2286	2817	{
2287	2818	// Go to next version
2288		- Redo();
	2819	+ NextVersion();
2289	2820	} else
2290		- if (source == saveButton)
	2821	+ if (source == saveVersionButton)
2291	2822	{
2292	2823	// Save a new version
2293	2824	if (!Save(true))
2294	2825	java.awt.Toolkit.getDefaultToolkit().beep();
	2826	+ } else
	2827	+ if (source == deleteVersionButton)
	2828	+ {
	2829	+ // Delete a new version
	2830	+ DeleteVersion();
2295	2831	} else
2296	2832	if (source == oneStepButton)
2297	2833	{
..	..	@@ -2346,11 +2882,11 @@
2346	2882	} else
2347	2883	if (source == undoItem)
2348	2884	{
2349		- Undo();
	2885	+ PreviousVersion();
2350	2886	} else
2351	2887	if (source == redoItem)
2352	2888	{
2353		- Redo();
	2889	+ NextVersion();
2354	2890	} else
2355	2891	if (source == duplicateItem)
2356	2892	{
..	..	@@ -2831,22 +3367,34 @@
2831	3367	} else
2832	3368	if (source == ungroupItem \|\| source == ungroupButton)
2833	3369	{
2834		- boolean hasRoot = false;
	3370	+ boolean canUngroup = true;
2835	3371
2836	3372	for (int i=0; i<group.selection.size(); i++)
2837	3373	{
2838		- if (group.selection.get(i) == group)
	3374	+ Object3D selectedItem = group.selection.get(i);
	3375	+
	3376	+ if (selectedItem.Size() == 0)
2839	3377	{
2840		- hasRoot = true;
	3378	+ // Cannot ungroup leaves
	3379	+ canUngroup = false;
	3380	+ break;
	3381	+ }
	3382	+
	3383	+ if (selectedItem == group)
	3384	+ {
	3385	+ // Cannot ungroup root
	3386	+ canUngroup = false;
2841	3387	break;
2842	3388	}
2843	3389	}
2844	3390
2845		- if (!hasRoot)
	3391	+ if (canUngroup)
2846	3392	{
2847	3393	for (int i=0; i<group.selection.size(); i++)
2848	3394	{
2849		- Ungroup(group.selection.get(i));
	3395	+ Object3D selectedItem = group.selection.get(i);
	3396	+
	3397	+ Ungroup(selectedItem);
2850	3398	}
2851	3399
2852	3400	ClearSelection(false);
..	..	@@ -3153,7 +3701,7 @@
3153	3701	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3154	3702	{
3155	3703	obj = (Object3D)e.nextElement();
3156		- obj.SetBumpTexture(null);
	3704	+ obj.ResetBumpTexture();
3157	3705	}
3158	3706
3159	3707	refreshContents();
..	..	@@ -3167,6 +3715,31 @@
3167	3715	obj.SetBumpTexture(obj.GetPigmentTexture());
3168	3716	}
3169	3717
	3718	+ refreshContents();
	3719	+ } else
	3720	+ if (source == embedTexturesItem)
	3721	+ {
	3722	+ Object3D obj;
	3723	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3724	+ {
	3725	+ obj = (Object3D)e.nextElement();
	3726	+ obj.EmbedTextures(true);
	3727	+ }
	3728	+
	3729	+ refreshContents();
	3730	+ } else
	3731	+ if (source == deEmbedTexturesItem)
	3732	+ {
	3733	+ Object3D obj;
	3734	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3735	+ {
	3736	+ obj = (Object3D)e.nextElement();
	3737	+ obj.EmbedTextures(false);
	3738	+ }
	3739	+
	3740	+ CameraPane.texturepigment.clear();
	3741	+ CameraPane.texturebump.clear();
	3742	+
3170	3743	refreshContents();
3171	3744	} else
3172	3745	if (source == flashSelectionButton)
..	..	@@ -3184,38 +3757,7 @@
3184	3757	if (CameraPane.FULLSCREEN)
3185	3758	fullscreenLayout = radio.layout;
3186	3759
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();
	3760	+ Show3DView();
3219	3761
3220	3762	cameraView.requestFocusInWindow();
3221	3763
..	..	@@ -3270,8 +3812,8 @@
3270	3812	// centralPanel.setVisible(true);
3271	3813	// XYZPanel.setVisible(true);
3272	3814	bigThree.ClearUI();
	3815	+ bigThree.add(scenePanel);
3273	3816	bigThree.add(centralPanel);
3274		- bigThree.add(XYZPanel);
3275	3817	bigThree.FlushUI();
3276	3818
3277	3819	cameraView.requestFocusInWindow();
..	..	@@ -3351,8 +3893,8 @@
3351	3893	// centralPanel.setVisible(true);
3352	3894	// XYZPanel.setVisible(false);
3353	3895	bigThree.ClearUI();
3354		- bigThree.add(scenePanel);
3355	3896	bigThree.add(centralPanel);
	3897	+ bigThree.add(scenePanel);
3356	3898	bigThree.FlushUI();
3357	3899
3358	3900	cameraView.requestFocusInWindow();
..	..	@@ -3401,6 +3943,7 @@
3401	3943	} else
3402	3944	if (source == rootButton)
3403	3945	{
	3946	+ Replace();
3404	3947	Object3D obj;
3405	3948	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3406	3949	{
..	..	@@ -3458,10 +4001,10 @@
3458	4001	{
3459	4002	Object3D child = (Object3D)e.nextElement();
3460	4003	if(child.editWindow != null)
3461		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3462	4004	child.pinned = false;
3463	4005	child.CloseUI();
3464	4006	listUI.remove(child);
	4007	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3465	4008
3466	4009	//child.editWindow = null; // ???????????
3467	4010	}
..	..	@@ -3480,6 +4023,7 @@
3480	4023	obj.CloseUI();
3481	4024	}
3482	4025	listUI.clear();
	4026	+ SetPinStates(group.selection.size() > 0);
3483	4027	refreshContents(true);
3484	4028	} else
3485	4029	if (source == allParamsButton)
..	..	@@ -3536,8 +4080,6 @@
3536	4080
3537	4081	copy = group;
3538	4082
3539		- SetUndoStates();
3540		-
3541	4083	//Globals.theRenderer.object = group;
3542	4084	if(!useclient)
3543	4085	{
..	..	@@ -3565,7 +4107,20 @@
3565	4107	*/
3566	4108	radio.layout.doClick();
3567	4109
	4110	+ assert(copy instanceof Composite);
	4111	+
	4112	+ if (copy.versionlist == null)
	4113	+ {
	4114	+ copy.versionlist = new Object3D[100];
	4115	+ copy.versionindex = -1;
	4116	+
	4117	+ Save(true);
	4118	+ }
	4119	+
	4120	+ SetVersionStates();
	4121	+
3568	4122	ClearUnpinned();
	4123	+
3569	4124	//Grafreed.Assert(group != null);
3570	4125	//Grafreed.Assert(group.selection != null);
3571	4126	SetPinStates(group.selection == null \|\| group.selection.size() > 0);
..	..	@@ -3582,11 +4137,13 @@
3582	4137	} else if (event.getSource() == editCameraItem)
3583	4138	{
3584	4139	cameraView.ProtectCamera();
	4140	+ cameraView.requestFocusInWindow();
3585	4141	cameraView.repaint();
3586	4142	return;
3587	4143	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3588	4144	{
3589	4145	cameraView.RevertCamera();
	4146	+ cameraView.requestFocusInWindow();
3590	4147	cameraView.repaint();
3591	4148	return;
3592	4149	// } else if (event.getSource() == textureButton)
..	..	@@ -4163,7 +4720,7 @@
4163	4720
4164	4721	try
4165	4722	{
4166		- texturedata = Globals.theRenderer.GetTextureData(tex.pigmenttexture, pigment, false, node.texres);
	4723	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4167	4724	}
4168	4725	catch (Exception e)
4169	4726	{
..	..	@@ -4719,9 +5276,7 @@
4719	5276
4720	5277	freezemodel = false;
4721	5278	}
4722		-
4723		- boolean flashIt = true;
4724		-
	5279	+
4725	5280	public void valueChanged(TreeSelectionEvent e)
4726	5281	//public boolean handleEvent(Event event)
4727	5282	{
..	..	@@ -4794,13 +5349,29 @@
4794	5349	{
4795	5350	editButton.setEnabled(enabled);
4796	5351	uneditButton.setEnabled(enabled);
4797		- unselectButton.setEnabled(enabled);
	5352	+ //unselectButton.setEnabled(enabled);
4798	5353	flashSelectionButton.setEnabled(enabled);
	5354	+
	5355	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5356	+
	5357	+ boolean allComposites = true;
	5358	+
	5359	+ if (group.selection != null)
	5360	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5361	+ {
	5362	+ if (!(e.nextElement() instanceof Composite))
	5363	+ {
	5364	+ allComposites = false;
	5365	+ break;
	5366	+ }
	5367	+ }
	5368	+
	5369	+ rootButton.setEnabled(allComposites);
4799	5370	}
4800	5371
4801	5372	void refreshContents(boolean cp)
4802	5373	{
4803		- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5374	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4804	5375	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4805	5376	{
4806	5377	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -4810,7 +5381,7 @@
4810	5381	Object3D child = (Object3D) group.selection.get(i);
4811	5382
4812	5383	objEditor.AddInfo(child, this, true);
4813		- System.err.println("info : " + child.GetPath());
	5384	+// System.err.println("info : " + child.GetPath());
4814	5385	}
4815	5386
4816	5387	objEditor.SetText(); // jan 2014
..	..	@@ -5636,7 +6207,6 @@
5636	6207
5637	6208	cButton restoreCameraButton;
5638	6209
5639		- cButton saveButton;
5640	6210	cButton oneStepButton;
5641	6211
5642	6212	cButton groupButton;
..	..	@@ -5645,6 +6215,22 @@
5645	6215	cButton switchButton;
5646	6216	cButton loopButton;
5647	6217	cButton textureButton;
	6218	+
	6219	+ cButton skybox1Button;
	6220	+ cButton skybox2Button;
	6221	+ cButton skybox3Button;
	6222	+ cButton skybox4Button;
	6223	+ cButton skybox5Button;
	6224	+ cButton skybox6Button;
	6225	+ cButton skybox7Button;
	6226	+
	6227	+ cButton skybox11Button;
	6228	+ cButton skybox12Button;
	6229	+ cButton skybox13Button;
	6230	+ cButton skybox14Button;
	6231	+ cButton skybox15Button;
	6232	+ cButton skybox16Button;
	6233	+ cButton skybox17Button;
5648	6234
5649	6235	cButton gridButton;
5650	6236	cButton boxButton;
..	..	@@ -5678,11 +6264,11 @@
5678	6264	private MenuItem lookAtItem;
5679	6265	private MenuItem lookFromItem;
5680	6266	private MenuItem switchViewItem;
5681		- private MenuItem cutItem;
	6267	+ private JMenuItem cutItem;
5682	6268	private MenuItem undoItem;
5683	6269	private MenuItem redoItem;
5684	6270	private JMenuItem duplicateItem;
5685		- private MenuItem cloneItem;
	6271	+ private JMenuItem cloneItem;
5686	6272	private MenuItem cloneSupportItem;
5687	6273	private MenuItem overwriteGeoItem;
5688	6274	private MenuItem overwriteMatItem;
..	..	@@ -5703,13 +6289,13 @@
5703	6289	private MenuItem cloneGeometriesItem;
5704	6290	private MenuItem shareGeometriesItem;
5705	6291	private MenuItem mergeGeometriesItem;
5706		- private MenuItem copyItem;
	6292	+ private JMenuItem copyItem;
5707	6293	private MenuItem pasteItem;
5708		- private MenuItem pasteIntoItem;
5709		- private MenuItem pasteLinkItem;
5710		- private MenuItem pasteCloneItem;
5711		- private MenuItem pasteExpandItem;
5712		- private MenuItem deleteItem;
	6294	+ private JMenuItem pasteIntoItem;
	6295	+ private JMenuItem pasteLinkItem;
	6296	+ private JMenuItem pasteCloneItem;
	6297	+ private JMenuItem pasteExpandItem;
	6298	+ private JMenuItem deleteItem;
5713	6299	private MenuItem clearAllItem;
5714	6300	private MenuItem genUVItem;
5715	6301	private MenuItem genNormalsMESHItem;
..	..	@@ -5777,7 +6363,7 @@
5777	6363	private MenuItem switchTransfoItem;
5778	6364	private MenuItem morphItem;
5779	6365	private MenuItem linkerItem;
5780		- private MenuItem ungroupItem;
	6366	+ private JMenuItem ungroupItem;
5781	6367	private MenuItem editItem;
5782	6368	private MenuItem openWindowItem;
5783	6369	private MenuItem editLeafItem;
..	..	@@ -5793,6 +6379,8 @@
5793	6379	private MenuItem attachBumpItem;
5794	6380	private MenuItem detachBumpItem;
5795	6381	private MenuItem pigmentBumpItem;
	6382	+ private MenuItem embedTexturesItem;
	6383	+ private MenuItem deEmbedTexturesItem;
5796	6384
5797	6385	private MenuItem particleItem;
5798	6386	private MenuItem ragdollItem;