~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	//
..	..	@@ -385,11 +765,11 @@
385	765	shadowYItem.addActionListener(this);
386	766	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
387	767	shadowZItem.addActionListener(this);
388		- attributeItem = menu.add(new MenuItem("Attribute"));
389		- attributeItem.addActionListener(this);
390	768
391	769	if (Globals.ADVANCED)
392	770	{
	771	+ attributeItem = menu.add(new MenuItem("Attribute"));
	772	+ attributeItem.addActionListener(this);
393	773	menu.add("-");
394	774	linkerItem = menu.add(new MenuItem("Linker"));
395	775	linkerItem.addActionListener(this);
..	..	@@ -399,11 +779,18 @@
399	779	pointflowItem.addActionListener(this);
400	780	}
401	781	menu.add("-");
	782	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	783	+ textureRatioRItem.addActionListener(this);
	784	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	785	+ textureRatioGItem.addActionListener(this);
	786	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	787	+ textureRatioBItem.addActionListener(this);
	788	+ menu.add("-");
402	789	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
403	790	resetTransformItem.addActionListener(this);
404	791	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
405	792	resetCentroidItem.addActionListener(this);
406		- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	793	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
407	794	resetCentroidXZItem.addActionListener(this);
408	795	transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
409	796	transformGeometryItem.addActionListener(this);
..	..	@@ -421,7 +808,7 @@
421	808	genNormalsMESHItem.addActionListener(this);
422	809	if (Globals.ADVANCED)
423	810	{
424		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	811	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
425	812	genNormalsMINEItem.addActionListener(this);
426	813	}
427	814	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -455,6 +842,8 @@
455	842	}
456	843
457	844	oe.menuBar.add(menu = new Menu("Attributes"));
	845	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	846	+ clearVersionsItem.addActionListener(this);
458	847	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
459	848	clearMaterialsItem.addActionListener(this);
460	849	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -477,9 +866,9 @@
477	866	hideleavesItem.addActionListener(this);
478	867	showleavesItem = menu.add(new MenuItem("Show Leaves"));
479	868	showleavesItem.addActionListener(this);
480		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	869	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
481	870	markleavesItem.addActionListener(this);
482		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	871	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
483	872	unmarkleavesItem.addActionListener(this);
484	873	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
485	874	rewindleavesItem.addActionListener(this);
..	..	@@ -514,10 +903,15 @@
514	903	attachBumpItem.addActionListener(this);
515	904	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
516	905	pigmentBumpItem.addActionListener(this);
	906	+ //embedTexturesItem
517	907	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
518	908	detachPigmentItem.addActionListener(this);
519	909	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
520	910	detachBumpItem.addActionListener(this);
	911	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	912	+ embedTexturesItem.addActionListener(this);
	913	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	914	+ deEmbedTexturesItem.addActionListener(this);
521	915	menu.add("-");
522	916	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
523	917	sortbysizeItem.addActionListener(this);
..	..	@@ -528,6 +922,9 @@
528	922	shareGeometriesItem.addActionListener(this);
529	923	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
530	924	mergeGeometriesItem.addActionListener(this);
	925	+ menu.add("-");
	926	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	927	+ editLeafItem.addActionListener(this);
531	928	if (Globals.ADVANCED)
532	929	{
533	930	// Pretty much the same as duplicate and clone.
..	..	@@ -544,6 +941,79 @@
544	941	buildToolsMenu(menu);
545	942	}
546	943
	944	+ JTabbedPane resourcecontainer;
	945	+ cGridBag currenttab;
	946	+ //boolean added; // patch for jar
	947	+
	948	+ int totalcount = 0;
	949	+
	950	+ int tabcount = 0;
	951	+ int colcount = 0;
	952	+ int rowcount = 0;
	953	+ int texturecount = 0;
	954	+
	955	+ int columns = 5;
	956	+ int rows = 7;
	957	+
	958	+ public void ResourceCallBack(String[] path)
	959	+ {
	960	+// for (int i = 0; i < path.length; i++)
	961	+// System.out.print(path[i] + "/");
	962	+// System.out.println();
	963	+
	964	+ if (//rowcount == 0 \|\|
	965	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	966	+ {
	967	+ currenttab = new cGridBag();
	968	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	969	+ currenttab.setName(tabname);
	970	+ //added = false;
	971	+ resourcecontainer.add(currenttab);
	972	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	973	+ rowcount = 1;
	974	+ colcount = 0;
	975	+ texturecount = 0;
	976	+ }
	977	+
	978	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	979	+ {
	980	+ //if (!added)
	981	+ {
	982	+ //added = true;
	983	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	984	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	985	+ }
	986	+
	987	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	988	+ totalcount++;
	989	+
	990	+ if (++colcount >= columns)
	991	+ {
	992	+ colcount = 0;
	993	+ currenttab.Return();
	994	+
	995	+ if (rowcount++ >= rows)
	996	+ {
	997	+ rowcount = 0;
	998	+ }
	999	+ }
	1000	+ }
	1001	+ else
	1002	+ {
	1003	+// if (!path[path.length-1].equals("icons"))
	1004	+// resourcecontainer.Return();
	1005	+ }
	1006	+ }
	1007	+
	1008	+ void CreateTexturePanel(cGridBag container)
	1009	+ {
	1010	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1011	+ container.add(resourcecontainer);
	1012	+
	1013	+ Grafreed.ParseResources("textures", this);
	1014	+
	1015	+ // 935. System.out.println("Total = " + totalcount);
	1016	+ }
547	1017
548	1018	void SetupUI2(ObjEditor oe)
549	1019	{
..	..	@@ -562,11 +1032,6 @@
562	1032	//new Exception().printStackTrace();
563	1033
564	1034	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	1035	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
571	1036
572	1037	oe.buttonGroup = new ButtonGroup();
..	..	@@ -587,9 +1052,9 @@
587	1052	oe.radioPanel.add(dummyButton);
588	1053	oe.buttonGroup.add(dummyButton);
589	1054	*/
590		- cGridBag copyOptionsPanel = new cGridBag();
	1055	+ cGridBag versionManagerPanel = new cGridBag();
591	1056
592		- copyOptionsPanel.preferredHeight = 1;
	1057	+ versionManagerPanel.preferredHeight = 4;
593	1058
594	1059	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
595	1060
..	..	@@ -599,58 +1064,102 @@
599	1064
600	1065	if (Globals.ADVANCED)
601	1066	{
602		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603		- maxButton.setToolTipText("Maximize window");
604		- maxButton.addActionListener(this);
	1067	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+// maxButton.setToolTipText("Maximize window");
	1069	+// maxButton.addActionListener(this);
605	1070	}
606	1071
607		- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ cButton gcButton;
	1073	+
	1074	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1075	+// gcButton.setToolTipText("Garbage collect");
	1076	+// gcButton.addActionListener(new ActionListener()
	1077	+// {
	1078	+// public void actionPerformed(ActionEvent e)
	1079	+// {
	1080	+// System.gc();
	1081	+// }
	1082	+// });
	1083	+
	1084	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1085	+ collapseButton.setToolTipText("Collapse toolbar");
	1086	+ collapseButton.addActionListener(this);
	1087	+
	1088	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1090	+ maximize3DButton.addActionListener(this);
	1091	+
	1092	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ twoButton.setToolTipText("Show 3D view only");
	1094	+ twoButton.addActionListener(this);
	1095	+ this.fullscreenLayout = twoButton;
	1096	+
	1097	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ threeButton.setToolTipText("Show controls and 3D view");
	1099	+ threeButton.addActionListener(this);
	1100	+ if (Globals.ADVANCED)
	1101	+ {
	1102	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ sixButton.setToolTipText("Show 3D view and controls");
	1104	+ sixButton.addActionListener(this);
	1105	+ }
	1106	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1107	+// sevenButton.setToolTipText("3-column layout");
	1108	+// sevenButton.addActionListener(this);
	1109	+ //
	1110	+
	1111	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
608	1112	fullButton.setToolTipText("Full-screen window");
609	1113	fullButton.addActionListener(this);
610	1114
611		- oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1115	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
612	1116	screenfitButton.setToolTipText("Screen fit");
613	1117	screenfitButton.addActionListener(this);
614	1118
615		- oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1119	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
616	1120	restoreCameraButton.setToolTipText("Restore viewpoint");
617	1121	restoreCameraButton.addActionListener(this);
618	1122
619		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620		- saveButton.setToolTipText("New version");
621		- saveButton.addActionListener(this);
	1123	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ saveVersionButton.setToolTipText("Duplicate current version");
	1125	+ saveVersionButton.addActionListener(this);
622	1126
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);
	1127	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1128	+ deleteVersionButton.setToolTipText("Delete current version");
	1129	+ deleteVersionButton.addActionListener(this);
	1130	+ deleteVersionButton.setEnabled(false);
	1131	+
	1132	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1133	+ previousVersionButton.setToolTipText("Previous version");
	1134	+ previousVersionButton.addActionListener(this);
	1135	+ previousVersionButton.setEnabled(false);
627	1136
628	1137	cGridBag updown = new cGridBag().setVertical(true);
629		- updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
630		- restoreButton.setToolTipText("Restore current");
	1138	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1139	+ restoreButton.setToolTipText("Undo (restore current version)");
631	1140	restoreButton.addActionListener(this);
632	1141	restoreButton.setEnabled(false);
633	1142
634		- updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
635		- replaceButton.setToolTipText("Replace current");
	1143	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1144	+ replaceButton.setToolTipText("Save (replace current version)");
636	1145	replaceButton.addActionListener(this);
637	1146	replaceButton.setEnabled(false);
638	1147
639		- copyOptionsPanel.add(updown);
	1148	+ versionManagerPanel.add(updown);
640	1149
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);
	1150	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1151	+ nextVersionButton.setToolTipText("Next version");
	1152	+ nextVersionButton.addActionListener(this);
	1153	+ nextVersionButton.setEnabled(false);
	1154	+
	1155	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1156	+ oneStepButton.setToolTipText("Animate one step forward");
	1157	+ oneStepButton.addActionListener(this);
645	1158
646	1159	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
647	1160	liveCB.setToolTipText("Enable animation");
648	1161	liveCB.addItemListener(this);
649	1162
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	1163	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
655	1164	fastCB.setToolTipText("Fast mode");
656	1165	fastCB.addItemListener(this);
..	..	@@ -666,142 +1175,137 @@
666	1175
667	1176	if (Globals.ADVANCED)
668	1177	{
669		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1178	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
670	1179	snapobjectButton.addActionListener(this);
671	1180	snapobjectButton.setToolTipText("Snap Object");
	1181	+
	1182	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1183	+ fourButton.addActionListener(this);
	1184	+ fourButton.setToolTipText("Show control panel only");
672	1185	}
673	1186
674	1187	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
675	1188
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	1189
695		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
696		- rootButton.setToolTipText("Edit selection in new tab");
	1190	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ rootButton.setToolTipText("Open selection in new tab");
697	1192	rootButton.addActionListener(this);
698	1193
699		- oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
700	1195	closeButton.setToolTipText("Close tab");
701	1196	closeButton.addActionListener(this);
702	1197	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
703	1198	//clearButton.addActionListener(this);
704	1199
	1200	+ cGridBag row1 = new cGridBag();
	1201	+
705	1202	// INSERT
706		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
707		- gridButton.setToolTipText("Create grid");
	1203	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1204	+ gridButton.setToolTipText("Create ground");
708	1205	gridButton.addActionListener(this);
709	1206
710		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
711	1208	boxButton.setToolTipText("Create box");
712	1209	boxButton.addActionListener(this);
713	1210
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);
	1211	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
727	1212	superButton.setToolTipText("Create superellipsoid");
728	1213	superButton.addActionListener(this);
729	1214
730		- if (Globals.ADVANCED)
	1215	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ sphereButton.setToolTipText("Create sphere");
	1217	+ sphereButton.addActionListener(this);
	1218	+
	1219	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ coneButton.setToolTipText("Create cone");
	1221	+ coneButton.addActionListener(this);
	1222	+
	1223	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ torusButton.setToolTipText("Create torus");
	1225	+ torusButton.addActionListener(this);
	1226	+
	1227	+ if (false) //Globals.ADVANCED)
731	1228	{
732		- oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1229	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
733	1230	kleinButton.setToolTipText("Create Klein bottle");
734	1231	kleinButton.addActionListener(this);
735	1232	}
736	1233
737		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1234	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
738	1235	particlesButton.setToolTipText("Create particle system");
739	1236	particlesButton.addActionListener(this);
740	1237
741		- oe.toolboxPanel.Return();
	1238	+ oe.toolboxPanel.add(row1);
742	1239
743		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1240	+ cGridBag row2 = new cGridBag();
	1241	+
	1242	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
744	1243	groupButton.setToolTipText("Create group");
745	1244	groupButton.addActionListener(this);
746	1245
747		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1246	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
748	1247	compositeButton.setToolTipText("Create composite");
749	1248	compositeButton.addActionListener(this);
750	1249
751		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1250	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
752	1251	switchButton.setToolTipText("Create item switcher");
753	1252	switchButton.addActionListener(this);
754	1253
755		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1254	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
756	1255	loopButton.setToolTipText("Create loop");
757	1256	loopButton.addActionListener(this);
758	1257
759		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1258	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
760	1259	textureButton.setToolTipText("Create texture");
761	1260	textureButton.addActionListener(this);
762	1261
763		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1262	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
764	1263	overlayButton.setToolTipText("Create overlay");
765	1264	overlayButton.addActionListener(this);
766	1265
767		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1266	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
768	1267	lightButton.setToolTipText("Create light");
769	1268	lightButton.addActionListener(this);
770	1269
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		- }
	1270	+ oe.toolboxPanel.add(row2);
	1271	+
	1272	+ cGridBag textures = new cGridBag();
	1273	+
	1274	+ CreateTexturePanel(textures);
	1275	+
	1276	+ int tabCount = resourcecontainer.getTabCount();
	1277	+
	1278	+ if (tabCount > 0)
	1279	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1280	+
	1281	+ oe.toolboxPanel.add(textures);
	1282	+
	1283	+ textures.preferredHeight = 100;
	1284	+
	1285	+ CreateSkyboxPanel(oe.skyboxPanel);
782	1286
783	1287	// EDIT panel
784		- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1288	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
785	1289	editButton.setToolTipText("Pin selection controls");
786	1290	editButton.addActionListener(this);
787	1291
788		- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
789		- uneditButton.setToolTipText("Remove selection controls");
	1292	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1293	+ uneditButton.setToolTipText("Unpin and remove selection controls");
790	1294	uneditButton.addActionListener(this);
791	1295
792	1296	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
793		- allParamsButton.setToolTipText("Show all controle");
	1297	+ allParamsButton.setToolTipText("Show all controls");
794	1298	allParamsButton.addActionListener(this);
795	1299
796		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
797		- clearPanelButton.setToolTipText("Clear edit panel");
	1300	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1301	+ clearPanelButton.setToolTipText("Clear all controls");
798	1302	clearPanelButton.addActionListener(this);
799	1303
800		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
801		- unselectButton.setToolTipText("Unselect");
802		- unselectButton.addActionListener(this);
	1304	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1305	+ //unselectButton.setToolTipText("Unselect");
	1306	+ //unselectButton.addActionListener(this);
803	1307
804		- editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1308	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
805	1309	flashSelectionButton.setToolTipText("Highlight selection");
806	1310	flashSelectionButton.addActionListener(this);
807	1311
..	..	@@ -824,6 +1328,8 @@
824	1328
825	1329	cGridBag jSPPanel = new cGridBag();
826	1330
	1331	+ jSPPanel.preferredHeight = 20;
	1332	+
827	1333	JScrollPane jSP;
828	1334	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
829	1335	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -832,14 +1338,14 @@
832	1338	oe.treePanel.add(jSPPanel);
833	1339	oe.treePanel.Return();
834	1340
835		- oe.treePanel.add(copyOptionsPanel);
	1341	+ oe.treePanel.add(versionManagerPanel);
836	1342	oe.treePanel.Return();
837		- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 10, 0);
838		- versionField = (cNumberSlider)sliderPane.getComponent(1);
839		- sliderPane.preferredHeight = 1;
	1343	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1344	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1345	+ versionSliderPane.preferredHeight = 3;
840	1346
841		-// mainPanel.setDividerLocation(0.5); //1.0);
842		-// mainPanel.setResizeWeight(0.5);
	1347	+// mainPanel.setDividerLocation(0.1); //1.0);
	1348	+ mainPanel.setResizeWeight(0.4);
843	1349
844	1350	//jList.addListSelectionListener(this);
845	1351	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -847,7 +1353,7 @@
847	1353	//jTree.setEditable(true);
848	1354	oe.jTree.setDragEnabled(true);
849	1355	//jTree.setPreferredSize(new Dimension(10,10));
850		- jSP.setPreferredSize(new Dimension(100,200));
	1356	+ //jSP.setPreferredSize(new Dimension(100,200));
851	1357
852	1358	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
853	1359
..	..	@@ -859,7 +1365,7 @@
859	1365	dgr.addDragGestureListener(this);
860	1366	}catch(Exception e) {}
861	1367	*/
862		- radio.layout = sevenButton;
	1368	+ radio.layout = threeButton; // sixButton;
863	1369	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
864	1370	}
865	1371
..	..	@@ -910,9 +1416,12 @@
910	1416	smoothCB.setToolTipText("Snapping delay");
911	1417	smoothCB.addItemListener(this);
912	1418
913		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
914		- slowCB.setToolTipText("Smooth interpolation");
915		- slowCB.addItemListener(this);
	1419	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1420	+// slowCB.setToolTipText("Smooth interpolation");
	1421	+// slowCB.addItemListener(this);
	1422	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1423	+ minshaderCB.setToolTipText("Minimal fast shader");
	1424	+ minshaderCB.addItemListener(this);
916	1425
917	1426	// constraints.gridy += 1;
918	1427	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -991,6 +1500,14 @@
991	1500
992	1501	void EditObject(Object3D obj)
993	1502	{
	1503	+ //assert(obj instanceof Composite);
	1504	+
	1505	+// if (obj.versionlist == null)
	1506	+// {
	1507	+// obj.versionlist = new Object3D[100];
	1508	+// obj.versionindex = -1;
	1509	+// }
	1510	+
994	1511	cRadio radioButton = new cRadio(obj.name);
995	1512
996	1513	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1001,7 +1518,7 @@
1001	1518	}
1002	1519
1003	1520	radioButton.SetObject(obj);
1004		- radioButton.layout = sevenButton;
	1521	+ radioButton.layout = threeButton; // sixButton;
1005	1522	radioButton.SetCamera(cameraView.renderCamera, false);
1006	1523	radioButton.addActionListener(this);
1007	1524	radioPanel.add(radioButton);
..	..	@@ -1015,6 +1532,7 @@
1015	1532
1016	1533	oe.SetupViews();
1017	1534
	1535	+ if (Globals.DEBUG)
1018	1536	System.out.println("SetupViews");
1019	1537	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1020	1538	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1026,6 +1544,8 @@
1026	1544	cCheckBox localCB;
1027	1545	cCheckBox crowdCB;
1028	1546	cCheckBox smoothCB;
	1547	+ cCheckBox minshaderCB;
	1548	+
1029	1549	cToggleButton fastCB;
1030	1550	cCheckBox slowCB;
1031	1551	cCheckBox boxCB;
..	..	@@ -1096,6 +1616,12 @@
1096	1616	{
1097	1617	cameraView.ToggleInertia();
1098	1618	cameraView.repaint();
	1619	+ }
	1620	+ else if(e.getSource() == minshaderCB)
	1621	+ {
	1622	+ Globals.MINSHADER ^= true;
	1623	+ cameraView.programInitialized = false;
	1624	+ cameraView.repaint();
1099	1625	}
1100	1626	else if(e.getSource() == localCB)
1101	1627	{
..	..	@@ -1373,7 +1899,12 @@
1373	1899	TreePath path;
1374	1900
1375	1901	public TransferableTreePath(TreePath tp) {
1376		- path = tp;
	1902	+ Object[] objs = new Object[tp.getPathCount()];
	1903	+ for (int i=0; i<objs.length; i++)
	1904	+ {
	1905	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1906	+ }
	1907	+ path = new TreePath(objs);
1377	1908	}
1378	1909
1379	1910	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1605,24 +2136,24 @@
1605	2136	switch(axis)
1606	2137	{
1607	2138	case 0 :
1608		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1609		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1610		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1611		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2139	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2140	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2141	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2142	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
1612	2143	norm = cVector.X;
1613	2144	break;
1614	2145	case 1 :
1615		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1616		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1617		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1618		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2146	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2147	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2148	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2149	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
1619	2150	norm = cVector.Y;
1620	2151	break;
1621	2152	case 2 :
1622		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1623		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1624		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1625		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2153	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2154	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2155	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2156	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
1626	2157	norm = cVector.Z;
1627	2158	break;
1628	2159	}
..	..	@@ -1663,7 +2194,11 @@
1663	2194	shadow.material = new cMaterial(obj.material);
1664	2195	shadow.material.diffuse = 0.0001f;
1665	2196	shadow.material.specular = 0.0001f;
1666		- //shadow.projectedVertices[1].x = 300;
	2197	+ shadow.material.opacity = 0.75f;
	2198	+
	2199	+ AllocProjectedVertices(shadow);
	2200	+
	2201	+ shadow.projectedVertices[1].x = 300;
1667	2202
1668	2203	makeSomething(shadow);
1669	2204	}
..	..	@@ -1680,6 +2215,16 @@
1680	2215	listUI.remove(i);
1681	2216	}
1682	2217	}
	2218	+ }
	2219	+
	2220	+ private void EditElement(Object3D elem, boolean newWindow)
	2221	+ {
	2222	+ // if (!(elem instanceof Composite))
	2223	+ // newWindow = false;
	2224	+ listUI.add(elem);
	2225	+ elem.openEditWindow(this, newWindow); //, false);
	2226	+ System.out.println("edit : " + elem);
	2227	+ elem.editWindow.refreshContents(true); // ? new
1683	2228	}
1684	2229
1685	2230	/**
..	..	@@ -2109,6 +2654,23 @@
2109	2654	{
2110	2655	makeSomething(new Light());
2111	2656	} else
	2657	+// if (source == skybox1Button \|\|
	2658	+// source == skybox2Button \|\|
	2659	+// source == skybox3Button \|\|
	2660	+// source == skybox4Button \|\|
	2661	+// source == skybox5Button \|\|
	2662	+// source == skybox6Button \|\|
	2663	+// source == skybox7Button \|\|
	2664	+// source == skybox11Button \|\|
	2665	+// source == skybox12Button \|\|
	2666	+// source == skybox13Button \|\|
	2667	+// source == skybox14Button \|\|
	2668	+// source == skybox15Button \|\|
	2669	+// source == skybox16Button \|\|
	2670	+// source == skybox17Button)
	2671	+// {
	2672	+// ChangeSkybox(source);
	2673	+// } else
2112	2674	if (source == csgItem)
2113	2675	{
2114	2676	group(new CSG());
..	..	@@ -2157,27 +2719,35 @@
2157	2719	} else
2158	2720	if (source == loopItem \|\| source == loopButton)
2159	2721	{
	2722	+ if (!group.selection.isEmpty())
	2723	+ {
2160	2724	Composite csg = new GroupLeaf();
2161	2725	csg.count = 5;
2162		- group(csg);
2163	2726	Composite child = new cGroup("Branch");
2164	2727	csg.addChild(child);
2165	2728	child.addChild(csg);
	2729	+ group(csg);
	2730	+ }
2166	2731	} else
2167	2732	if (source == doubleItem)
2168	2733	{
	2734	+ if (!group.selection.isEmpty())
	2735	+ {
2169	2736	Composite csg = new GroupLeaf("Fork");
2170	2737	csg.count = 5;
2171		- group(csg);
2172	2738	Composite child = new cGroup("Branch A");
2173	2739	csg.addChild(child);
2174	2740	child.addChild(csg);
2175	2741	child = new cGroup("Branch B");
2176	2742	csg.addChild(child);
2177	2743	child.addChild(csg);
	2744	+ group(csg);
	2745	+ }
2178	2746	} else
2179	2747	if (source == tripleItem)
2180	2748	{
	2749	+ if (!group.selection.isEmpty())
	2750	+ {
2181	2751	Composite csg = new GroupLeaf("Trident");
2182	2752	csg.count = 4;
2183	2753	group(csg);
..	..	@@ -2190,11 +2760,12 @@
2190	2760	child = new cGroup();
2191	2761	csg.addChild(child);
2192	2762	child.addChild(csg);
	2763	+ }
2193	2764	} else
2194	2765	if (source == computeAOItem)
2195	2766	{
2196	2767	Globals.drawMode = CameraPane.OCCLUSION;
2197		- Globals.theRenderer.repaint();
	2768	+ cameraView.repaint();
2198	2769	} else
2199	2770	if (source == recompileItem)
2200	2771	{
..	..	@@ -2209,7 +2780,7 @@
2209	2780	if (source == invariantsItem)
2210	2781	{
2211	2782	System.out.println("Invariants:");
2212		- Grafreed.grafreeD.universe.invariants();
	2783	+ Grafreed.grafreed.universe.invariants();
2213	2784	} else
2214	2785	if (source == memoryItem)
2215	2786	{
..	..	@@ -2240,33 +2811,52 @@
2240	2811	{
2241	2812	ToggleFullScreen();
2242	2813	} else
2243		- if (source == undoButton)
	2814	+ if (source == collapseButton)
	2815	+ {
	2816	+ this.expandedLayout = radio.layout;
	2817	+ CollapseToolbar();
	2818	+ } else
	2819	+ if (source == maximize3DButton)
	2820	+ {
	2821	+ this.expandedLayout = radio.layout;
	2822	+ radio.layout = twoButton;
	2823	+ Show3DView();
	2824	+ CollapseToolbar();
	2825	+ } else
	2826	+ if (source == previousVersionButton)
2244	2827	{
2245	2828	// Go to previous version
2246	2829	//if (!Undo())
2247	2830	//java.awt.Toolkit.getDefaultToolkit().beep();
2248		- Undo();
	2831	+ PreviousVersion();
2249	2832	} else
2250	2833	if (source == restoreButton)
2251	2834	{
2252	2835	// Restore current version
2253	2836	Restore();
	2837	+ //restoreButton.setEnabled(false);
2254	2838	} else
2255	2839	if (source == replaceButton)
2256	2840	{
2257	2841	// Overwrite current version
2258	2842	Replace();
	2843	+ //replaceButton.setEnabled(false);
2259	2844	} else
2260		- if (source == redoButton)
	2845	+ if (source == nextVersionButton)
2261	2846	{
2262	2847	// Go to next version
2263		- Redo();
	2848	+ NextVersion();
2264	2849	} else
2265		- if (source == saveButton)
	2850	+ if (source == saveVersionButton)
2266	2851	{
2267	2852	// Save a new version
2268	2853	if (!Save(true))
2269	2854	java.awt.Toolkit.getDefaultToolkit().beep();
	2855	+ } else
	2856	+ if (source == deleteVersionButton)
	2857	+ {
	2858	+ // Delete a new version
	2859	+ DeleteVersion();
2270	2860	} else
2271	2861	if (source == oneStepButton)
2272	2862	{
..	..	@@ -2321,11 +2911,11 @@
2321	2911	} else
2322	2912	if (source == undoItem)
2323	2913	{
2324		- Undo();
	2914	+ PreviousVersion();
2325	2915	} else
2326	2916	if (source == redoItem)
2327	2917	{
2328		- Redo();
	2918	+ NextVersion();
2329	2919	} else
2330	2920	if (source == duplicateItem)
2331	2921	{
..	..	@@ -2646,7 +3236,7 @@
2646	3236	{
2647	3237	StepAll();
2648	3238	} else
2649		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3239	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2650	3240	{
2651	3241	//int indices[] = jList.getSelectedIndices();
2652	3242	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2806,22 +3396,34 @@
2806	3396	} else
2807	3397	if (source == ungroupItem \|\| source == ungroupButton)
2808	3398	{
2809		- boolean hasRoot = false;
	3399	+ boolean canUngroup = true;
2810	3400
2811	3401	for (int i=0; i<group.selection.size(); i++)
2812	3402	{
2813		- if (group.selection.get(i) == group)
	3403	+ Object3D selectedItem = group.selection.get(i);
	3404	+
	3405	+ if (selectedItem.Size() == 0)
2814	3406	{
2815		- hasRoot = true;
	3407	+ // Cannot ungroup leaves
	3408	+ canUngroup = false;
	3409	+ break;
	3410	+ }
	3411	+
	3412	+ if (selectedItem == group)
	3413	+ {
	3414	+ // Cannot ungroup root
	3415	+ canUngroup = false;
2816	3416	break;
2817	3417	}
2818	3418	}
2819	3419
2820		- if (!hasRoot)
	3420	+ if (canUngroup)
2821	3421	{
2822	3422	for (int i=0; i<group.selection.size(); i++)
2823	3423	{
2824		- Ungroup(group.selection.get(i));
	3424	+ Object3D selectedItem = group.selection.get(i);
	3425	+
	3426	+ Ungroup(selectedItem);
2825	3427	}
2826	3428
2827	3429	ClearSelection(false);
..	..	@@ -2872,6 +3474,10 @@
2872	3474	if (source == clearMaterialsItem)
2873	3475	{
2874	3476	ClearMaterials();
	3477	+ } else
	3478	+ if (source == clearVersionsItem)
	3479	+ {
	3480	+ ClearVersions();
2875	3481	} else
2876	3482	if (source == liveleavesItem)
2877	3483	{
..	..	@@ -3013,6 +3619,18 @@
3013	3619	{
3014	3620	TransformChildren();
3015	3621	} else
	3622	+ if (source == textureRatioRItem)
	3623	+ {
	3624	+ TextureRatio(0);
	3625	+ } else
	3626	+ if (source == textureRatioGItem)
	3627	+ {
	3628	+ TextureRatio(1);
	3629	+ } else
	3630	+ if (source == textureRatioBItem)
	3631	+ {
	3632	+ TextureRatio(2);
	3633	+ } else
3016	3634	if (source == resetTransformItem)
3017	3635	{
3018	3636	ResetTransform();
..	..	@@ -3128,7 +3746,7 @@
3128	3746	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3129	3747	{
3130	3748	obj = (Object3D)e.nextElement();
3131		- obj.SetBumpTexture(null);
	3749	+ obj.ResetBumpTexture();
3132	3750	}
3133	3751
3134	3752	refreshContents();
..	..	@@ -3142,6 +3760,31 @@
3142	3760	obj.SetBumpTexture(obj.GetPigmentTexture());
3143	3761	}
3144	3762
	3763	+ refreshContents();
	3764	+ } else
	3765	+ if (source == embedTexturesItem)
	3766	+ {
	3767	+ Object3D obj;
	3768	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3769	+ {
	3770	+ obj = (Object3D)e.nextElement();
	3771	+ obj.EmbedTextures(true);
	3772	+ }
	3773	+
	3774	+ refreshContents();
	3775	+ } else
	3776	+ if (source == deEmbedTexturesItem)
	3777	+ {
	3778	+ Object3D obj;
	3779	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3780	+ {
	3781	+ obj = (Object3D)e.nextElement();
	3782	+ obj.EmbedTextures(false);
	3783	+ }
	3784	+
	3785	+ CameraPane.texturepigment.clear();
	3786	+ CameraPane.texturebump.clear();
	3787	+
3145	3788	refreshContents();
3146	3789	} else
3147	3790	if (source == flashSelectionButton)
..	..	@@ -3159,38 +3802,7 @@
3159	3802	if (CameraPane.FULLSCREEN)
3160	3803	fullscreenLayout = radio.layout;
3161	3804
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();
	3805	+ Show3DView();
3194	3806
3195	3807	cameraView.requestFocusInWindow();
3196	3808
..	..	@@ -3245,8 +3857,8 @@
3245	3857	// centralPanel.setVisible(true);
3246	3858	// XYZPanel.setVisible(true);
3247	3859	bigThree.ClearUI();
	3860	+ bigThree.add(scenePanel);
3248	3861	bigThree.add(centralPanel);
3249		- bigThree.add(XYZPanel);
3250	3862	bigThree.FlushUI();
3251	3863
3252	3864	cameraView.requestFocusInWindow();
..	..	@@ -3326,8 +3938,8 @@
3326	3938	// centralPanel.setVisible(true);
3327	3939	// XYZPanel.setVisible(false);
3328	3940	bigThree.ClearUI();
3329		- bigThree.add(scenePanel);
3330	3941	bigThree.add(centralPanel);
	3942	+ bigThree.add(scenePanel);
3331	3943	bigThree.FlushUI();
3332	3944
3333	3945	cameraView.requestFocusInWindow();
..	..	@@ -3376,6 +3988,7 @@
3376	3988	} else
3377	3989	if (source == rootButton)
3378	3990	{
	3991	+ Replace();
3379	3992	Object3D obj;
3380	3993	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3381	3994	{
..	..	@@ -3390,6 +4003,9 @@
3390	4003	if (source == closeButton)
3391	4004	{
3392	4005	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	4006	+ if (copy.versionlist != null)
	4007	+ Replace();
	4008	+
3393	4009	cRadio ab;
3394	4010	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3395	4011	{
..	..	@@ -3433,10 +4049,10 @@
3433	4049	{
3434	4050	Object3D child = (Object3D)e.nextElement();
3435	4051	if(child.editWindow != null)
3436		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3437	4052	child.pinned = false;
3438	4053	child.CloseUI();
3439	4054	listUI.remove(child);
	4055	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3440	4056
3441	4057	//child.editWindow = null; // ???????????
3442	4058	}
..	..	@@ -3455,6 +4071,7 @@
3455	4071	obj.CloseUI();
3456	4072	}
3457	4073	listUI.clear();
	4074	+ SetPinStates(group.selection.size() > 0);
3458	4075	refreshContents(true);
3459	4076	} else
3460	4077	if (source == allParamsButton)
..	..	@@ -3487,6 +4104,9 @@
3487	4104	} else
3488	4105	if(source instanceof cRadio)
3489	4106	{
	4107	+ if (copy.versionlist != null)
	4108	+ Replace();
	4109	+
3490	4110	group.parent = keepparent;
3491	4111	group.attributes = 0;
3492	4112	//group.editWindow = null;
..	..	@@ -3511,8 +4131,6 @@
3511	4131
3512	4132	copy = group;
3513	4133
3514		- SetUndoStates();
3515		-
3516	4134	//Globals.theRenderer.object = group;
3517	4135	if(!useclient)
3518	4136	{
..	..	@@ -3540,9 +4158,37 @@
3540	4158	*/
3541	4159	radio.layout.doClick();
3542	4160
	4161	+ //assert(copy instanceof Composite);
	4162	+
	4163	+ if (copy.versionlist == null)
	4164	+ {
	4165	+ copy.versionindex = -1;
	4166	+
	4167	+ // Cannot work with loops
	4168	+ // To fix this issue, we first mark all nodes above the root,
	4169	+ // and check if any of these nodes are reachable below the root.
	4170	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4171	+
	4172	+ if (copy instanceof Composite && copy.versionlist == null && !copy.HasTags())
	4173	+ {
	4174	+ copy.versionlist = new Object3D[100];
	4175	+
	4176	+ //Save(true);
	4177	+ }
	4178	+ else
	4179	+ copy.versionindex = -2;
	4180	+
	4181	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4182	+ }
	4183	+
	4184	+ SetVersionStates();
	4185	+
3543	4186	ClearUnpinned();
3544		- SetPinStates(group.selection.size() > 0);
3545		- if (group.selection.size() == 1)
	4187	+
	4188	+ //Grafreed.Assert(group != null);
	4189	+ //Grafreed.Assert(group.selection != null);
	4190	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4191	+ if (group.selection == null \|\| group.selection.size() == 1)
3546	4192	EditSelection(false);
3547	4193	keepparent = group.parent;
3548	4194	// PARENT = NULL or not???
..	..	@@ -3555,11 +4201,13 @@
3555	4201	} else if (event.getSource() == editCameraItem)
3556	4202	{
3557	4203	cameraView.ProtectCamera();
	4204	+ cameraView.requestFocusInWindow();
3558	4205	cameraView.repaint();
3559	4206	return;
3560	4207	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3561	4208	{
3562	4209	cameraView.RevertCamera();
	4210	+ cameraView.requestFocusInWindow();
3563	4211	cameraView.repaint();
3564	4212	return;
3565	4213	// } else if (event.getSource() == textureButton)
..	..	@@ -3648,6 +4296,18 @@
3648	4296	refreshContents();
3649	4297	}
3650	4298
	4299	+ void TextureRatio(int axis)
	4300	+ {
	4301	+ Object3D obj;
	4302	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4303	+ {
	4304	+ obj = (Object3D)e.nextElement();
	4305	+ obj.TextureRatio(axis);
	4306	+ }
	4307	+
	4308	+ refreshContents();
	4309	+ }
	4310	+
3651	4311	void ResetTransform()
3652	4312	{
3653	4313	ResetTransform(-1);
..	..	@@ -3663,42 +4323,8 @@
3663	4323	if (obj.toParent == null)
3664	4324	continue;
3665	4325
3666		- if (mask == -1)
3667		- {
3668		- if (obj instanceof Camera) // jan 2014
3669		- {
3670		- LA.matIdentity(obj.toParent);
3671		- LA.matIdentity(obj.fromParent);
3672		- }
3673		- else
3674		- {
3675		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
3676		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
3677		- }
3678		- TouchTransform(obj);
3679		- continue;
3680		- }
3681		- if ((mask&2) != 0) // Scale
3682		- {
3683		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3684		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3685		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3686		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3687		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3688		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3689		- }
3690		- if ((mask&4) != 0) // Rotation
3691		- {
3692		- // ?
3693		- }
3694		- if ((mask&1) != 0) // Translation
3695		- {
3696		- if (obj.toParent != null)
3697		- {
3698		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
3699		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
3700		- }
3701		- }
	4326	+ obj.ResetTransform(mask);
	4327	+
3702	4328	if (obj.parent == null)
3703	4329	{
3704	4330	System.out.println("NULL PARENT!");
..	..	@@ -4136,7 +4762,7 @@
4136	4762
4137	4763	try
4138	4764	{
4139		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4765	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4140	4766	}
4141	4767	catch (Exception e)
4142	4768	{
..	..	@@ -4206,6 +4832,12 @@
4206	4832	for (int i=0; i<group.selection.size(); i++)
4207	4833	{
4208	4834	Object3D obj = group.selection.get(i);
	4835	+
	4836	+ if (obj.toParent == null)
	4837	+ {
	4838	+ obj.toParent = LA.newMatrix();
	4839	+ obj.fromParent = LA.newMatrix();
	4840	+ }
4209	4841
4210	4842	LA.matTranslate(obj.toParent, i * scale, 0, 0);
4211	4843	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
..	..	@@ -4498,6 +5130,12 @@
4498	5130	refreshContents();
4499	5131	}
4500	5132
	5133	+ void ClearVersions()
	5134	+ {
	5135	+ group.selection.ClearVersions();
	5136	+ refreshContents();
	5137	+ }
	5138	+
4501	5139	void FlipV(boolean flip)
4502	5140	{
4503	5141	group.selection.FlipV(flip);
..	..	@@ -4613,6 +5251,12 @@
4613	5251
4614	5252	void EditSelection(boolean newWindow)
4615	5253	{
	5254	+ if (group.selection == null)
	5255	+ {
	5256	+ EditElement(group, newWindow); // ? new
	5257	+ return;
	5258	+ }
	5259	+
4616	5260	// aConstraints.gridy = 0;
4617	5261	for (int i=0; i<group.selection.size(); i++)
4618	5262	{
..	..	@@ -4623,12 +5267,7 @@
4623	5267	Object3D elem = (Object3D)group.selection.elementAt(i);
4624	5268	if(elem != group \|\| !newWindow)
4625	5269	{
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
	5270	+ EditElement(elem, newWindow); // ? new
4632	5271	}
4633	5272	}
4634	5273	}
..	..	@@ -4691,9 +5330,7 @@
4691	5330
4692	5331	freezemodel = false;
4693	5332	}
4694		-
4695		- boolean flashIt = true;
4696		-
	5333	+
4697	5334	public void valueChanged(TreeSelectionEvent e)
4698	5335	//public boolean handleEvent(Event event)
4699	5336	{
..	..	@@ -4766,13 +5403,31 @@
4766	5403	{
4767	5404	editButton.setEnabled(enabled);
4768	5405	uneditButton.setEnabled(enabled);
4769		- unselectButton.setEnabled(enabled);
	5406	+ //unselectButton.setEnabled(enabled);
4770	5407	flashSelectionButton.setEnabled(enabled);
	5408	+
	5409	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5410	+
	5411	+ boolean allComposites = true;
	5412	+
	5413	+ if (group.selection != null)
	5414	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5415	+ {
	5416	+ Object next = e.nextElement();
	5417	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5418	+ {
	5419	+ allComposites = false;
	5420	+ break;
	5421	+ }
	5422	+ }
	5423	+
	5424	+ rootButton.setEnabled(true); // allComposites);
4771	5425	}
4772	5426
4773	5427	void refreshContents(boolean cp)
4774	5428	{
4775		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	5429	+ if (Globals.ADVANCED)
	5430	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4776	5431	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4777	5432	{
4778	5433	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -4782,7 +5437,7 @@
4782	5437	Object3D child = (Object3D) group.selection.get(i);
4783	5438
4784	5439	objEditor.AddInfo(child, this, true);
4785		- System.err.println("info : " + child.GetPath());
	5440	+// System.err.println("info : " + child.GetPath());
4786	5441	}
4787	5442
4788	5443	objEditor.SetText(); // jan 2014
..	..	@@ -5608,7 +6263,6 @@
5608	6263
5609	6264	cButton restoreCameraButton;
5610	6265
5611		- cButton saveButton;
5612	6266	cButton oneStepButton;
5613	6267
5614	6268	cButton groupButton;
..	..	@@ -5617,6 +6271,22 @@
5617	6271	cButton switchButton;
5618	6272	cButton loopButton;
5619	6273	cButton textureButton;
	6274	+
	6275	+ cButton skybox1Button;
	6276	+ cButton skybox2Button;
	6277	+ cButton skybox3Button;
	6278	+ cButton skybox4Button;
	6279	+ cButton skybox5Button;
	6280	+ cButton skybox6Button;
	6281	+ cButton skybox7Button;
	6282	+
	6283	+ cButton skybox11Button;
	6284	+ cButton skybox12Button;
	6285	+ cButton skybox13Button;
	6286	+ cButton skybox14Button;
	6287	+ cButton skybox15Button;
	6288	+ cButton skybox16Button;
	6289	+ cButton skybox17Button;
5620	6290
5621	6291	cButton gridButton;
5622	6292	cButton boxButton;
..	..	@@ -5650,11 +6320,11 @@
5650	6320	private MenuItem lookAtItem;
5651	6321	private MenuItem lookFromItem;
5652	6322	private MenuItem switchViewItem;
5653		- private MenuItem cutItem;
	6323	+ private JMenuItem cutItem;
5654	6324	private MenuItem undoItem;
5655	6325	private MenuItem redoItem;
5656	6326	private JMenuItem duplicateItem;
5657		- private MenuItem cloneItem;
	6327	+ private JMenuItem cloneItem;
5658	6328	private MenuItem cloneSupportItem;
5659	6329	private MenuItem overwriteGeoItem;
5660	6330	private MenuItem overwriteMatItem;
..	..	@@ -5675,13 +6345,13 @@
5675	6345	private MenuItem cloneGeometriesItem;
5676	6346	private MenuItem shareGeometriesItem;
5677	6347	private MenuItem mergeGeometriesItem;
5678		- private MenuItem copyItem;
	6348	+ private JMenuItem copyItem;
5679	6349	private MenuItem pasteItem;
5680		- private MenuItem pasteIntoItem;
5681		- private MenuItem pasteLinkItem;
5682		- private MenuItem pasteCloneItem;
5683		- private MenuItem pasteExpandItem;
5684		- private MenuItem clearItem;
	6350	+ private JMenuItem pasteIntoItem;
	6351	+ private JMenuItem pasteLinkItem;
	6352	+ private JMenuItem pasteCloneItem;
	6353	+ private JMenuItem pasteExpandItem;
	6354	+ private JMenuItem deleteItem;
5685	6355	private MenuItem clearAllItem;
5686	6356	private MenuItem genUVItem;
5687	6357	private MenuItem genNormalsMESHItem;
..	..	@@ -5707,6 +6377,7 @@
5707	6377	private MenuItem clipMeshItem;
5708	6378	private MenuItem smoothMeshItem;
5709	6379	private MenuItem clearMaterialsItem;
	6380	+ private MenuItem clearVersionsItem;
5710	6381
5711	6382	private MenuItem liveleavesItem;
5712	6383	private MenuItem unliveleavesItem;
..	..	@@ -5730,13 +6401,16 @@
5730	6401	private MenuItem maxTexturesItem;
5731	6402	private MenuItem panoTexturesItem;
5732	6403
	6404	+ private MenuItem textureRatioRItem;
	6405	+ private MenuItem textureRatioGItem;
	6406	+ private MenuItem textureRatioBItem;
5733	6407	private MenuItem resetCentroidItem;
5734	6408	private MenuItem resetCentroidXZItem;
5735	6409	private MenuItem resetTransformItem;
5736	6410	private MenuItem transformGeometryItem;
5737	6411	private MenuItem transformChildrenItem;
5738	6412	private MenuItem hideItem;
5739		- private MenuItem grabItem;
	6413	+ private JMenuItem grabItem;
5740	6414	private MenuItem backItem;
5741	6415	private MenuItem frontItem;
5742	6416	private MenuItem cameraItem;
..	..	@@ -5749,7 +6423,7 @@
5749	6423	private MenuItem switchTransfoItem;
5750	6424	private MenuItem morphItem;
5751	6425	private MenuItem linkerItem;
5752		- private MenuItem ungroupItem;
	6426	+ private JMenuItem ungroupItem;
5753	6427	private MenuItem editItem;
5754	6428	private MenuItem openWindowItem;
5755	6429	private MenuItem editLeafItem;
..	..	@@ -5765,6 +6439,8 @@
5765	6439	private MenuItem attachBumpItem;
5766	6440	private MenuItem detachBumpItem;
5767	6441	private MenuItem pigmentBumpItem;
	6442	+ private MenuItem embedTexturesItem;
	6443	+ private MenuItem deEmbedTexturesItem;
5768	6444
5769	6445	private MenuItem particleItem;
5770	6446	private MenuItem ragdollItem;