~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,6 +415,16 @@
60	415	this.copy = this.group = group;
61	416	//selectees = this.group.selectees;
62	417
	418	+ assert(false);
	419	+
	420	+ if (copy.versionlist == null)
	421	+ {
	422	+ copy.versionlist = new Object3D[100];
	423	+ copy.versionindex = -1;
	424	+
	425	+ //Save(true);
	426	+ }
	427	+
63	428	if(ui)
64	429	SetupUI(objEditor);
65	430	}
..	..	@@ -80,6 +445,14 @@
80	445	SetupViews(objEditor);
81	446
82	447	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	448	+
	449	+ if (copy.versionlist == null)
	450	+ {
	451	+ copy.versionlist = new Object3D[100];
	452	+ copy.versionindex = -1;
	453	+
	454	+ //Save(true);
	455	+ }
83	456	}
84	457
85	458	void CloneSelection(boolean supports)
..	..	@@ -169,33 +542,35 @@
169	542	// menu.add("-");
170	543	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
171	544	duplicateItem.addActionListener(this);
172		- cloneItem = menu.add(new MenuItem("Clone"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
173	547	cloneItem.addActionListener(this);
174		- if (Globals.ADVANCED)
	548	+ //if (Globals.ADVANCED)
175	549	{
176	550	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
177	551	cloneSupportItem.addActionListener(this);
178	552	}
	553	+ oe.jTree.popup.addSeparator();
179	554	menu.add("-");
180		- cutItem = menu.add(new MenuItem("Cut"));
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
181	556	cutItem.addActionListener(this);
182		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
183	558	copyItem.addActionListener(this);
184	559	pasteItem = menu.add(new MenuItem("Paste"));
185	560	pasteItem.addActionListener(this);
186	561
187		- menu.add("-");
188		- 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"));
189	565	pasteIntoItem.addActionListener(this);
190		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
191	567	pasteLinkItem.addActionListener(this);
192		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
193	569	pasteCloneItem.addActionListener(this);
194		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
195	571	// pasteExpandItem.addActionListener(this);
196		- menu.add("-");
197		- clearItem = menu.add(new MenuItem("Clear"));
198		- clearItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
199	574
200	575	if (Globals.ADVANCED)
201	576	{
..	..	@@ -281,11 +656,9 @@
281	656	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
282	657	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
283	658	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
284		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
285	659	oe.cameraMenu.add("-");
286	660	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
287	661	openWindowItem.addActionListener(this);
288		- editLeafItem.addActionListener(this);
289	662	lookAtItem.addActionListener(this);
290	663	//lookFromItem.addActinoListener(this);
291	664	//switchViewItem.addActionListener(this);
..	..	@@ -332,9 +705,8 @@
332	705	setMasterItem.addActionListener(this);
333	706	}
334	707
335		- oe.menuBar.add(menu = new Menu("Group"));
336		-// grabItem = menu.add(new MenuItem("Grab"));
337		-// grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
338	710	backItem = menu.add(new MenuItem("Back"));
339	711	backItem.addActionListener(this);
340	712	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -342,13 +714,21 @@
342	714	// compositeItem = menu.add(new MenuItem("Composite"));
343	715	// compositeItem.addActionListener(this);
344	716
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
	719	+
345	720	if (Globals.ADVANCED)
346	721	{
347	722	hideItem = menu.add(new MenuItem("Hidden Group"));
348	723	hideItem.addActionListener(this);
349	724	}
350		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
351	726	ungroupItem.addActionListener(this);
	727	+
	728	+ oe.jTree.popup.addSeparator();
	729	+
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
352	732
353	733	// menu.add("-");
354	734	//
..	..	@@ -421,7 +801,7 @@
421	801	genNormalsMESHItem.addActionListener(this);
422	802	if (Globals.ADVANCED)
423	803	{
424		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	804	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
425	805	genNormalsMINEItem.addActionListener(this);
426	806	}
427	807	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -477,9 +857,9 @@
477	857	hideleavesItem.addActionListener(this);
478	858	showleavesItem = menu.add(new MenuItem("Show Leaves"));
479	859	showleavesItem.addActionListener(this);
480		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	860	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
481	861	markleavesItem.addActionListener(this);
482		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	862	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
483	863	unmarkleavesItem.addActionListener(this);
484	864	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
485	865	rewindleavesItem.addActionListener(this);
..	..	@@ -514,10 +894,15 @@
514	894	attachBumpItem.addActionListener(this);
515	895	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
516	896	pigmentBumpItem.addActionListener(this);
	897	+ //embedTexturesItem
517	898	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
518	899	detachPigmentItem.addActionListener(this);
519	900	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
520	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);
521	906	menu.add("-");
522	907	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
523	908	sortbysizeItem.addActionListener(this);
..	..	@@ -528,6 +913,9 @@
528	913	shareGeometriesItem.addActionListener(this);
529	914	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
530	915	mergeGeometriesItem.addActionListener(this);
	916	+ menu.add("-");
	917	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	918	+ editLeafItem.addActionListener(this);
531	919	if (Globals.ADVANCED)
532	920	{
533	921	// Pretty much the same as duplicate and clone.
..	..	@@ -544,6 +932,79 @@
544	932	buildToolsMenu(menu);
545	933	}
546	934
	935	+ JTabbedPane resourcecontainer;
	936	+ cGridBag currenttab;
	937	+ //boolean added; // patch for jar
	938	+
	939	+ int totalcount = 0;
	940	+
	941	+ int tabcount = 0;
	942	+ int colcount = 0;
	943	+ int rowcount = 0;
	944	+ int texturecount = 0;
	945	+
	946	+ int columns = 5;
	947	+ int rows = 7;
	948	+
	949	+ public void ResourceCallBack(String[] path)
	950	+ {
	951	+// for (int i = 0; i < path.length; i++)
	952	+// System.out.print(path[i] + "/");
	953	+// System.out.println();
	954	+
	955	+ if (//rowcount == 0 \|\|
	956	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	957	+ {
	958	+ currenttab = new cGridBag();
	959	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	960	+ currenttab.setName(tabname);
	961	+ //added = false;
	962	+ resourcecontainer.add(currenttab);
	963	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	964	+ rowcount = 1;
	965	+ colcount = 0;
	966	+ texturecount = 0;
	967	+ }
	968	+
	969	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	970	+ {
	971	+ //if (!added)
	972	+ {
	973	+ //added = true;
	974	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	975	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	976	+ }
	977	+
	978	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	979	+ totalcount++;
	980	+
	981	+ if (++colcount >= columns)
	982	+ {
	983	+ colcount = 0;
	984	+ currenttab.Return();
	985	+
	986	+ if (rowcount++ >= rows)
	987	+ {
	988	+ rowcount = 0;
	989	+ }
	990	+ }
	991	+ }
	992	+ else
	993	+ {
	994	+// if (!path[path.length-1].equals("icons"))
	995	+// resourcecontainer.Return();
	996	+ }
	997	+ }
	998	+
	999	+ void CreateTexturePanel(cGridBag container)
	1000	+ {
	1001	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1002	+ container.add(resourcecontainer);
	1003	+
	1004	+ Grafreed.ParseResources("textures", this);
	1005	+
	1006	+ // 935. System.out.println("Total = " + totalcount);
	1007	+ }
547	1008
548	1009	void SetupUI2(ObjEditor oe)
549	1010	{
..	..	@@ -562,11 +1023,6 @@
562	1023	//new Exception().printStackTrace();
563	1024
564	1025	oe.radioPanel = new JPanel(new GridBagLayout());
565		- oe.aConstraints.weightx = 1;
566		- oe.aConstraints.weighty = 0;
567		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
568		- oe.aConstraints.gridwidth = 100;
569		- oe.aConstraints.gridheight = 1;
570	1026	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
571	1027
572	1028	oe.buttonGroup = new ButtonGroup();
..	..	@@ -587,9 +1043,9 @@
587	1043	oe.radioPanel.add(dummyButton);
588	1044	oe.buttonGroup.add(dummyButton);
589	1045	*/
590		- cGridBag copyOptionsPanel = new cGridBag();
	1046	+ cGridBag versionManagerPanel = new cGridBag();
591	1047
592		- copyOptionsPanel.preferredHeight = 1;
	1048	+ versionManagerPanel.preferredHeight = 4;
593	1049
594	1050	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
595	1051
..	..	@@ -599,58 +1055,102 @@
599	1055
600	1056	if (Globals.ADVANCED)
601	1057	{
602		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603		- maxButton.setToolTipText("Maximize window");
604		- maxButton.addActionListener(this);
	1058	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1059	+// maxButton.setToolTipText("Maximize window");
	1060	+// maxButton.addActionListener(this);
605	1061	}
606	1062
607		- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ cButton gcButton;
	1064	+
	1065	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1066	+// gcButton.setToolTipText("Garbage collect");
	1067	+// gcButton.addActionListener(new ActionListener()
	1068	+// {
	1069	+// public void actionPerformed(ActionEvent e)
	1070	+// {
	1071	+// System.gc();
	1072	+// }
	1073	+// });
	1074	+
	1075	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1076	+ collapseButton.setToolTipText("Collapse toolbar");
	1077	+ collapseButton.addActionListener(this);
	1078	+
	1079	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1080	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1081	+ maximize3DButton.addActionListener(this);
	1082	+
	1083	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ twoButton.setToolTipText("Show 3D view only");
	1085	+ twoButton.addActionListener(this);
	1086	+ this.fullscreenLayout = twoButton;
	1087	+
	1088	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ threeButton.setToolTipText("Show controls and 3D view");
	1090	+ threeButton.addActionListener(this);
	1091	+ if (Globals.ADVANCED)
	1092	+ {
	1093	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1094	+ sixButton.setToolTipText("Show 3D view and controls");
	1095	+ sixButton.addActionListener(this);
	1096	+ }
	1097	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1098	+// sevenButton.setToolTipText("3-column layout");
	1099	+// sevenButton.addActionListener(this);
	1100	+ //
	1101	+
	1102	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
608	1103	fullButton.setToolTipText("Full-screen window");
609	1104	fullButton.addActionListener(this);
610	1105
611		- oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1106	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
612	1107	screenfitButton.setToolTipText("Screen fit");
613	1108	screenfitButton.addActionListener(this);
614	1109
615		- oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1110	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
616	1111	restoreCameraButton.setToolTipText("Restore viewpoint");
617	1112	restoreCameraButton.addActionListener(this);
618	1113
619		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620		- saveButton.setToolTipText("New version");
621		- saveButton.addActionListener(this);
	1114	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1115	+ saveVersionButton.setToolTipText("Duplicate current version");
	1116	+ saveVersionButton.addActionListener(this);
622	1117
623		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624		- undoButton.setToolTipText("Previous version");
625		- undoButton.addActionListener(this);
626		- undoButton.setEnabled(false);
	1118	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1119	+ deleteVersionButton.setToolTipText("Delete current version");
	1120	+ deleteVersionButton.addActionListener(this);
	1121	+ deleteVersionButton.setEnabled(false);
	1122	+
	1123	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ previousVersionButton.setToolTipText("Previous version");
	1125	+ previousVersionButton.addActionListener(this);
	1126	+ previousVersionButton.setEnabled(false);
627	1127
628	1128	cGridBag updown = new cGridBag().setVertical(true);
629		- updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
630		- restoreButton.setToolTipText("Restore current");
	1129	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ restoreButton.setToolTipText("Undo (restore current version)");
631	1131	restoreButton.addActionListener(this);
632	1132	restoreButton.setEnabled(false);
633	1133
634		- updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
635		- replaceButton.setToolTipText("Replace current");
	1134	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1135	+ replaceButton.setToolTipText("Save (replace current version)");
636	1136	replaceButton.addActionListener(this);
637	1137	replaceButton.setEnabled(false);
638	1138
639		- copyOptionsPanel.add(updown);
	1139	+ versionManagerPanel.add(updown);
640	1140
641		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642		- redoButton.setToolTipText("Next version");
643		- redoButton.addActionListener(this);
644		- redoButton.setEnabled(false);
	1141	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1142	+ nextVersionButton.setToolTipText("Next version");
	1143	+ nextVersionButton.addActionListener(this);
	1144	+ nextVersionButton.setEnabled(false);
	1145	+
	1146	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1147	+ oneStepButton.setToolTipText("Animate one step forward");
	1148	+ oneStepButton.addActionListener(this);
645	1149
646	1150	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
647	1151	liveCB.setToolTipText("Enable animation");
648	1152	liveCB.addItemListener(this);
649	1153
650		- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
651		- oneStepButton.setToolTipText("Animate one step forward");
652		- oneStepButton.addActionListener(this);
653		-
654	1154	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
655	1155	fastCB.setToolTipText("Fast mode");
656	1156	fastCB.addItemListener(this);
..	..	@@ -666,142 +1166,137 @@
666	1166
667	1167	if (Globals.ADVANCED)
668	1168	{
669		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1169	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
670	1170	snapobjectButton.addActionListener(this);
671	1171	snapobjectButton.setToolTipText("Snap Object");
	1172	+
	1173	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1174	+ fourButton.addActionListener(this);
	1175	+ fourButton.setToolTipText("Show control panel only");
672	1176	}
673	1177
674	1178	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
675	1179
676		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
677		- twoButton.setToolTipText("Show center view only");
678		- twoButton.addActionListener(this);
679		- this.fullscreenLayout = twoButton;
680		-
681		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682		- fourButton.addActionListener(this);
683		- fourButton.setToolTipText("Show left panel only");
684		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
685		- sixButton.setToolTipText("2-column layout left");
686		- sixButton.addActionListener(this);
687		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
688		- threeButton.setToolTipText("2-column layout right");
689		- threeButton.addActionListener(this);
690		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
691		- sevenButton.setToolTipText("3-column layout");
692		- sevenButton.addActionListener(this);
693		- //
694	1180
695		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
696		- rootButton.setToolTipText("Edit selection in new tab");
	1181	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1182	+ rootButton.setToolTipText("Open selection in new tab");
697	1183	rootButton.addActionListener(this);
698	1184
699		- oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1185	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
700	1186	closeButton.setToolTipText("Close tab");
701	1187	closeButton.addActionListener(this);
702	1188	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
703	1189	//clearButton.addActionListener(this);
704	1190
	1191	+ cGridBag row1 = new cGridBag();
	1192	+
705	1193	// INSERT
706		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
707		- gridButton.setToolTipText("Create grid");
	1194	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ gridButton.setToolTipText("Create ground");
708	1196	gridButton.addActionListener(this);
709	1197
710		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
711	1199	boxButton.setToolTipText("Create box");
712	1200	boxButton.addActionListener(this);
713	1201
714		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
715		- sphereButton.setToolTipText("Create sphere");
716		- sphereButton.addActionListener(this);
717		-
718		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
719		- coneButton.setToolTipText("Create cone");
720		- coneButton.addActionListener(this);
721		-
722		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
723		- torusButton.setToolTipText("Create torus");
724		- torusButton.addActionListener(this);
725		-
726		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1202	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
727	1203	superButton.setToolTipText("Create superellipsoid");
728	1204	superButton.addActionListener(this);
729	1205
	1206	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ sphereButton.setToolTipText("Create sphere");
	1208	+ sphereButton.addActionListener(this);
	1209	+
	1210	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1211	+ coneButton.setToolTipText("Create cone");
	1212	+ coneButton.addActionListener(this);
	1213	+
	1214	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1215	+ torusButton.setToolTipText("Create torus");
	1216	+ torusButton.addActionListener(this);
	1217	+
730	1218	if (Globals.ADVANCED)
731	1219	{
732		- oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
733	1221	kleinButton.setToolTipText("Create Klein bottle");
734	1222	kleinButton.addActionListener(this);
735	1223	}
736	1224
737		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1225	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
738	1226	particlesButton.setToolTipText("Create particle system");
739	1227	particlesButton.addActionListener(this);
740	1228
741		- oe.toolboxPanel.Return();
	1229	+ oe.toolboxPanel.add(row1);
742	1230
743		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1231	+ cGridBag row2 = new cGridBag();
	1232	+
	1233	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
744	1234	groupButton.setToolTipText("Create group");
745	1235	groupButton.addActionListener(this);
746	1236
747		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
748	1238	compositeButton.setToolTipText("Create composite");
749	1239	compositeButton.addActionListener(this);
750	1240
751		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1241	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
752	1242	switchButton.setToolTipText("Create item switcher");
753	1243	switchButton.addActionListener(this);
754	1244
755		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1245	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
756	1246	loopButton.setToolTipText("Create loop");
757	1247	loopButton.addActionListener(this);
758	1248
759		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1249	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
760	1250	textureButton.setToolTipText("Create texture");
761	1251	textureButton.addActionListener(this);
762	1252
763		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1253	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
764	1254	overlayButton.setToolTipText("Create overlay");
765	1255	overlayButton.addActionListener(this);
766	1256
767		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1257	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
768	1258	lightButton.setToolTipText("Create light");
769	1259	lightButton.addActionListener(this);
770	1260
771		- for (int i=6; --i>=0;)
772		- {
773		- oe.toolboxPanel.Return();
774		- oe.toolboxPanel.add(new cGridBag());
775		- oe.toolboxPanel.add(new cGridBag());
776		- oe.toolboxPanel.add(new cGridBag());
777		- oe.toolboxPanel.add(new cGridBag());
778		- oe.toolboxPanel.add(new cGridBag());
779		- oe.toolboxPanel.add(new cGridBag());
780		- oe.toolboxPanel.add(new cGridBag());
781		- }
	1261	+ oe.toolboxPanel.add(row2);
	1262	+
	1263	+ cGridBag textures = new cGridBag();
	1264	+
	1265	+ CreateTexturePanel(textures);
	1266	+
	1267	+ int tabCount = resourcecontainer.getTabCount();
	1268	+
	1269	+ if (tabCount > 0)
	1270	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1271	+
	1272	+ oe.toolboxPanel.add(textures);
	1273	+
	1274	+ textures.preferredHeight = 100;
	1275	+
	1276	+ CreateSkyboxPanel(oe.skyboxPanel);
782	1277
783	1278	// EDIT panel
784		- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
785	1280	editButton.setToolTipText("Pin selection controls");
786	1281	editButton.addActionListener(this);
787	1282
788		- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
789		- uneditButton.setToolTipText("Remove selection controls");
	1283	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1284	+ uneditButton.setToolTipText("Unpin and remove selection controls");
790	1285	uneditButton.addActionListener(this);
791	1286
792	1287	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
793		- allParamsButton.setToolTipText("Show all controle");
	1288	+ allParamsButton.setToolTipText("Show all controls");
794	1289	allParamsButton.addActionListener(this);
795	1290
796		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
797		- clearPanelButton.setToolTipText("Clear edit panel");
	1291	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1292	+ clearPanelButton.setToolTipText("Clear all controls");
798	1293	clearPanelButton.addActionListener(this);
799	1294
800		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
801		- unselectButton.setToolTipText("Unselect");
802		- unselectButton.addActionListener(this);
	1295	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1296	+ //unselectButton.setToolTipText("Unselect");
	1297	+ //unselectButton.addActionListener(this);
803	1298
804		- editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1299	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
805	1300	flashSelectionButton.setToolTipText("Highlight selection");
806	1301	flashSelectionButton.addActionListener(this);
807	1302
..	..	@@ -824,6 +1319,8 @@
824	1319
825	1320	cGridBag jSPPanel = new cGridBag();
826	1321
	1322	+ jSPPanel.preferredHeight = 20;
	1323	+
827	1324	JScrollPane jSP;
828	1325	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
829	1326	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -832,14 +1329,14 @@
832	1329	oe.treePanel.add(jSPPanel);
833	1330	oe.treePanel.Return();
834	1331
835		- oe.treePanel.add(copyOptionsPanel);
	1332	+ oe.treePanel.add(versionManagerPanel);
836	1333	oe.treePanel.Return();
837		- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 10, 0);
838		- versionField = (cNumberSlider)sliderPane.getComponent(1);
839		- sliderPane.preferredHeight = 1;
	1334	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1335	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1336	+ versionSliderPane.preferredHeight = 3;
840	1337
841		-// mainPanel.setDividerLocation(0.5); //1.0);
842		-// mainPanel.setResizeWeight(0.5);
	1338	+// mainPanel.setDividerLocation(0.1); //1.0);
	1339	+ mainPanel.setResizeWeight(0.4);
843	1340
844	1341	//jList.addListSelectionListener(this);
845	1342	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -847,7 +1344,7 @@
847	1344	//jTree.setEditable(true);
848	1345	oe.jTree.setDragEnabled(true);
849	1346	//jTree.setPreferredSize(new Dimension(10,10));
850		- jSP.setPreferredSize(new Dimension(100,200));
	1347	+ //jSP.setPreferredSize(new Dimension(100,200));
851	1348
852	1349	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
853	1350
..	..	@@ -859,7 +1356,7 @@
859	1356	dgr.addDragGestureListener(this);
860	1357	}catch(Exception e) {}
861	1358	*/
862		- radio.layout = sevenButton;
	1359	+ radio.layout = threeButton; // sixButton;
863	1360	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
864	1361	}
865	1362
..	..	@@ -910,9 +1407,12 @@
910	1407	smoothCB.setToolTipText("Snapping delay");
911	1408	smoothCB.addItemListener(this);
912	1409
913		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
914		- slowCB.setToolTipText("Smooth interpolation");
915		- slowCB.addItemListener(this);
	1410	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1411	+// slowCB.setToolTipText("Smooth interpolation");
	1412	+// slowCB.addItemListener(this);
	1413	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1414	+ minshaderCB.setToolTipText("Minimal fast shader");
	1415	+ minshaderCB.addItemListener(this);
916	1416
917	1417	// constraints.gridy += 1;
918	1418	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -991,6 +1491,14 @@
991	1491
992	1492	void EditObject(Object3D obj)
993	1493	{
	1494	+ assert(obj instanceof Composite);
	1495	+
	1496	+// if (obj.versionlist == null)
	1497	+// {
	1498	+// obj.versionlist = new Object3D[100];
	1499	+// obj.versionindex = -1;
	1500	+// }
	1501	+
994	1502	cRadio radioButton = new cRadio(obj.name);
995	1503
996	1504	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1001,7 +1509,7 @@
1001	1509	}
1002	1510
1003	1511	radioButton.SetObject(obj);
1004		- radioButton.layout = sevenButton;
	1512	+ radioButton.layout = threeButton; // sixButton;
1005	1513	radioButton.SetCamera(cameraView.renderCamera, false);
1006	1514	radioButton.addActionListener(this);
1007	1515	radioPanel.add(radioButton);
..	..	@@ -1015,6 +1523,7 @@
1015	1523
1016	1524	oe.SetupViews();
1017	1525
	1526	+ if (Globals.DEBUG)
1018	1527	System.out.println("SetupViews");
1019	1528	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1020	1529	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1026,6 +1535,8 @@
1026	1535	cCheckBox localCB;
1027	1536	cCheckBox crowdCB;
1028	1537	cCheckBox smoothCB;
	1538	+ cCheckBox minshaderCB;
	1539	+
1029	1540	cToggleButton fastCB;
1030	1541	cCheckBox slowCB;
1031	1542	cCheckBox boxCB;
..	..	@@ -1096,6 +1607,12 @@
1096	1607	{
1097	1608	cameraView.ToggleInertia();
1098	1609	cameraView.repaint();
	1610	+ }
	1611	+ else if(e.getSource() == minshaderCB)
	1612	+ {
	1613	+ Globals.MINSHADER ^= true;
	1614	+ cameraView.programInitialized = false;
	1615	+ cameraView.repaint();
1099	1616	}
1100	1617	else if(e.getSource() == localCB)
1101	1618	{
..	..	@@ -1373,7 +1890,12 @@
1373	1890	TreePath path;
1374	1891
1375	1892	public TransferableTreePath(TreePath tp) {
1376		- path = tp;
	1893	+ Object[] objs = new Object[tp.getPathCount()];
	1894	+ for (int i=0; i<objs.length; i++)
	1895	+ {
	1896	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1897	+ }
	1898	+ path = new TreePath(objs);
1377	1899	}
1378	1900
1379	1901	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1663,7 +2185,11 @@
1663	2185	shadow.material = new cMaterial(obj.material);
1664	2186	shadow.material.diffuse = 0.0001f;
1665	2187	shadow.material.specular = 0.0001f;
1666		- //shadow.projectedVertices[1].x = 300;
	2188	+ shadow.material.opacity = 0.75f;
	2189	+
	2190	+ AllocProjectedVertices(shadow);
	2191	+
	2192	+ shadow.projectedVertices[1].x = 300;
1667	2193
1668	2194	makeSomething(shadow);
1669	2195	}
..	..	@@ -1680,6 +2206,16 @@
1680	2206	listUI.remove(i);
1681	2207	}
1682	2208	}
	2209	+ }
	2210	+
	2211	+ private void EditElement(Object3D elem, boolean newWindow)
	2212	+ {
	2213	+ // if (!(elem instanceof Composite))
	2214	+ // newWindow = false;
	2215	+ listUI.add(elem);
	2216	+ elem.openEditWindow(this, newWindow); //, false);
	2217	+ System.out.println("edit : " + elem);
	2218	+ elem.editWindow.refreshContents(true); // ? new
1683	2219	}
1684	2220
1685	2221	/**
..	..	@@ -2109,6 +2645,23 @@
2109	2645	{
2110	2646	makeSomething(new Light());
2111	2647	} else
	2648	+// if (source == skybox1Button \|\|
	2649	+// source == skybox2Button \|\|
	2650	+// source == skybox3Button \|\|
	2651	+// source == skybox4Button \|\|
	2652	+// source == skybox5Button \|\|
	2653	+// source == skybox6Button \|\|
	2654	+// source == skybox7Button \|\|
	2655	+// source == skybox11Button \|\|
	2656	+// source == skybox12Button \|\|
	2657	+// source == skybox13Button \|\|
	2658	+// source == skybox14Button \|\|
	2659	+// source == skybox15Button \|\|
	2660	+// source == skybox16Button \|\|
	2661	+// source == skybox17Button)
	2662	+// {
	2663	+// ChangeSkybox(source);
	2664	+// } else
2112	2665	if (source == csgItem)
2113	2666	{
2114	2667	group(new CSG());
..	..	@@ -2157,27 +2710,35 @@
2157	2710	} else
2158	2711	if (source == loopItem \|\| source == loopButton)
2159	2712	{
	2713	+ if (!group.selection.isEmpty())
	2714	+ {
2160	2715	Composite csg = new GroupLeaf();
2161	2716	csg.count = 5;
2162		- group(csg);
2163	2717	Composite child = new cGroup("Branch");
2164	2718	csg.addChild(child);
2165	2719	child.addChild(csg);
	2720	+ group(csg);
	2721	+ }
2166	2722	} else
2167	2723	if (source == doubleItem)
2168	2724	{
	2725	+ if (!group.selection.isEmpty())
	2726	+ {
2169	2727	Composite csg = new GroupLeaf("Fork");
2170	2728	csg.count = 5;
2171		- group(csg);
2172	2729	Composite child = new cGroup("Branch A");
2173	2730	csg.addChild(child);
2174	2731	child.addChild(csg);
2175	2732	child = new cGroup("Branch B");
2176	2733	csg.addChild(child);
2177	2734	child.addChild(csg);
	2735	+ group(csg);
	2736	+ }
2178	2737	} else
2179	2738	if (source == tripleItem)
2180	2739	{
	2740	+ if (!group.selection.isEmpty())
	2741	+ {
2181	2742	Composite csg = new GroupLeaf("Trident");
2182	2743	csg.count = 4;
2183	2744	group(csg);
..	..	@@ -2190,11 +2751,12 @@
2190	2751	child = new cGroup();
2191	2752	csg.addChild(child);
2192	2753	child.addChild(csg);
	2754	+ }
2193	2755	} else
2194	2756	if (source == computeAOItem)
2195	2757	{
2196	2758	Globals.drawMode = CameraPane.OCCLUSION;
2197		- Globals.theRenderer.repaint();
	2759	+ cameraView.repaint();
2198	2760	} else
2199	2761	if (source == recompileItem)
2200	2762	{
..	..	@@ -2209,7 +2771,7 @@
2209	2771	if (source == invariantsItem)
2210	2772	{
2211	2773	System.out.println("Invariants:");
2212		- Grafreed.grafreeD.universe.invariants();
	2774	+ Grafreed.grafreed.universe.invariants();
2213	2775	} else
2214	2776	if (source == memoryItem)
2215	2777	{
..	..	@@ -2240,33 +2802,52 @@
2240	2802	{
2241	2803	ToggleFullScreen();
2242	2804	} else
2243		- if (source == undoButton)
	2805	+ if (source == collapseButton)
	2806	+ {
	2807	+ this.expandedLayout = radio.layout;
	2808	+ CollapseToolbar();
	2809	+ } else
	2810	+ if (source == maximize3DButton)
	2811	+ {
	2812	+ this.expandedLayout = radio.layout;
	2813	+ radio.layout = twoButton;
	2814	+ Show3DView();
	2815	+ CollapseToolbar();
	2816	+ } else
	2817	+ if (source == previousVersionButton)
2244	2818	{
2245	2819	// Go to previous version
2246	2820	//if (!Undo())
2247	2821	//java.awt.Toolkit.getDefaultToolkit().beep();
2248		- Undo();
	2822	+ PreviousVersion();
2249	2823	} else
2250	2824	if (source == restoreButton)
2251	2825	{
2252	2826	// Restore current version
2253	2827	Restore();
	2828	+ //restoreButton.setEnabled(false);
2254	2829	} else
2255	2830	if (source == replaceButton)
2256	2831	{
2257	2832	// Overwrite current version
2258	2833	Replace();
	2834	+ //replaceButton.setEnabled(false);
2259	2835	} else
2260		- if (source == redoButton)
	2836	+ if (source == nextVersionButton)
2261	2837	{
2262	2838	// Go to next version
2263		- Redo();
	2839	+ NextVersion();
2264	2840	} else
2265		- if (source == saveButton)
	2841	+ if (source == saveVersionButton)
2266	2842	{
2267	2843	// Save a new version
2268	2844	if (!Save(true))
2269	2845	java.awt.Toolkit.getDefaultToolkit().beep();
	2846	+ } else
	2847	+ if (source == deleteVersionButton)
	2848	+ {
	2849	+ // Delete a new version
	2850	+ DeleteVersion();
2270	2851	} else
2271	2852	if (source == oneStepButton)
2272	2853	{
..	..	@@ -2321,11 +2902,11 @@
2321	2902	} else
2322	2903	if (source == undoItem)
2323	2904	{
2324		- Undo();
	2905	+ PreviousVersion();
2325	2906	} else
2326	2907	if (source == redoItem)
2327	2908	{
2328		- Redo();
	2909	+ NextVersion();
2329	2910	} else
2330	2911	if (source == duplicateItem)
2331	2912	{
..	..	@@ -2646,7 +3227,7 @@
2646	3227	{
2647	3228	StepAll();
2648	3229	} else
2649		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3230	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2650	3231	{
2651	3232	//int indices[] = jList.getSelectedIndices();
2652	3233	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2806,22 +3387,34 @@
2806	3387	} else
2807	3388	if (source == ungroupItem \|\| source == ungroupButton)
2808	3389	{
2809		- boolean hasRoot = false;
	3390	+ boolean canUngroup = true;
2810	3391
2811	3392	for (int i=0; i<group.selection.size(); i++)
2812	3393	{
2813		- if (group.selection.get(i) == group)
	3394	+ Object3D selectedItem = group.selection.get(i);
	3395	+
	3396	+ if (selectedItem.Size() == 0)
2814	3397	{
2815		- hasRoot = true;
	3398	+ // Cannot ungroup leaves
	3399	+ canUngroup = false;
	3400	+ break;
	3401	+ }
	3402	+
	3403	+ if (selectedItem == group)
	3404	+ {
	3405	+ // Cannot ungroup root
	3406	+ canUngroup = false;
2816	3407	break;
2817	3408	}
2818	3409	}
2819	3410
2820		- if (!hasRoot)
	3411	+ if (canUngroup)
2821	3412	{
2822	3413	for (int i=0; i<group.selection.size(); i++)
2823	3414	{
2824		- Ungroup(group.selection.get(i));
	3415	+ Object3D selectedItem = group.selection.get(i);
	3416	+
	3417	+ Ungroup(selectedItem);
2825	3418	}
2826	3419
2827	3420	ClearSelection(false);
..	..	@@ -3128,7 +3721,7 @@
3128	3721	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3129	3722	{
3130	3723	obj = (Object3D)e.nextElement();
3131		- obj.SetBumpTexture(null);
	3724	+ obj.ResetBumpTexture();
3132	3725	}
3133	3726
3134	3727	refreshContents();
..	..	@@ -3142,6 +3735,31 @@
3142	3735	obj.SetBumpTexture(obj.GetPigmentTexture());
3143	3736	}
3144	3737
	3738	+ refreshContents();
	3739	+ } else
	3740	+ if (source == embedTexturesItem)
	3741	+ {
	3742	+ Object3D obj;
	3743	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3744	+ {
	3745	+ obj = (Object3D)e.nextElement();
	3746	+ obj.EmbedTextures(true);
	3747	+ }
	3748	+
	3749	+ refreshContents();
	3750	+ } else
	3751	+ if (source == deEmbedTexturesItem)
	3752	+ {
	3753	+ Object3D obj;
	3754	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3755	+ {
	3756	+ obj = (Object3D)e.nextElement();
	3757	+ obj.EmbedTextures(false);
	3758	+ }
	3759	+
	3760	+ CameraPane.texturepigment.clear();
	3761	+ CameraPane.texturebump.clear();
	3762	+
3145	3763	refreshContents();
3146	3764	} else
3147	3765	if (source == flashSelectionButton)
..	..	@@ -3159,38 +3777,7 @@
3159	3777	if (CameraPane.FULLSCREEN)
3160	3778	fullscreenLayout = radio.layout;
3161	3779
3162		- // bug
3163		- //gridPanel.setDividerLocation(1.0);
3164		- //bigPanel.setDividerLocation(0.0);
3165		-// bigThree.remove(scenePanel);
3166		-// bigThree.remove(centralPanel);
3167		-// bigThree.remove(XYZPanel);
3168		-// aWindowConstraints.gridx = 0;
3169		-// aWindowConstraints.gridy = 0;
3170		-// aWindowConstraints.gridwidth = 1;
3171		-// // aConstraints.gridheight = 3;
3172		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3173		-// aWindowConstraints.weightx = 0;
3174		-// aWindowConstraints.weighty = 1;
3175		-// //bigThree.add(jtp, aWindowConstraints);
3176		-// aWindowConstraints.weightx = 1;
3177		-// aWindowConstraints.gridwidth = 3;
3178		-// // aConstraints.gridheight = 3;
3179		-// aWindowConstraints.gridx = 1;
3180		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3181		-// bigThree.add(centralPanel, aWindowConstraints);
3182		-// aWindowConstraints.weightx = 0;
3183		-// aWindowConstraints.gridx = 4;
3184		-// aWindowConstraints.gridwidth = 1;
3185		-// // aConstraints.gridheight = 3;
3186		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3187		-// //bigThree.add(XYZPanel, aWindowConstraints);
3188		-// scenePanel.setVisible(false);
3189		-// centralPanel.setVisible(true);
3190		-// XYZPanel.setVisible(false);
3191		- bigThree.ClearUI();
3192		- bigThree.add(centralPanel);
3193		- bigThree.FlushUI();
	3780	+ Show3DView();
3194	3781
3195	3782	cameraView.requestFocusInWindow();
3196	3783
..	..	@@ -3245,8 +3832,8 @@
3245	3832	// centralPanel.setVisible(true);
3246	3833	// XYZPanel.setVisible(true);
3247	3834	bigThree.ClearUI();
	3835	+ bigThree.add(scenePanel);
3248	3836	bigThree.add(centralPanel);
3249		- bigThree.add(XYZPanel);
3250	3837	bigThree.FlushUI();
3251	3838
3252	3839	cameraView.requestFocusInWindow();
..	..	@@ -3326,8 +3913,8 @@
3326	3913	// centralPanel.setVisible(true);
3327	3914	// XYZPanel.setVisible(false);
3328	3915	bigThree.ClearUI();
3329		- bigThree.add(scenePanel);
3330	3916	bigThree.add(centralPanel);
	3917	+ bigThree.add(scenePanel);
3331	3918	bigThree.FlushUI();
3332	3919
3333	3920	cameraView.requestFocusInWindow();
..	..	@@ -3376,6 +3963,7 @@
3376	3963	} else
3377	3964	if (source == rootButton)
3378	3965	{
	3966	+ Replace();
3379	3967	Object3D obj;
3380	3968	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3381	3969	{
..	..	@@ -3390,6 +3978,8 @@
3390	3978	if (source == closeButton)
3391	3979	{
3392	3980	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3981	+ Replace();
	3982	+
3393	3983	cRadio ab;
3394	3984	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3395	3985	{
..	..	@@ -3433,10 +4023,10 @@
3433	4023	{
3434	4024	Object3D child = (Object3D)e.nextElement();
3435	4025	if(child.editWindow != null)
3436		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3437	4026	child.pinned = false;
3438	4027	child.CloseUI();
3439	4028	listUI.remove(child);
	4029	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3440	4030
3441	4031	//child.editWindow = null; // ???????????
3442	4032	}
..	..	@@ -3455,6 +4045,7 @@
3455	4045	obj.CloseUI();
3456	4046	}
3457	4047	listUI.clear();
	4048	+ SetPinStates(group.selection.size() > 0);
3458	4049	refreshContents(true);
3459	4050	} else
3460	4051	if (source == allParamsButton)
..	..	@@ -3487,6 +4078,8 @@
3487	4078	} else
3488	4079	if(source instanceof cRadio)
3489	4080	{
	4081	+ Replace();
	4082	+
3490	4083	group.parent = keepparent;
3491	4084	group.attributes = 0;
3492	4085	//group.editWindow = null;
..	..	@@ -3511,8 +4104,6 @@
3511	4104
3512	4105	copy = group;
3513	4106
3514		- SetUndoStates();
3515		-
3516	4107	//Globals.theRenderer.object = group;
3517	4108	if(!useclient)
3518	4109	{
..	..	@@ -3540,9 +4131,35 @@
3540	4131	*/
3541	4132	radio.layout.doClick();
3542	4133
	4134	+ assert(copy instanceof Composite);
	4135	+
	4136	+ if (copy.versionlist == null)
	4137	+ {
	4138	+ copy.versionindex = -1;
	4139	+
	4140	+ // Cannot work with loops
	4141	+ // To fix this issue, we first mark all nodes above the root,
	4142	+ // and check if any of these nodes are reachable below the root.
	4143	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4144	+
	4145	+ if (!copy.HasTags())
	4146	+ {
	4147	+ copy.versionlist = new Object3D[100];
	4148	+
	4149	+ Save(true);
	4150	+ }
	4151	+
	4152	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4153	+ }
	4154	+
	4155	+ SetVersionStates();
	4156	+
3543	4157	ClearUnpinned();
3544		- SetPinStates(group.selection.size() > 0);
3545		- if (group.selection.size() == 1)
	4158	+
	4159	+ //Grafreed.Assert(group != null);
	4160	+ //Grafreed.Assert(group.selection != null);
	4161	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4162	+ if (group.selection == null \|\| group.selection.size() == 1)
3546	4163	EditSelection(false);
3547	4164	keepparent = group.parent;
3548	4165	// PARENT = NULL or not???
..	..	@@ -3555,11 +4172,13 @@
3555	4172	} else if (event.getSource() == editCameraItem)
3556	4173	{
3557	4174	cameraView.ProtectCamera();
	4175	+ cameraView.requestFocusInWindow();
3558	4176	cameraView.repaint();
3559	4177	return;
3560	4178	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3561	4179	{
3562	4180	cameraView.RevertCamera();
	4181	+ cameraView.requestFocusInWindow();
3563	4182	cameraView.repaint();
3564	4183	return;
3565	4184	// } else if (event.getSource() == textureButton)
..	..	@@ -3678,7 +4297,7 @@
3678	4297	TouchTransform(obj);
3679	4298	continue;
3680	4299	}
3681		- if ((mask&2) != 0) // Scale
	4300	+ if ((mask&2) != 0) // Scale/rotation
3682	4301	{
3683	4302	obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3684	4303	obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..	..	@@ -3686,10 +4305,6 @@
3686	4305	obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3687	4306	obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3688	4307	obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3689		- }
3690		- if ((mask&4) != 0) // Rotation
3691		- {
3692		- // ?
3693	4308	}
3694	4309	if ((mask&1) != 0) // Translation
3695	4310	{
..	..	@@ -4136,7 +4751,7 @@
4136	4751
4137	4752	try
4138	4753	{
4139		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4754	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4140	4755	}
4141	4756	catch (Exception e)
4142	4757	{
..	..	@@ -4613,6 +5228,12 @@
4613	5228
4614	5229	void EditSelection(boolean newWindow)
4615	5230	{
	5231	+ if (group.selection == null)
	5232	+ {
	5233	+ EditElement(group, newWindow); // ? new
	5234	+ return;
	5235	+ }
	5236	+
4616	5237	// aConstraints.gridy = 0;
4617	5238	for (int i=0; i<group.selection.size(); i++)
4618	5239	{
..	..	@@ -4623,12 +5244,7 @@
4623	5244	Object3D elem = (Object3D)group.selection.elementAt(i);
4624	5245	if(elem != group \|\| !newWindow)
4625	5246	{
4626		- // if (!(elem instanceof Composite))
4627		- // newWindow = false;
4628		- listUI.add(elem);
4629		- elem.openEditWindow(this, newWindow); //, false);
4630		- System.out.println("edit : " + elem);
4631		- elem.editWindow.refreshContents(true); // ? new
	5247	+ EditElement(elem, newWindow); // ? new
4632	5248	}
4633	5249	}
4634	5250	}
..	..	@@ -4691,9 +5307,7 @@
4691	5307
4692	5308	freezemodel = false;
4693	5309	}
4694		-
4695		- boolean flashIt = true;
4696		-
	5310	+
4697	5311	public void valueChanged(TreeSelectionEvent e)
4698	5312	//public boolean handleEvent(Event event)
4699	5313	{
..	..	@@ -4766,13 +5380,31 @@
4766	5380	{
4767	5381	editButton.setEnabled(enabled);
4768	5382	uneditButton.setEnabled(enabled);
4769		- unselectButton.setEnabled(enabled);
	5383	+ //unselectButton.setEnabled(enabled);
4770	5384	flashSelectionButton.setEnabled(enabled);
	5385	+
	5386	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5387	+
	5388	+ boolean allComposites = true;
	5389	+
	5390	+ if (group.selection != null)
	5391	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5392	+ {
	5393	+ Object next = e.nextElement();
	5394	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5395	+ {
	5396	+ allComposites = false;
	5397	+ break;
	5398	+ }
	5399	+ }
	5400	+
	5401	+ rootButton.setEnabled(allComposites);
4771	5402	}
4772	5403
4773	5404	void refreshContents(boolean cp)
4774	5405	{
4775		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	5406	+ if (Globals.ADVANCED)
	5407	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4776	5408	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4777	5409	{
4778	5410	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -4782,7 +5414,7 @@
4782	5414	Object3D child = (Object3D) group.selection.get(i);
4783	5415
4784	5416	objEditor.AddInfo(child, this, true);
4785		- System.err.println("info : " + child.GetPath());
	5417	+// System.err.println("info : " + child.GetPath());
4786	5418	}
4787	5419
4788	5420	objEditor.SetText(); // jan 2014
..	..	@@ -5608,7 +6240,6 @@
5608	6240
5609	6241	cButton restoreCameraButton;
5610	6242
5611		- cButton saveButton;
5612	6243	cButton oneStepButton;
5613	6244
5614	6245	cButton groupButton;
..	..	@@ -5617,6 +6248,22 @@
5617	6248	cButton switchButton;
5618	6249	cButton loopButton;
5619	6250	cButton textureButton;
	6251	+
	6252	+ cButton skybox1Button;
	6253	+ cButton skybox2Button;
	6254	+ cButton skybox3Button;
	6255	+ cButton skybox4Button;
	6256	+ cButton skybox5Button;
	6257	+ cButton skybox6Button;
	6258	+ cButton skybox7Button;
	6259	+
	6260	+ cButton skybox11Button;
	6261	+ cButton skybox12Button;
	6262	+ cButton skybox13Button;
	6263	+ cButton skybox14Button;
	6264	+ cButton skybox15Button;
	6265	+ cButton skybox16Button;
	6266	+ cButton skybox17Button;
5620	6267
5621	6268	cButton gridButton;
5622	6269	cButton boxButton;
..	..	@@ -5650,11 +6297,11 @@
5650	6297	private MenuItem lookAtItem;
5651	6298	private MenuItem lookFromItem;
5652	6299	private MenuItem switchViewItem;
5653		- private MenuItem cutItem;
	6300	+ private JMenuItem cutItem;
5654	6301	private MenuItem undoItem;
5655	6302	private MenuItem redoItem;
5656	6303	private JMenuItem duplicateItem;
5657		- private MenuItem cloneItem;
	6304	+ private JMenuItem cloneItem;
5658	6305	private MenuItem cloneSupportItem;
5659	6306	private MenuItem overwriteGeoItem;
5660	6307	private MenuItem overwriteMatItem;
..	..	@@ -5675,13 +6322,13 @@
5675	6322	private MenuItem cloneGeometriesItem;
5676	6323	private MenuItem shareGeometriesItem;
5677	6324	private MenuItem mergeGeometriesItem;
5678		- private MenuItem copyItem;
	6325	+ private JMenuItem copyItem;
5679	6326	private MenuItem pasteItem;
5680		- private MenuItem pasteIntoItem;
5681		- private MenuItem pasteLinkItem;
5682		- private MenuItem pasteCloneItem;
5683		- private MenuItem pasteExpandItem;
5684		- private MenuItem clearItem;
	6327	+ private JMenuItem pasteIntoItem;
	6328	+ private JMenuItem pasteLinkItem;
	6329	+ private JMenuItem pasteCloneItem;
	6330	+ private JMenuItem pasteExpandItem;
	6331	+ private JMenuItem deleteItem;
5685	6332	private MenuItem clearAllItem;
5686	6333	private MenuItem genUVItem;
5687	6334	private MenuItem genNormalsMESHItem;
..	..	@@ -5736,7 +6383,7 @@
5736	6383	private MenuItem transformGeometryItem;
5737	6384	private MenuItem transformChildrenItem;
5738	6385	private MenuItem hideItem;
5739		- private MenuItem grabItem;
	6386	+ private JMenuItem grabItem;
5740	6387	private MenuItem backItem;
5741	6388	private MenuItem frontItem;
5742	6389	private MenuItem cameraItem;
..	..	@@ -5749,7 +6396,7 @@
5749	6396	private MenuItem switchTransfoItem;
5750	6397	private MenuItem morphItem;
5751	6398	private MenuItem linkerItem;
5752		- private MenuItem ungroupItem;
	6399	+ private JMenuItem ungroupItem;
5753	6400	private MenuItem editItem;
5754	6401	private MenuItem openWindowItem;
5755	6402	private MenuItem editLeafItem;
..	..	@@ -5765,6 +6412,8 @@
5765	6412	private MenuItem attachBumpItem;
5766	6413	private MenuItem detachBumpItem;
5767	6414	private MenuItem pigmentBumpItem;
	6415	+ private MenuItem embedTexturesItem;
	6416	+ private MenuItem deEmbedTexturesItem;
5768	6417
5769	6418	private MenuItem particleItem;
5770	6419	private MenuItem ragdollItem;