~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", !Globals.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Globals.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane(JTabbedPane.LEFT);
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
	358	+ }
	359	+
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
	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,14 @@
60	415	this.copy = this.group = group;
61	416	//selectees = this.group.selectees;
62	417
63		- if (copy.versions == null)
	418	+ assert(false);
	419	+
	420	+ if (copy.versionlist == null)
64	421	{
65		- copy.versions = new byte[100][];
	422	+ copy.versionlist = new Object3D[100];
66	423	copy.versionindex = -1;
	424	+
	425	+ //Save(true);
67	426	}
68	427
69	428	if(ui)
..	..	@@ -87,12 +446,12 @@
87	446
88	447	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
89	448
90		- if (copy.versions == null)
	449	+ if (copy.versionlist == null)
91	450	{
92		- copy.versions = new byte[100][];
	451	+ copy.versionlist = new Object3D[100];
93	452	copy.versionindex = -1;
94	453
95		- Save(true);
	454	+ //Save(true);
96	455	}
97	456	}
98	457
..	..	@@ -183,33 +542,35 @@
183	542	// menu.add("-");
184	543	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
185	544	duplicateItem.addActionListener(this);
186		- cloneItem = menu.add(new MenuItem("Clone"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
187	547	cloneItem.addActionListener(this);
188		- if (Globals.ADVANCED)
	548	+ //if (Globals.ADVANCED)
189	549	{
190	550	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
191	551	cloneSupportItem.addActionListener(this);
192	552	}
	553	+ oe.jTree.popup.addSeparator();
193	554	menu.add("-");
194		- cutItem = menu.add(new MenuItem("Cut"));
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
195	556	cutItem.addActionListener(this);
196		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
197	558	copyItem.addActionListener(this);
198	559	pasteItem = menu.add(new MenuItem("Paste"));
199	560	pasteItem.addActionListener(this);
200	561
201		- menu.add("-");
202		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	562	+ oe.jTree.popup.addSeparator();
	563	+ //menu.add("-");
	564	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
203	565	pasteIntoItem.addActionListener(this);
204		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
205	567	pasteLinkItem.addActionListener(this);
206		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
207	569	pasteCloneItem.addActionListener(this);
208		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
209	571	// pasteExpandItem.addActionListener(this);
210		- menu.add("-");
211		- deleteItem = menu.add(new MenuItem("Delete"));
212		- deleteItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
213	574
214	575	if (Globals.ADVANCED)
215	576	{
..	..	@@ -295,11 +656,9 @@
295	656	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
296	657	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
297	658	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
298		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
299	659	oe.cameraMenu.add("-");
300	660	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
301	661	openWindowItem.addActionListener(this);
302		- editLeafItem.addActionListener(this);
303	662	lookAtItem.addActionListener(this);
304	663	//lookFromItem.addActinoListener(this);
305	664	//switchViewItem.addActionListener(this);
..	..	@@ -346,9 +705,8 @@
346	705	setMasterItem.addActionListener(this);
347	706	}
348	707
349		- oe.menuBar.add(menu = new Menu("Group"));
350		-// grabItem = menu.add(new MenuItem("Grab"));
351		-// grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
352	710	backItem = menu.add(new MenuItem("Back"));
353	711	backItem.addActionListener(this);
354	712	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -356,13 +714,21 @@
356	714	// compositeItem = menu.add(new MenuItem("Composite"));
357	715	// compositeItem.addActionListener(this);
358	716
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
	719	+
359	720	if (Globals.ADVANCED)
360	721	{
361	722	hideItem = menu.add(new MenuItem("Hidden Group"));
362	723	hideItem.addActionListener(this);
363	724	}
364		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
365	726	ungroupItem.addActionListener(this);
	727	+
	728	+ oe.jTree.popup.addSeparator();
	729	+
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
366	732
367	733	// menu.add("-");
368	734	//
..	..	@@ -491,9 +857,9 @@
491	857	hideleavesItem.addActionListener(this);
492	858	showleavesItem = menu.add(new MenuItem("Show Leaves"));
493	859	showleavesItem.addActionListener(this);
494		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	860	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
495	861	markleavesItem.addActionListener(this);
496		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	862	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
497	863	unmarkleavesItem.addActionListener(this);
498	864	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
499	865	rewindleavesItem.addActionListener(this);
..	..	@@ -528,10 +894,15 @@
528	894	attachBumpItem.addActionListener(this);
529	895	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
530	896	pigmentBumpItem.addActionListener(this);
	897	+ //embedTexturesItem
531	898	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
532	899	detachPigmentItem.addActionListener(this);
533	900	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
534	901	detachBumpItem.addActionListener(this);
	902	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	903	+ embedTexturesItem.addActionListener(this);
	904	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	905	+ deEmbedTexturesItem.addActionListener(this);
535	906	menu.add("-");
536	907	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
537	908	sortbysizeItem.addActionListener(this);
..	..	@@ -542,6 +913,9 @@
542	913	shareGeometriesItem.addActionListener(this);
543	914	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
544	915	mergeGeometriesItem.addActionListener(this);
	916	+ menu.add("-");
	917	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	918	+ editLeafItem.addActionListener(this);
545	919	if (Globals.ADVANCED)
546	920	{
547	921	// Pretty much the same as duplicate and clone.
..	..	@@ -558,6 +932,74 @@
558	932	buildToolsMenu(menu);
559	933	}
560	934
	935	+ JTabbedPane resourcecontainer;
	936	+ cGridBag currenttab;
	937	+ //boolean added; // patch for jar
	938	+
	939	+ int tabcount = 0;
	940	+ int colcount = 0;
	941	+ int rowcount = 0;
	942	+ int texturecount = 0;
	943	+
	944	+ int columns = 5;
	945	+ int rows = 7;
	946	+
	947	+ public void ResourceCallBack(String[] path)
	948	+ {
	949	+// for (int i = 0; i < path.length; i++)
	950	+// System.out.print(path[i] + "/");
	951	+// System.out.println();
	952	+
	953	+ if (//rowcount == 0 \|\|
	954	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	955	+ {
	956	+ currenttab = new cGridBag();
	957	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	958	+ currenttab.setName(tabname);
	959	+ //added = false;
	960	+ resourcecontainer.add(currenttab);
	961	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	962	+ rowcount = 1;
	963	+ colcount = 0;
	964	+ texturecount = 0;
	965	+ }
	966	+
	967	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	968	+ {
	969	+ //if (!added)
	970	+ {
	971	+ //added = true;
	972	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	973	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	974	+ }
	975	+
	976	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	977	+
	978	+ if (++colcount >= columns)
	979	+ {
	980	+ colcount = 0;
	981	+ currenttab.Return();
	982	+
	983	+ if (rowcount++ >= rows)
	984	+ {
	985	+ rowcount = 0;
	986	+ }
	987	+ }
	988	+ }
	989	+ else
	990	+ {
	991	+// if (!path[path.length-1].equals("icons"))
	992	+// resourcecontainer.Return();
	993	+ }
	994	+ }
	995	+
	996	+ void CreateTexturePanel(cGridBag container)
	997	+ {
	998	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	999	+ container.add(resourcecontainer);
	1000	+
	1001	+ Grafreed.ParseResources("textures", this);
	1002	+ }
561	1003
562	1004	void SetupUI2(ObjEditor oe)
563	1005	{
..	..	@@ -576,11 +1018,6 @@
576	1018	//new Exception().printStackTrace();
577	1019
578	1020	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	1021	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
585	1022
586	1023	oe.buttonGroup = new ButtonGroup();
..	..	@@ -601,9 +1038,9 @@
601	1038	oe.radioPanel.add(dummyButton);
602	1039	oe.buttonGroup.add(dummyButton);
603	1040	*/
604		- cGridBag copyOptionsPanel = new cGridBag();
	1041	+ cGridBag versionManagerPanel = new cGridBag();
605	1042
606		- copyOptionsPanel.preferredHeight = 1;
	1043	+ versionManagerPanel.preferredHeight = 4;
607	1044
608	1045	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
609	1046
..	..	@@ -613,58 +1050,102 @@
613	1050
614	1051	if (Globals.ADVANCED)
615	1052	{
616		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
617		- maxButton.setToolTipText("Maximize window");
618		- maxButton.addActionListener(this);
	1053	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+// maxButton.setToolTipText("Maximize window");
	1055	+// maxButton.addActionListener(this);
619	1056	}
620	1057
621		- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+ cButton gcButton;
	1059	+
	1060	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+// gcButton.setToolTipText("Garbage collect");
	1062	+// gcButton.addActionListener(new ActionListener()
	1063	+// {
	1064	+// public void actionPerformed(ActionEvent e)
	1065	+// {
	1066	+// System.gc();
	1067	+// }
	1068	+// });
	1069	+
	1070	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1071	+ collapseButton.setToolTipText("Collapse toolbar");
	1072	+ collapseButton.addActionListener(this);
	1073	+
	1074	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1075	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1076	+ maximize3DButton.addActionListener(this);
	1077	+
	1078	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1079	+ twoButton.setToolTipText("Show 3D view only");
	1080	+ twoButton.addActionListener(this);
	1081	+ this.fullscreenLayout = twoButton;
	1082	+
	1083	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ threeButton.setToolTipText("Show controls and 3D view");
	1085	+ threeButton.addActionListener(this);
	1086	+ if (Globals.ADVANCED)
	1087	+ {
	1088	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ sixButton.setToolTipText("Show 3D view and controls");
	1090	+ sixButton.addActionListener(this);
	1091	+ }
	1092	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+// sevenButton.setToolTipText("3-column layout");
	1094	+// sevenButton.addActionListener(this);
	1095	+ //
	1096	+
	1097	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
622	1098	fullButton.setToolTipText("Full-screen window");
623	1099	fullButton.addActionListener(this);
624	1100
625		- oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1101	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
626	1102	screenfitButton.setToolTipText("Screen fit");
627	1103	screenfitButton.addActionListener(this);
628	1104
629		- oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1105	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
630	1106	restoreCameraButton.setToolTipText("Restore viewpoint");
631	1107	restoreCameraButton.addActionListener(this);
632	1108
633		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- saveButton.setToolTipText("New version");
635		- saveButton.addActionListener(this);
	1109	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1110	+ saveVersionButton.setToolTipText("Duplicate current version");
	1111	+ saveVersionButton.addActionListener(this);
636	1112
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);
	1113	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1114	+ deleteVersionButton.setToolTipText("Delete current version");
	1115	+ deleteVersionButton.addActionListener(this);
	1116	+ deleteVersionButton.setEnabled(false);
	1117	+
	1118	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1119	+ previousVersionButton.setToolTipText("Previous version");
	1120	+ previousVersionButton.addActionListener(this);
	1121	+ previousVersionButton.setEnabled(false);
641	1122
642	1123	cGridBag updown = new cGridBag().setVertical(true);
643		- updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
644		- restoreButton.setToolTipText("Restore current");
	1124	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1125	+ restoreButton.setToolTipText("Undo (restore current version)");
645	1126	restoreButton.addActionListener(this);
646	1127	restoreButton.setEnabled(false);
647	1128
648		- updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
649		- replaceButton.setToolTipText("Replace current");
	1129	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ replaceButton.setToolTipText("Save (replace current version)");
650	1131	replaceButton.addActionListener(this);
651	1132	replaceButton.setEnabled(false);
652	1133
653		- copyOptionsPanel.add(updown);
	1134	+ versionManagerPanel.add(updown);
654	1135
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);
	1136	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1137	+ nextVersionButton.setToolTipText("Next version");
	1138	+ nextVersionButton.addActionListener(this);
	1139	+ nextVersionButton.setEnabled(false);
	1140	+
	1141	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1142	+ oneStepButton.setToolTipText("Animate one step forward");
	1143	+ oneStepButton.addActionListener(this);
659	1144
660	1145	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
661	1146	liveCB.setToolTipText("Enable animation");
662	1147	liveCB.addItemListener(this);
663	1148
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	1149	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
669	1150	fastCB.setToolTipText("Fast mode");
670	1151	fastCB.addItemListener(this);
..	..	@@ -680,143 +1161,134 @@
680	1161
681	1162	if (Globals.ADVANCED)
682	1163	{
683		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1164	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
684	1165	snapobjectButton.addActionListener(this);
685	1166	snapobjectButton.setToolTipText("Snap Object");
	1167	+
	1168	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1169	+ fourButton.addActionListener(this);
	1170	+ fourButton.setToolTipText("Show control panel only");
686	1171	}
687	1172
688	1173	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
689	1174
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	1175
710		- oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1176	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
711	1177	rootButton.setToolTipText("Open selection in new tab");
712	1178	rootButton.addActionListener(this);
713	1179
714		- oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
715	1181	closeButton.setToolTipText("Close tab");
716	1182	closeButton.addActionListener(this);
717	1183	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
718	1184	//clearButton.addActionListener(this);
719	1185
	1186	+ cGridBag row1 = new cGridBag();
	1187	+
720	1188	// INSERT
721		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
722		- gridButton.setToolTipText("Create grid");
	1189	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ gridButton.setToolTipText("Create ground");
723	1191	gridButton.addActionListener(this);
724	1192
725		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1193	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
726	1194	boxButton.setToolTipText("Create box");
727	1195	boxButton.addActionListener(this);
728	1196
729		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
730		- sphereButton.setToolTipText("Create sphere");
731		- sphereButton.addActionListener(this);
732		-
733		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
734		- coneButton.setToolTipText("Create cone");
735		- coneButton.addActionListener(this);
736		-
737		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
738		- torusButton.setToolTipText("Create torus");
739		- torusButton.addActionListener(this);
740		-
741		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1197	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
742	1198	superButton.setToolTipText("Create superellipsoid");
743	1199	superButton.addActionListener(this);
744	1200
	1201	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1202	+ sphereButton.setToolTipText("Create sphere");
	1203	+ sphereButton.addActionListener(this);
	1204	+
	1205	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1206	+ coneButton.setToolTipText("Create cone");
	1207	+ coneButton.addActionListener(this);
	1208	+
	1209	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ torusButton.setToolTipText("Create torus");
	1211	+ torusButton.addActionListener(this);
	1212	+
745	1213	if (Globals.ADVANCED)
746	1214	{
747		- oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1215	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
748	1216	kleinButton.setToolTipText("Create Klein bottle");
749	1217	kleinButton.addActionListener(this);
750	1218	}
751	1219
752		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
753	1221	particlesButton.setToolTipText("Create particle system");
754	1222	particlesButton.addActionListener(this);
755	1223
756		- oe.toolboxPanel.Return();
	1224	+ oe.toolboxPanel.add(row1);
757	1225
758		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1226	+ cGridBag row2 = new cGridBag();
	1227	+
	1228	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
759	1229	groupButton.setToolTipText("Create group");
760	1230	groupButton.addActionListener(this);
761	1231
762		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1232	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
763	1233	compositeButton.setToolTipText("Create composite");
764	1234	compositeButton.addActionListener(this);
765	1235
766		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1236	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
767	1237	switchButton.setToolTipText("Create item switcher");
768	1238	switchButton.addActionListener(this);
769	1239
770		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1240	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
771	1241	loopButton.setToolTipText("Create loop");
772	1242	loopButton.addActionListener(this);
773	1243
774		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1244	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
775	1245	textureButton.setToolTipText("Create texture");
776	1246	textureButton.addActionListener(this);
777	1247
778		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1248	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
779	1249	overlayButton.setToolTipText("Create overlay");
780	1250	overlayButton.addActionListener(this);
781	1251
782		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1252	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
783	1253	lightButton.setToolTipText("Create light");
784	1254	lightButton.addActionListener(this);
785	1255
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		- }
	1256	+ oe.toolboxPanel.add(row2);
	1257	+
	1258	+ cGridBag textures = new cGridBag();
	1259	+
	1260	+ CreateTexturePanel(textures);
	1261	+
	1262	+ resourcecontainer.setSelectedIndex((int)(Math.random() * resourcecontainer.getTabCount()));
	1263	+
	1264	+ oe.toolboxPanel.add(textures);
	1265	+
	1266	+ textures.preferredHeight = 100;
	1267	+
	1268	+ CreateSkyboxPanel(oe.skyboxPanel);
797	1269
798	1270	// EDIT panel
799		- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1271	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
800	1272	editButton.setToolTipText("Pin selection controls");
801	1273	editButton.addActionListener(this);
802	1274
803		- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
804		- uneditButton.setToolTipText("Remove selection controls");
	1275	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1276	+ uneditButton.setToolTipText("Unpin and remove selection controls");
805	1277	uneditButton.addActionListener(this);
806	1278
807	1279	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
808		- allParamsButton.setToolTipText("Show all controle");
	1280	+ allParamsButton.setToolTipText("Show all controls");
809	1281	allParamsButton.addActionListener(this);
810	1282
811		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
812		- clearPanelButton.setToolTipText("Clear edit panel");
	1283	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1284	+ clearPanelButton.setToolTipText("Clear all controls");
813	1285	clearPanelButton.addActionListener(this);
814	1286
815		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
816		- unselectButton.setToolTipText("Unselect");
817		- unselectButton.addActionListener(this);
	1287	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1288	+ //unselectButton.setToolTipText("Unselect");
	1289	+ //unselectButton.addActionListener(this);
818	1290
819		- editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1291	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
820	1292	flashSelectionButton.setToolTipText("Highlight selection");
821	1293	flashSelectionButton.addActionListener(this);
822	1294
..	..	@@ -839,6 +1311,8 @@
839	1311
840	1312	cGridBag jSPPanel = new cGridBag();
841	1313
	1314	+ jSPPanel.preferredHeight = 20;
	1315	+
842	1316	JScrollPane jSP;
843	1317	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
844	1318	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -847,14 +1321,14 @@
847	1321	oe.treePanel.add(jSPPanel);
848	1322	oe.treePanel.Return();
849	1323
850		- oe.treePanel.add(copyOptionsPanel);
	1324	+ oe.treePanel.add(versionManagerPanel);
851	1325	oe.treePanel.Return();
852		- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
853		- versionSlider = (cNumberSlider)sliderPane.getComponent(1);
854		- sliderPane.preferredHeight = 1;
	1326	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1327	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1328	+ versionSliderPane.preferredHeight = 3;
855	1329
856		-// mainPanel.setDividerLocation(0.5); //1.0);
857		-// mainPanel.setResizeWeight(0.5);
	1330	+// mainPanel.setDividerLocation(0.1); //1.0);
	1331	+ mainPanel.setResizeWeight(0.4);
858	1332
859	1333	//jList.addListSelectionListener(this);
860	1334	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -862,7 +1336,7 @@
862	1336	//jTree.setEditable(true);
863	1337	oe.jTree.setDragEnabled(true);
864	1338	//jTree.setPreferredSize(new Dimension(10,10));
865		- jSP.setPreferredSize(new Dimension(100,200));
	1339	+ //jSP.setPreferredSize(new Dimension(100,200));
866	1340
867	1341	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
868	1342
..	..	@@ -874,7 +1348,7 @@
874	1348	dgr.addDragGestureListener(this);
875	1349	}catch(Exception e) {}
876	1350	*/
877		- radio.layout = sixButton; // sevenButton;
	1351	+ radio.layout = threeButton; // sixButton;
878	1352	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
879	1353	}
880	1354
..	..	@@ -925,9 +1399,12 @@
925	1399	smoothCB.setToolTipText("Snapping delay");
926	1400	smoothCB.addItemListener(this);
927	1401
928		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
929		- slowCB.setToolTipText("Smooth interpolation");
930		- slowCB.addItemListener(this);
	1402	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1403	+// slowCB.setToolTipText("Smooth interpolation");
	1404	+// slowCB.addItemListener(this);
	1405	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1406	+ minshaderCB.setToolTipText("Minimal fast shader");
	1407	+ minshaderCB.addItemListener(this);
931	1408
932	1409	// constraints.gridy += 1;
933	1410	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -1006,6 +1483,14 @@
1006	1483
1007	1484	void EditObject(Object3D obj)
1008	1485	{
	1486	+ assert(obj instanceof Composite);
	1487	+
	1488	+// if (obj.versionlist == null)
	1489	+// {
	1490	+// obj.versionlist = new Object3D[100];
	1491	+// obj.versionindex = -1;
	1492	+// }
	1493	+
1009	1494	cRadio radioButton = new cRadio(obj.name);
1010	1495
1011	1496	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1016,7 +1501,7 @@
1016	1501	}
1017	1502
1018	1503	radioButton.SetObject(obj);
1019		- radioButton.layout = sixButton; // sevenButton;
	1504	+ radioButton.layout = threeButton; // sixButton;
1020	1505	radioButton.SetCamera(cameraView.renderCamera, false);
1021	1506	radioButton.addActionListener(this);
1022	1507	radioPanel.add(radioButton);
..	..	@@ -1030,6 +1515,7 @@
1030	1515
1031	1516	oe.SetupViews();
1032	1517
	1518	+ if (Globals.DEBUG)
1033	1519	System.out.println("SetupViews");
1034	1520	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1035	1521	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1041,6 +1527,8 @@
1041	1527	cCheckBox localCB;
1042	1528	cCheckBox crowdCB;
1043	1529	cCheckBox smoothCB;
	1530	+ cCheckBox minshaderCB;
	1531	+
1044	1532	cToggleButton fastCB;
1045	1533	cCheckBox slowCB;
1046	1534	cCheckBox boxCB;
..	..	@@ -1111,6 +1599,12 @@
1111	1599	{
1112	1600	cameraView.ToggleInertia();
1113	1601	cameraView.repaint();
	1602	+ }
	1603	+ else if(e.getSource() == minshaderCB)
	1604	+ {
	1605	+ Globals.MINSHADER ^= true;
	1606	+ cameraView.programInitialized = false;
	1607	+ cameraView.repaint();
1114	1608	}
1115	1609	else if(e.getSource() == localCB)
1116	1610	{
..	..	@@ -1388,7 +1882,12 @@
1388	1882	TreePath path;
1389	1883
1390	1884	public TransferableTreePath(TreePath tp) {
1391		- path = tp;
	1885	+ Object[] objs = new Object[tp.getPathCount()];
	1886	+ for (int i=0; i<objs.length; i++)
	1887	+ {
	1888	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1889	+ }
	1890	+ path = new TreePath(objs);
1392	1891	}
1393	1892
1394	1893	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1678,7 +2177,11 @@
1678	2177	shadow.material = new cMaterial(obj.material);
1679	2178	shadow.material.diffuse = 0.0001f;
1680	2179	shadow.material.specular = 0.0001f;
1681		- //shadow.projectedVertices[1].x = 300;
	2180	+ shadow.material.opacity = 0.75f;
	2181	+
	2182	+ AllocProjectedVertices(shadow);
	2183	+
	2184	+ shadow.projectedVertices[1].x = 300;
1682	2185
1683	2186	makeSomething(shadow);
1684	2187	}
..	..	@@ -2134,6 +2637,23 @@
2134	2637	{
2135	2638	makeSomething(new Light());
2136	2639	} else
	2640	+// if (source == skybox1Button \|\|
	2641	+// source == skybox2Button \|\|
	2642	+// source == skybox3Button \|\|
	2643	+// source == skybox4Button \|\|
	2644	+// source == skybox5Button \|\|
	2645	+// source == skybox6Button \|\|
	2646	+// source == skybox7Button \|\|
	2647	+// source == skybox11Button \|\|
	2648	+// source == skybox12Button \|\|
	2649	+// source == skybox13Button \|\|
	2650	+// source == skybox14Button \|\|
	2651	+// source == skybox15Button \|\|
	2652	+// source == skybox16Button \|\|
	2653	+// source == skybox17Button)
	2654	+// {
	2655	+// ChangeSkybox(source);
	2656	+// } else
2137	2657	if (source == csgItem)
2138	2658	{
2139	2659	group(new CSG());
..	..	@@ -2182,27 +2702,35 @@
2182	2702	} else
2183	2703	if (source == loopItem \|\| source == loopButton)
2184	2704	{
	2705	+ if (!group.selection.isEmpty())
	2706	+ {
2185	2707	Composite csg = new GroupLeaf();
2186	2708	csg.count = 5;
2187		- group(csg);
2188	2709	Composite child = new cGroup("Branch");
2189	2710	csg.addChild(child);
2190	2711	child.addChild(csg);
	2712	+ group(csg);
	2713	+ }
2191	2714	} else
2192	2715	if (source == doubleItem)
2193	2716	{
	2717	+ if (!group.selection.isEmpty())
	2718	+ {
2194	2719	Composite csg = new GroupLeaf("Fork");
2195	2720	csg.count = 5;
2196		- group(csg);
2197	2721	Composite child = new cGroup("Branch A");
2198	2722	csg.addChild(child);
2199	2723	child.addChild(csg);
2200	2724	child = new cGroup("Branch B");
2201	2725	csg.addChild(child);
2202	2726	child.addChild(csg);
	2727	+ group(csg);
	2728	+ }
2203	2729	} else
2204	2730	if (source == tripleItem)
2205	2731	{
	2732	+ if (!group.selection.isEmpty())
	2733	+ {
2206	2734	Composite csg = new GroupLeaf("Trident");
2207	2735	csg.count = 4;
2208	2736	group(csg);
..	..	@@ -2215,11 +2743,12 @@
2215	2743	child = new cGroup();
2216	2744	csg.addChild(child);
2217	2745	child.addChild(csg);
	2746	+ }
2218	2747	} else
2219	2748	if (source == computeAOItem)
2220	2749	{
2221	2750	Globals.drawMode = CameraPane.OCCLUSION;
2222		- Globals.theRenderer.repaint();
	2751	+ cameraView.repaint();
2223	2752	} else
2224	2753	if (source == recompileItem)
2225	2754	{
..	..	@@ -2234,7 +2763,7 @@
2234	2763	if (source == invariantsItem)
2235	2764	{
2236	2765	System.out.println("Invariants:");
2237		- Grafreed.grafreeD.universe.invariants();
	2766	+ Grafreed.grafreed.universe.invariants();
2238	2767	} else
2239	2768	if (source == memoryItem)
2240	2769	{
..	..	@@ -2265,33 +2794,52 @@
2265	2794	{
2266	2795	ToggleFullScreen();
2267	2796	} else
2268		- if (source == undoButton)
	2797	+ if (source == collapseButton)
	2798	+ {
	2799	+ this.expandedLayout = radio.layout;
	2800	+ CollapseToolbar();
	2801	+ } else
	2802	+ if (source == maximize3DButton)
	2803	+ {
	2804	+ this.expandedLayout = radio.layout;
	2805	+ radio.layout = twoButton;
	2806	+ Show3DView();
	2807	+ CollapseToolbar();
	2808	+ } else
	2809	+ if (source == previousVersionButton)
2269	2810	{
2270	2811	// Go to previous version
2271	2812	//if (!Undo())
2272	2813	//java.awt.Toolkit.getDefaultToolkit().beep();
2273		- Undo();
	2814	+ PreviousVersion();
2274	2815	} else
2275	2816	if (source == restoreButton)
2276	2817	{
2277	2818	// Restore current version
2278	2819	Restore();
	2820	+ //restoreButton.setEnabled(false);
2279	2821	} else
2280	2822	if (source == replaceButton)
2281	2823	{
2282	2824	// Overwrite current version
2283	2825	Replace();
	2826	+ //replaceButton.setEnabled(false);
2284	2827	} else
2285		- if (source == redoButton)
	2828	+ if (source == nextVersionButton)
2286	2829	{
2287	2830	// Go to next version
2288		- Redo();
	2831	+ NextVersion();
2289	2832	} else
2290		- if (source == saveButton)
	2833	+ if (source == saveVersionButton)
2291	2834	{
2292	2835	// Save a new version
2293	2836	if (!Save(true))
2294	2837	java.awt.Toolkit.getDefaultToolkit().beep();
	2838	+ } else
	2839	+ if (source == deleteVersionButton)
	2840	+ {
	2841	+ // Delete a new version
	2842	+ DeleteVersion();
2295	2843	} else
2296	2844	if (source == oneStepButton)
2297	2845	{
..	..	@@ -2346,11 +2894,11 @@
2346	2894	} else
2347	2895	if (source == undoItem)
2348	2896	{
2349		- Undo();
	2897	+ PreviousVersion();
2350	2898	} else
2351	2899	if (source == redoItem)
2352	2900	{
2353		- Redo();
	2901	+ NextVersion();
2354	2902	} else
2355	2903	if (source == duplicateItem)
2356	2904	{
..	..	@@ -2831,22 +3379,34 @@
2831	3379	} else
2832	3380	if (source == ungroupItem \|\| source == ungroupButton)
2833	3381	{
2834		- boolean hasRoot = false;
	3382	+ boolean canUngroup = true;
2835	3383
2836	3384	for (int i=0; i<group.selection.size(); i++)
2837	3385	{
2838		- if (group.selection.get(i) == group)
	3386	+ Object3D selectedItem = group.selection.get(i);
	3387	+
	3388	+ if (selectedItem.Size() == 0)
2839	3389	{
2840		- hasRoot = true;
	3390	+ // Cannot ungroup leaves
	3391	+ canUngroup = false;
	3392	+ break;
	3393	+ }
	3394	+
	3395	+ if (selectedItem == group)
	3396	+ {
	3397	+ // Cannot ungroup root
	3398	+ canUngroup = false;
2841	3399	break;
2842	3400	}
2843	3401	}
2844	3402
2845		- if (!hasRoot)
	3403	+ if (canUngroup)
2846	3404	{
2847	3405	for (int i=0; i<group.selection.size(); i++)
2848	3406	{
2849		- Ungroup(group.selection.get(i));
	3407	+ Object3D selectedItem = group.selection.get(i);
	3408	+
	3409	+ Ungroup(selectedItem);
2850	3410	}
2851	3411
2852	3412	ClearSelection(false);
..	..	@@ -3169,6 +3729,31 @@
3169	3729
3170	3730	refreshContents();
3171	3731	} else
	3732	+ if (source == embedTexturesItem)
	3733	+ {
	3734	+ Object3D obj;
	3735	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3736	+ {
	3737	+ obj = (Object3D)e.nextElement();
	3738	+ obj.EmbedTextures(true);
	3739	+ }
	3740	+
	3741	+ refreshContents();
	3742	+ } else
	3743	+ if (source == deEmbedTexturesItem)
	3744	+ {
	3745	+ Object3D obj;
	3746	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3747	+ {
	3748	+ obj = (Object3D)e.nextElement();
	3749	+ obj.EmbedTextures(false);
	3750	+ }
	3751	+
	3752	+ CameraPane.texturepigment.clear();
	3753	+ CameraPane.texturebump.clear();
	3754	+
	3755	+ refreshContents();
	3756	+ } else
3172	3757	if (source == flashSelectionButton)
3173	3758	{
3174	3759	CameraPane.flash = true;
..	..	@@ -3184,38 +3769,7 @@
3184	3769	if (CameraPane.FULLSCREEN)
3185	3770	fullscreenLayout = radio.layout;
3186	3771
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();
	3772	+ Show3DView();
3219	3773
3220	3774	cameraView.requestFocusInWindow();
3221	3775
..	..	@@ -3270,8 +3824,8 @@
3270	3824	// centralPanel.setVisible(true);
3271	3825	// XYZPanel.setVisible(true);
3272	3826	bigThree.ClearUI();
	3827	+ bigThree.add(scenePanel);
3273	3828	bigThree.add(centralPanel);
3274		- bigThree.add(XYZPanel);
3275	3829	bigThree.FlushUI();
3276	3830
3277	3831	cameraView.requestFocusInWindow();
..	..	@@ -3351,8 +3905,8 @@
3351	3905	// centralPanel.setVisible(true);
3352	3906	// XYZPanel.setVisible(false);
3353	3907	bigThree.ClearUI();
3354		- bigThree.add(scenePanel);
3355	3908	bigThree.add(centralPanel);
	3909	+ bigThree.add(scenePanel);
3356	3910	bigThree.FlushUI();
3357	3911
3358	3912	cameraView.requestFocusInWindow();
..	..	@@ -3401,6 +3955,7 @@
3401	3955	} else
3402	3956	if (source == rootButton)
3403	3957	{
	3958	+ Replace();
3404	3959	Object3D obj;
3405	3960	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3406	3961	{
..	..	@@ -3415,6 +3970,8 @@
3415	3970	if (source == closeButton)
3416	3971	{
3417	3972	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3973	+ Replace();
	3974	+
3418	3975	cRadio ab;
3419	3976	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3420	3977	{
..	..	@@ -3458,10 +4015,10 @@
3458	4015	{
3459	4016	Object3D child = (Object3D)e.nextElement();
3460	4017	if(child.editWindow != null)
3461		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3462	4018	child.pinned = false;
3463	4019	child.CloseUI();
3464	4020	listUI.remove(child);
	4021	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3465	4022
3466	4023	//child.editWindow = null; // ???????????
3467	4024	}
..	..	@@ -3480,6 +4037,7 @@
3480	4037	obj.CloseUI();
3481	4038	}
3482	4039	listUI.clear();
	4040	+ SetPinStates(group.selection.size() > 0);
3483	4041	refreshContents(true);
3484	4042	} else
3485	4043	if (source == allParamsButton)
..	..	@@ -3512,6 +4070,8 @@
3512	4070	} else
3513	4071	if(source instanceof cRadio)
3514	4072	{
	4073	+ Replace();
	4074	+
3515	4075	group.parent = keepparent;
3516	4076	group.attributes = 0;
3517	4077	//group.editWindow = null;
..	..	@@ -3536,8 +4096,6 @@
3536	4096
3537	4097	copy = group;
3538	4098
3539		- SetUndoStates();
3540		-
3541	4099	//Globals.theRenderer.object = group;
3542	4100	if(!useclient)
3543	4101	{
..	..	@@ -3565,7 +4123,31 @@
3565	4123	*/
3566	4124	radio.layout.doClick();
3567	4125
	4126	+ assert(copy instanceof Composite);
	4127	+
	4128	+ if (copy.versionlist == null)
	4129	+ {
	4130	+ copy.versionindex = -1;
	4131	+
	4132	+ // Cannot work with loops
	4133	+ // To fix this issue, we first mark all nodes above the root,
	4134	+ // and check if any of these nodes are reachable below the root.
	4135	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4136	+
	4137	+ if (!copy.HasTags())
	4138	+ {
	4139	+ copy.versionlist = new Object3D[100];
	4140	+
	4141	+ Save(true);
	4142	+ }
	4143	+
	4144	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4145	+ }
	4146	+
	4147	+ SetVersionStates();
	4148	+
3568	4149	ClearUnpinned();
	4150	+
3569	4151	//Grafreed.Assert(group != null);
3570	4152	//Grafreed.Assert(group.selection != null);
3571	4153	SetPinStates(group.selection == null \|\| group.selection.size() > 0);
..	..	@@ -3582,11 +4164,13 @@
3582	4164	} else if (event.getSource() == editCameraItem)
3583	4165	{
3584	4166	cameraView.ProtectCamera();
	4167	+ cameraView.requestFocusInWindow();
3585	4168	cameraView.repaint();
3586	4169	return;
3587	4170	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3588	4171	{
3589	4172	cameraView.RevertCamera();
	4173	+ cameraView.requestFocusInWindow();
3590	4174	cameraView.repaint();
3591	4175	return;
3592	4176	// } else if (event.getSource() == textureButton)
..	..	@@ -3705,7 +4289,7 @@
3705	4289	TouchTransform(obj);
3706	4290	continue;
3707	4291	}
3708		- if ((mask&2) != 0) // Scale
	4292	+ if ((mask&2) != 0) // Scale/rotation
3709	4293	{
3710	4294	obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3711	4295	obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..	..	@@ -3713,10 +4297,6 @@
3713	4297	obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3714	4298	obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3715	4299	obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3716		- }
3717		- if ((mask&4) != 0) // Rotation
3718		- {
3719		- // ?
3720	4300	}
3721	4301	if ((mask&1) != 0) // Translation
3722	4302	{
..	..	@@ -4163,7 +4743,7 @@
4163	4743
4164	4744	try
4165	4745	{
4166		- texturedata = Globals.theRenderer.GetTextureData(tex.pigmenttexture, pigment, false, node.texres);
	4746	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4167	4747	}
4168	4748	catch (Exception e)
4169	4749	{
..	..	@@ -4719,9 +5299,7 @@
4719	5299
4720	5300	freezemodel = false;
4721	5301	}
4722		-
4723		- boolean flashIt = true;
4724		-
	5302	+
4725	5303	public void valueChanged(TreeSelectionEvent e)
4726	5304	//public boolean handleEvent(Event event)
4727	5305	{
..	..	@@ -4794,13 +5372,31 @@
4794	5372	{
4795	5373	editButton.setEnabled(enabled);
4796	5374	uneditButton.setEnabled(enabled);
4797		- unselectButton.setEnabled(enabled);
	5375	+ //unselectButton.setEnabled(enabled);
4798	5376	flashSelectionButton.setEnabled(enabled);
	5377	+
	5378	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5379	+
	5380	+ boolean allComposites = true;
	5381	+
	5382	+ if (group.selection != null)
	5383	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5384	+ {
	5385	+ Object next = e.nextElement();
	5386	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5387	+ {
	5388	+ allComposites = false;
	5389	+ break;
	5390	+ }
	5391	+ }
	5392	+
	5393	+ rootButton.setEnabled(allComposites);
4799	5394	}
4800	5395
4801	5396	void refreshContents(boolean cp)
4802	5397	{
4803		- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5398	+ if (Globals.ADVANCED)
	5399	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4804	5400	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4805	5401	{
4806	5402	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -4810,7 +5406,7 @@
4810	5406	Object3D child = (Object3D) group.selection.get(i);
4811	5407
4812	5408	objEditor.AddInfo(child, this, true);
4813		- System.err.println("info : " + child.GetPath());
	5409	+// System.err.println("info : " + child.GetPath());
4814	5410	}
4815	5411
4816	5412	objEditor.SetText(); // jan 2014
..	..	@@ -5636,7 +6232,6 @@
5636	6232
5637	6233	cButton restoreCameraButton;
5638	6234
5639		- cButton saveButton;
5640	6235	cButton oneStepButton;
5641	6236
5642	6237	cButton groupButton;
..	..	@@ -5645,6 +6240,22 @@
5645	6240	cButton switchButton;
5646	6241	cButton loopButton;
5647	6242	cButton textureButton;
	6243	+
	6244	+ cButton skybox1Button;
	6245	+ cButton skybox2Button;
	6246	+ cButton skybox3Button;
	6247	+ cButton skybox4Button;
	6248	+ cButton skybox5Button;
	6249	+ cButton skybox6Button;
	6250	+ cButton skybox7Button;
	6251	+
	6252	+ cButton skybox11Button;
	6253	+ cButton skybox12Button;
	6254	+ cButton skybox13Button;
	6255	+ cButton skybox14Button;
	6256	+ cButton skybox15Button;
	6257	+ cButton skybox16Button;
	6258	+ cButton skybox17Button;
5648	6259
5649	6260	cButton gridButton;
5650	6261	cButton boxButton;
..	..	@@ -5678,11 +6289,11 @@
5678	6289	private MenuItem lookAtItem;
5679	6290	private MenuItem lookFromItem;
5680	6291	private MenuItem switchViewItem;
5681		- private MenuItem cutItem;
	6292	+ private JMenuItem cutItem;
5682	6293	private MenuItem undoItem;
5683	6294	private MenuItem redoItem;
5684	6295	private JMenuItem duplicateItem;
5685		- private MenuItem cloneItem;
	6296	+ private JMenuItem cloneItem;
5686	6297	private MenuItem cloneSupportItem;
5687	6298	private MenuItem overwriteGeoItem;
5688	6299	private MenuItem overwriteMatItem;
..	..	@@ -5703,13 +6314,13 @@
5703	6314	private MenuItem cloneGeometriesItem;
5704	6315	private MenuItem shareGeometriesItem;
5705	6316	private MenuItem mergeGeometriesItem;
5706		- private MenuItem copyItem;
	6317	+ private JMenuItem copyItem;
5707	6318	private MenuItem pasteItem;
5708		- private MenuItem pasteIntoItem;
5709		- private MenuItem pasteLinkItem;
5710		- private MenuItem pasteCloneItem;
5711		- private MenuItem pasteExpandItem;
5712		- private MenuItem deleteItem;
	6319	+ private JMenuItem pasteIntoItem;
	6320	+ private JMenuItem pasteLinkItem;
	6321	+ private JMenuItem pasteCloneItem;
	6322	+ private JMenuItem pasteExpandItem;
	6323	+ private JMenuItem deleteItem;
5713	6324	private MenuItem clearAllItem;
5714	6325	private MenuItem genUVItem;
5715	6326	private MenuItem genNormalsMESHItem;
..	..	@@ -5764,7 +6375,7 @@
5764	6375	private MenuItem transformGeometryItem;
5765	6376	private MenuItem transformChildrenItem;
5766	6377	private MenuItem hideItem;
5767		- private MenuItem grabItem;
	6378	+ private JMenuItem grabItem;
5768	6379	private MenuItem backItem;
5769	6380	private MenuItem frontItem;
5770	6381	private MenuItem cameraItem;
..	..	@@ -5777,7 +6388,7 @@
5777	6388	private MenuItem switchTransfoItem;
5778	6389	private MenuItem morphItem;
5779	6390	private MenuItem linkerItem;
5780		- private MenuItem ungroupItem;
	6391	+ private JMenuItem ungroupItem;
5781	6392	private MenuItem editItem;
5782	6393	private MenuItem openWindowItem;
5783	6394	private MenuItem editLeafItem;
..	..	@@ -5793,6 +6404,8 @@
5793	6404	private MenuItem attachBumpItem;
5794	6405	private MenuItem detachBumpItem;
5795	6406	private MenuItem pigmentBumpItem;
	6407	+ private MenuItem embedTexturesItem;
	6408	+ private MenuItem deEmbedTexturesItem;
5796	6409
5797	6410	private MenuItem particleItem;
5798	6411	private MenuItem ragdollItem;