~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,350 @@
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	+
26	371	//ObjEditor objEditor;
27	372	public void closeUI2()
28	373	{
..	..	@@ -60,6 +405,16 @@
60	405	this.copy = this.group = group;
61	406	//selectees = this.group.selectees;
62	407
	408	+ assert(false);
	409	+
	410	+// if (copy.versionlist == null)
	411	+// {
	412	+// copy.versionlist = new Object3D[100];
	413	+// copy.versionindex = -1;
	414	+//
	415	+// //Save(true);
	416	+// }
	417	+
63	418	if(ui)
64	419	SetupUI(objEditor);
65	420	}
..	..	@@ -80,10 +435,22 @@
80	435	SetupViews(objEditor);
81	436
82	437	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	438	+
	439	+// if (copy.versionlist == null)
	440	+// {
	441	+// copy.versionlist = new Object3D[100];
	442	+// copy.versionindex = -1;
	443	+//
	444	+// //Save(true);
	445	+// }
83	446	}
84	447
85	448	void CloneSelection(boolean supports)
86	449	{
	450	+ if (Globals.REPLACEONMAKE)
	451	+ Save();
	452	+ boolean keep = Globals.REPLACEONMAKE;
	453	+ Globals.REPLACEONMAKE = false;
87	454	// Object3D keep = GrafreeD.clipboard;
88	455	//Object3D obj;
89	456	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +461,7 @@
94	461
95	462	makeSomething(clone, i==group.selection.size()-1);
96	463	}
	464	+ Globals.REPLACEONMAKE = keep;
97	465	}
98	466
99	467	void CloneClipboard(boolean supports)
..	..	@@ -115,11 +483,16 @@
115	483
116	484	Object3D parent = obj.parent;
117	485	obj.parent = null;
	486	+
118	487	// Object3D support = obj.support;
119	488	// obj.support = null;
120	489	if (!supports)
121	490	obj.SaveSupports();
	491	+
122	492	Object3D clone = (Object3D)Grafreed.clone(obj);
	493	+
	494	+ clone.ResetUUIDs();
	495	+
123	496	obj.parent = parent;
124	497	// obj.support = support;
125	498	// clone.support = support; // aout 2013
..	..	@@ -164,33 +537,37 @@
164	537	// menu.add("-");
165	538	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
166	539	duplicateItem.addActionListener(this);
167		- cloneItem = menu.add(new MenuItem("Clone"));
	540	+
	541	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
168	542	cloneItem.addActionListener(this);
169		- if (Globals.ADVANCED)
	543	+ //if (Globals.ADVANCED)
170	544	{
171	545	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
172	546	cloneSupportItem.addActionListener(this);
173	547	}
	548	+ oe.jTree.popup.addSeparator();
174	549	menu.add("-");
175		- cutItem = menu.add(new MenuItem("Cut"));
	550	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
176	551	cutItem.addActionListener(this);
177		- copyItem = menu.add(new MenuItem("Copy"));
	552	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
178	553	copyItem.addActionListener(this);
179	554	pasteItem = menu.add(new MenuItem("Paste"));
180	555	pasteItem.addActionListener(this);
181	556
182		- menu.add("-");
183		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	557	+ oe.jTree.popup.addSeparator();
	558	+ //menu.add("-");
	559	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
184	560	pasteIntoItem.addActionListener(this);
185		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	561	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
186	562	pasteLinkItem.addActionListener(this);
187		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	563	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
188	564	pasteCloneItem.addActionListener(this);
189		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
190		-// pasteExpandItem.addActionListener(this);
191		- menu.add("-");
192		- clearItem = menu.add(new MenuItem("Clear"));
193		- clearItem.addActionListener(this);
	565	+// CRASH
	566	+ pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
	567	+//
	568	+ pasteExpandItem.addActionListener(this);
	569	+ //menu.add("-");
	570	+ oe.jTree.popup.addSeparator();
194	571
195	572	if (Globals.ADVANCED)
196	573	{
..	..	@@ -220,7 +597,7 @@
220	597	// toggleSwitchItem.addItemListener(this);
221	598	// toggleSwitchItem.setState(CameraPane.SWITCH);
222	599
223		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	600	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
224	601	toggleHandleItem.addItemListener(this);
225	602	toggleHandleItem.setState(CameraPane.HANDLES);
226	603
..	..	@@ -276,11 +653,9 @@
276	653	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
277	654	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
278	655	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
279		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
280	656	oe.cameraMenu.add("-");
281	657	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
282	658	openWindowItem.addActionListener(this);
283		- editLeafItem.addActionListener(this);
284	659	lookAtItem.addActionListener(this);
285	660	//lookFromItem.addActinoListener(this);
286	661	//switchViewItem.addActionListener(this);
..	..	@@ -327,9 +702,8 @@
327	702	setMasterItem.addActionListener(this);
328	703	}
329	704
330		- oe.menuBar.add(menu = new Menu("Group"));
331		-// grabItem = menu.add(new MenuItem("Grab"));
332		-// grabItem.addActionListener(this);
	705	+ oe.menuBar.add(menu = new Menu("Order"));
	706	+
333	707	backItem = menu.add(new MenuItem("Back"));
334	708	backItem.addActionListener(this);
335	709	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -337,13 +711,21 @@
337	711	// compositeItem = menu.add(new MenuItem("Composite"));
338	712	// compositeItem.addActionListener(this);
339	713
	714	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	715	+ grabItem.addActionListener(this);
	716	+
340	717	if (Globals.ADVANCED)
341	718	{
342	719	hideItem = menu.add(new MenuItem("Hidden Group"));
343	720	hideItem.addActionListener(this);
344	721	}
345		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	722	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
346	723	ungroupItem.addActionListener(this);
	724	+
	725	+ oe.jTree.popup.addSeparator();
	726	+
	727	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	728	+ deleteItem.addActionListener(this);
347	729
348	730	// menu.add("-");
349	731	//
..	..	@@ -380,24 +762,32 @@
380	762	shadowYItem.addActionListener(this);
381	763	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
382	764	shadowZItem.addActionListener(this);
	765	+
	766	+ attributeItem = menu.add(new MenuItem("Attribute"));
	767	+ attributeItem.addActionListener(this);
383	768	if (Globals.ADVANCED)
384	769	{
385	770	menu.add("-");
386	771	linkerItem = menu.add(new MenuItem("Linker"));
387	772	linkerItem.addActionListener(this);
388		- attributeItem = menu.add(new MenuItem("Attribute"));
389		- attributeItem.addActionListener(this);
390	773	templateItem = menu.add(new MenuItem("Template"));
391	774	templateItem.addActionListener(this);
392	775	pointflowItem = menu.add(new MenuItem("Point Flow"));
393	776	pointflowItem.addActionListener(this);
394	777	}
395	778	menu.add("-");
	779	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	780	+ textureRatioRItem.addActionListener(this);
	781	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	782	+ textureRatioGItem.addActionListener(this);
	783	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	784	+ textureRatioBItem.addActionListener(this);
	785	+ menu.add("-");
396	786	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
397	787	resetTransformItem.addActionListener(this);
398	788	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
399	789	resetCentroidItem.addActionListener(this);
400		- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	790	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
401	791	resetCentroidXZItem.addActionListener(this);
402	792	transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
403	793	transformGeometryItem.addActionListener(this);
..	..	@@ -413,9 +803,9 @@
413	803	genNormalsCADItem.addActionListener(this);
414	804	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
415	805	genNormalsMESHItem.addActionListener(this);
416		- if (Globals.ADVANCED)
	806	+ //if (Globals.ADVANCED)
417	807	{
418		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	808	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
419	809	genNormalsMINEItem.addActionListener(this);
420	810	}
421	811	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -449,6 +839,8 @@
449	839	}
450	840
451	841	oe.menuBar.add(menu = new Menu("Attributes"));
	842	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	843	+ clearVersionsItem.addActionListener(this);
452	844	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
453	845	clearMaterialsItem.addActionListener(this);
454	846	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -471,9 +863,9 @@
471	863	hideleavesItem.addActionListener(this);
472	864	showleavesItem = menu.add(new MenuItem("Show Leaves"));
473	865	showleavesItem.addActionListener(this);
474		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	866	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
475	867	markleavesItem.addActionListener(this);
476		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	868	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
477	869	unmarkleavesItem.addActionListener(this);
478	870	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
479	871	rewindleavesItem.addActionListener(this);
..	..	@@ -508,10 +900,15 @@
508	900	attachBumpItem.addActionListener(this);
509	901	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
510	902	pigmentBumpItem.addActionListener(this);
	903	+ //embedTexturesItem
511	904	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
512	905	detachPigmentItem.addActionListener(this);
513	906	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
514	907	detachBumpItem.addActionListener(this);
	908	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	909	+ embedTexturesItem.addActionListener(this);
	910	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	911	+ deEmbedTexturesItem.addActionListener(this);
515	912	menu.add("-");
516	913	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
517	914	sortbysizeItem.addActionListener(this);
..	..	@@ -522,6 +919,9 @@
522	919	shareGeometriesItem.addActionListener(this);
523	920	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
524	921	mergeGeometriesItem.addActionListener(this);
	922	+ menu.add("-");
	923	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	924	+ editLeafItem.addActionListener(this);
525	925	if (Globals.ADVANCED)
526	926	{
527	927	// Pretty much the same as duplicate and clone.
..	..	@@ -538,6 +938,85 @@
538	938	buildToolsMenu(menu);
539	939	}
540	940
	941	+ JTabbedPane resourcecontainer;
	942	+ cGridBag currenttab;
	943	+ //boolean added; // patch for jar
	944	+
	945	+ int totalcount = 0;
	946	+
	947	+ int tabcount = 0;
	948	+ int colcount = 0;
	949	+ int rowcount = 0;
	950	+ int texturecount = 0;
	951	+
	952	+ int columns = 5;
	953	+ int rows = 7;
	954	+
	955	+ public void ResourceCallBack(String[] path)
	956	+ {
	957	+// for (int i = 0; i < path.length; i++)
	958	+// System.out.print(path[i] + "/");
	959	+// System.out.println();
	960	+
	961	+ if (//rowcount == 0 \|\|
	962	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	963	+ {
	964	+ currenttab = new cGridBag();
	965	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	966	+ currenttab.setName(tabname);
	967	+ //added = false;
	968	+ resourcecontainer.add(currenttab);
	969	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture " + tabname);
	970	+ rowcount = 1;
	971	+ colcount = 0;
	972	+ texturecount = 0;
	973	+ }
	974	+
	975	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	976	+ {
	977	+ //if (!added)
	978	+ {
	979	+ //added = true;
	980	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	981	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	982	+ }
	983	+
	984	+ columns = 5;
	985	+
	986	+ if (path[0].contains("D&R") \|\| path[0].contains("Paint"))
	987	+ columns = 4;
	988	+
	989	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	990	+ totalcount++;
	991	+
	992	+ if (++colcount >= columns)
	993	+ {
	994	+ colcount = 0;
	995	+ currenttab.Return();
	996	+
	997	+ if (rowcount++ >= rows)
	998	+ {
	999	+ rowcount = 0;
	1000	+ }
	1001	+ }
	1002	+ }
	1003	+ else
	1004	+ {
	1005	+// if (!path[path.length-1].equals("icons"))
	1006	+// resourcecontainer.Return();
	1007	+ }
	1008	+ }
	1009	+
	1010	+ void CreateTexturePanel(cGridBag container)
	1011	+ {
	1012	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1013	+ container.add(resourcecontainer);
	1014	+
	1015	+ Grafreed.ParseResources("textures", this);
	1016	+
	1017	+ // 935. System.out.println("Total = " + totalcount);
	1018	+ }
	1019	+
541	1020	void SetupUI2(ObjEditor oe)
542	1021	{
543	1022	// June 2019
..	..	@@ -555,11 +1034,6 @@
555	1034	//new Exception().printStackTrace();
556	1035
557	1036	oe.radioPanel = new JPanel(new GridBagLayout());
558		- oe.aConstraints.weightx = 1;
559		- oe.aConstraints.weighty = 0;
560		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
561		- oe.aConstraints.gridwidth = 100;
562		- oe.aConstraints.gridheight = 1;
563	1037	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
564	1038
565	1039	oe.buttonGroup = new ButtonGroup();
..	..	@@ -580,9 +1054,9 @@
580	1054	oe.radioPanel.add(dummyButton);
581	1055	oe.buttonGroup.add(dummyButton);
582	1056	*/
583		- cGridBag copyOptionsPanel = new cGridBag();
	1057	+ cGridBag versionManagerPanel = new cGridBag();
584	1058
585		- copyOptionsPanel.preferredHeight = 2;
	1059	+ versionManagerPanel.preferredHeight = 4;
586	1060
587	1061	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
588	1062
..	..	@@ -590,50 +1064,110 @@
590	1064	//minButton.setToolTipText("Minimize window");
591	1065	//minButton.addActionListener(this);
592	1066
593		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594		- maxButton.setToolTipText("Maximize window");
595		- maxButton.addActionListener(this);
	1067	+ if (Globals.ADVANCED)
	1068	+ {
	1069	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1070	+// maxButton.setToolTipText("Maximize window");
	1071	+// maxButton.addActionListener(this);
	1072	+ }
596	1073
597		- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
598		- fullButton.setToolTipText("Full-screen window");
599		- fullButton.addActionListener(this);
	1074	+ cButton gcButton;
600	1075
601		- oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1076	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+// gcButton.setToolTipText("Garbage collect");
	1078	+// gcButton.addActionListener(new ActionListener()
	1079	+// {
	1080	+// public void actionPerformed(ActionEvent e)
	1081	+// {
	1082	+// System.gc();
	1083	+// }
	1084	+// });
	1085	+
	1086	+ oe.toolbarPanel.add(fullScreenButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1087	+ fullScreenButton.setToolTipText("Full-screen window");
	1088	+ fullScreenButton.addActionListener(this);
	1089	+
	1090	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1091	+ collapseButton.setToolTipText("Collapse toolbar");
	1092	+ collapseButton.addActionListener(this);
	1093	+
	1094	+// oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1095	+// maximize3DButton.setToolTipText("Maximize 3D view");
	1096	+// maximize3DButton.addActionListener(this);
	1097	+
	1098	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1099	+ twoButton.setToolTipText("Show 3D view only");
	1100	+ twoButton.addActionListener(this);
	1101	+ this.fullscreenLayout = twoButton;
	1102	+
	1103	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1104	+ threeButton.setToolTipText("Show controls and 3D view");
	1105	+ threeButton.addActionListener(this);
	1106	+ if (Globals.ADVANCED)
	1107	+ {
	1108	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1109	+ sixButton.setToolTipText("Show 3D view and controls");
	1110	+ sixButton.addActionListener(this);
	1111	+ }
	1112	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1113	+// sevenButton.setToolTipText("3-column layout");
	1114	+// sevenButton.addActionListener(this);
	1115	+ //
	1116	+
	1117	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1118	+ screenfitButton.setToolTipText("Screen fit");
	1119	+ screenfitButton.addActionListener(this);
	1120	+
	1121	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
602	1122	restoreCameraButton.setToolTipText("Restore viewpoint");
603	1123	restoreCameraButton.addActionListener(this);
604	1124
605		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
606		- undoButton.setToolTipText("Undo changes");
607		- undoButton.addActionListener(this);
608		- undoButton.setEnabled(false);
	1125	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1126	+ saveVersionButton.setToolTipText("Duplicate current version");
	1127	+ saveVersionButton.addActionListener(this);
	1128	+
	1129	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ deleteVersionButton.setToolTipText("Delete current version");
	1131	+ deleteVersionButton.addActionListener(this);
	1132	+ deleteVersionButton.setEnabled(false);
	1133	+
	1134	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1135	+ previousVersionButton.setToolTipText("Previous version");
	1136	+ previousVersionButton.addActionListener(this);
	1137	+ previousVersionButton.setEnabled(false);
609	1138
610		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
611		- redoButton.setToolTipText("Redo changes");
612		- redoButton.addActionListener(this);
613		- redoButton.setEnabled(false);
	1139	+ cGridBag updown = new cGridBag().setVertical(true);
	1140	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1141	+ restoreButton.setToolTipText("Undo (restore current version)");
	1142	+ restoreButton.addActionListener(this);
	1143	+ restoreButton.setEnabled(false);
614	1144
615		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
616		- saveButton.setToolTipText("Save changes");
617		- saveButton.addActionListener(this);
	1145	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1146	+ replaceButton.setToolTipText("Save (replace current version)");
	1147	+ replaceButton.addActionListener(this);
	1148	+ replaceButton.setEnabled(false);
618	1149
619		- copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
620		- liveCB.setToolTipText("Enable animation");
621		- liveCB.addItemListener(this);
622		-
623		- copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1150	+ versionManagerPanel.add(updown);
	1151	+
	1152	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1153	+ nextVersionButton.setToolTipText("Next version");
	1154	+ nextVersionButton.addActionListener(this);
	1155	+ nextVersionButton.setEnabled(false);
	1156	+
	1157	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
624	1158	oneStepButton.setToolTipText("Animate one step forward");
625	1159	oneStepButton.addActionListener(this);
626	1160
627		- copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1161	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1162	+ liveCB.setToolTipText("Enable animation");
	1163	+ liveCB.addItemListener(this);
	1164	+
	1165	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
628	1166	fastCB.setToolTipText("Fast mode");
629	1167	fastCB.addItemListener(this);
630	1168
631	1169	//oe.toolboxPanel.Return();
632	1170
633		- copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- screenfitButton.setToolTipText("Screen fit");
635		- screenfitButton.addActionListener(this);
636		-
637	1171	// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
638	1172	// trackCB.setToolTipText("Enable tracking");
639	1173	// trackCB.addItemListener(this);
..	..	@@ -643,147 +1177,145 @@
643	1177
644	1178	if (Globals.ADVANCED)
645	1179	{
646		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
647	1181	snapobjectButton.addActionListener(this);
648	1182	snapobjectButton.setToolTipText("Snap Object");
	1183	+
	1184	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1185	+ fourButton.addActionListener(this);
	1186	+ fourButton.setToolTipText("Show control panel only");
649	1187	}
650	1188
651	1189	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
652	1190
653		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654		- twoButton.setToolTipText("Show center view only");
655		- twoButton.addActionListener(this);
656		- this.fullscreenLayout = twoButton;
657		-
658		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
659		- fourButton.addActionListener(this);
660		- fourButton.setToolTipText("Show left panel only");
661		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662		- sixButton.setToolTipText("2-column layout left");
663		- sixButton.addActionListener(this);
664		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
665		- threeButton.setToolTipText("2-column layout right");
666		- threeButton.addActionListener(this);
667		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
668		- sevenButton.setToolTipText("3-column layout");
669		- sevenButton.addActionListener(this);
670		- //
671	1191
672		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
673		- rootButton.setToolTipText("Edit selection in new tab");
	1192	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1193	+ rootButton.setToolTipText("Open selection in new tab");
674	1194	rootButton.addActionListener(this);
675	1195
676		- oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1196	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
677	1197	closeButton.setToolTipText("Close tab");
678	1198	closeButton.addActionListener(this);
679	1199	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
680	1200	//clearButton.addActionListener(this);
681	1201
	1202	+ cGridBag row1 = new cGridBag();
	1203	+ row1.preferredHeight = 8;
	1204	+
682	1205	// INSERT
683		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
684		- gridButton.setToolTipText("Create grid");
	1206	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ gridButton.setToolTipText("Create ground");
685	1208	gridButton.addActionListener(this);
686	1209
687		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
688	1211	boxButton.setToolTipText("Create box");
689	1212	boxButton.addActionListener(this);
690	1213
691		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
692		- sphereButton.setToolTipText("Create sphere");
693		- sphereButton.addActionListener(this);
694		-
695		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
696		- coneButton.setToolTipText("Create cone");
697		- coneButton.addActionListener(this);
698		-
699		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
700		- torusButton.setToolTipText("Create torus");
701		- torusButton.addActionListener(this);
702		-
703		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1214	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
704	1215	superButton.setToolTipText("Create superellipsoid");
705	1216	superButton.addActionListener(this);
706	1217
707		- if (Globals.ADVANCED)
	1218	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1219	+ sphereButton.setToolTipText("Create sphere");
	1220	+ sphereButton.addActionListener(this);
	1221	+
	1222	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1223	+ coneButton.setToolTipText("Create cone");
	1224	+ coneButton.addActionListener(this);
	1225	+
	1226	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1227	+ torusButton.setToolTipText("Create torus");
	1228	+ torusButton.addActionListener(this);
	1229	+
	1230	+ if (false) //Globals.ADVANCED)
708	1231	{
709		- oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1232	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
710	1233	kleinButton.setToolTipText("Create Klein bottle");
711	1234	kleinButton.addActionListener(this);
712	1235	}
713	1236
714		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
715	1238	particlesButton.setToolTipText("Create particle system");
716	1239	particlesButton.addActionListener(this);
717	1240
718		- oe.toolboxPanel.Return();
	1241	+ oe.toolboxPanel.add(row1);
719	1242
720		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1243	+ cGridBag row2 = new cGridBag();
	1244	+ row2.preferredHeight = 8;
	1245	+
	1246	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
721	1247	groupButton.setToolTipText("Create group");
722	1248	groupButton.addActionListener(this);
723	1249
724		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1250	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
725	1251	compositeButton.setToolTipText("Create composite");
726	1252	compositeButton.addActionListener(this);
727	1253
728		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
729		- switchButton.setToolTipText("Create switch");
	1254	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1255	+ switchButton.setToolTipText("Create item switcher");
730	1256	switchButton.addActionListener(this);
731	1257
732		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1258	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
733	1259	loopButton.setToolTipText("Create loop");
734	1260	loopButton.addActionListener(this);
735	1261
736		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1262	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
737	1263	textureButton.setToolTipText("Create texture");
738	1264	textureButton.addActionListener(this);
739	1265
740		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1266	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
741	1267	overlayButton.setToolTipText("Create overlay");
742	1268	overlayButton.addActionListener(this);
743	1269
744		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1270	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
745	1271	lightButton.setToolTipText("Create light");
746	1272	lightButton.addActionListener(this);
747	1273
748		- for (int i=6; --i>=0;)
749		- {
750		- oe.toolboxPanel.Return();
751		- oe.toolboxPanel.add(new cGridBag());
752		- oe.toolboxPanel.add(new cGridBag());
753		- oe.toolboxPanel.add(new cGridBag());
754		- oe.toolboxPanel.add(new cGridBag());
755		- oe.toolboxPanel.add(new cGridBag());
756		- oe.toolboxPanel.add(new cGridBag());
757		- oe.toolboxPanel.add(new cGridBag());
758		- }
	1274	+ oe.toolboxPanel.add(row2);
	1275	+
	1276	+ cGridBag textures = new cGridBag();
	1277	+
	1278	+ CreateTexturePanel(textures);
	1279	+
	1280	+ int tabCount = resourcecontainer.getTabCount();
	1281	+
	1282	+ if (tabCount > 0)
	1283	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1284	+
	1285	+ oe.toolboxPanel.add(textures);
	1286	+
	1287	+ textures.preferredHeight = 100;
	1288	+
	1289	+ CreateSkyboxPanel(oe.skyboxPanel);
759	1290
760	1291	// EDIT panel
761		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
762		- editButton.setToolTipText("Edit selection");
	1292	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1293	+ editButton.setToolTipText("Pin selection controls");
763	1294	editButton.addActionListener(this);
764	1295
765		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
766		- uneditButton.setToolTipText("Unedit selection");
	1296	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1297	+ uneditButton.setToolTipText("Unpin and remove selection controls");
767	1298	uneditButton.addActionListener(this);
768	1299
769	1300	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
770		- allParamsButton.setToolTipText("Edit all params");
	1301	+ allParamsButton.setToolTipText("Show all controls");
771	1302	allParamsButton.addActionListener(this);
772	1303
773		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
774		- clearPanelButton.setToolTipText("Clear edit panel");
	1304	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1305	+ clearPanelButton.setToolTipText("Clear all controls");
775	1306	clearPanelButton.addActionListener(this);
776	1307
777		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
778		- unselectButton.setToolTipText("Unselect");
779		- unselectButton.addActionListener(this);
	1308	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1309	+ //unselectButton.setToolTipText("Unselect");
	1310	+ //unselectButton.addActionListener(this);
780	1311
781		- editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1312	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
782	1313	flashSelectionButton.setToolTipText("Highlight selection");
783	1314	flashSelectionButton.addActionListener(this);
784	1315
785	1316	editCommandsPanel.preferredHeight = 1;
786	1317
	1318	+ SetPinStates(false);
787	1319	// oe.treePanel.add(commandsPanel);
788	1320	// oe.treePanel.Return();
789	1321
..	..	@@ -800,6 +1332,8 @@
800	1332
801	1333	cGridBag jSPPanel = new cGridBag();
802	1334
	1335	+ jSPPanel.preferredHeight = 20;
	1336	+
803	1337	JScrollPane jSP;
804	1338	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
805	1339	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -808,11 +1342,15 @@
808	1342	oe.treePanel.add(jSPPanel);
809	1343	oe.treePanel.Return();
810	1344
811		- oe.treePanel.add(copyOptionsPanel);
	1345	+ oe.treePanel.add(versionManagerPanel);
812	1346	oe.treePanel.Return();
813	1347
814		-// mainPanel.setDividerLocation(0.5); //1.0);
815		-// mainPanel.setResizeWeight(0.5);
	1348	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1349	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1350	+ versionSliderPane.preferredHeight = 3;
	1351	+
	1352	+// mainPanel.setDividerLocation(0.1); //1.0);
	1353	+ mainPanel.setResizeWeight(0.4);
816	1354
817	1355	//jList.addListSelectionListener(this);
818	1356	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -820,7 +1358,7 @@
820	1358	//jTree.setEditable(true);
821	1359	oe.jTree.setDragEnabled(true);
822	1360	//jTree.setPreferredSize(new Dimension(10,10));
823		- jSP.setPreferredSize(new Dimension(100,200));
	1361	+ //jSP.setPreferredSize(new Dimension(100,200));
824	1362
825	1363	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
826	1364
..	..	@@ -832,7 +1370,7 @@
832	1370	dgr.addDragGestureListener(this);
833	1371	}catch(Exception e) {}
834	1372	*/
835		- radio.layout = sevenButton;
	1373	+ radio.layout = threeButton; // sixButton;
836	1374	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
837	1375	}
838	1376
..	..	@@ -857,56 +1395,62 @@
857	1395	boxCB.addItemListener(this);
858	1396
859	1397	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
860		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1398	+ zoomBoxCB.setToolTipText("Display only for wheel");
861	1399	zoomBoxCB.addItemListener(this);
862	1400
863	1401	if (true) // Globals.ADVANCED)
864	1402	{
865		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
866		- supportCB.setToolTipText("Enable rigging");
867		- supportCB.addItemListener(this);
	1403	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1404	+// supportCB.setToolTipText("Enable rigging");
	1405	+// supportCB.addItemListener(this);
	1406	+
	1407	+ panel.add(freezeCB = new cCheckBox("Fast cam", Globals.FREEZEONMOVE)); //, constraints);
	1408	+ freezeCB.setToolTipText("Fast moving camera");
	1409	+ freezeCB.addItemListener(this);
868	1410
869	1411	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
870	1412	// localCB.addItemListener(this);
871	1413
872	1414	panel.Return();
873	1415
	1416	+ if (Globals.ADVANCED)
	1417	+ {
874	1418	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
875	1419	crowdCB.setToolTipText("Used for crowds");
876	1420	crowdCB.addItemListener(this);
	1421	+ }
877	1422
878	1423	panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
879	1424	smoothCB.setToolTipText("Snapping delay");
880	1425	smoothCB.addItemListener(this);
881	1426
882		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
883		- slowCB.setToolTipText("Smooth interpolation");
884		- slowCB.addItemListener(this);
	1427	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1428	+// slowCB.setToolTipText("Smooth interpolation");
	1429	+// slowCB.addItemListener(this);
	1430	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1431	+ minshaderCB.setToolTipText("Minimal fast shader");
	1432	+ minshaderCB.addItemListener(this);
885	1433
886		-// constraints.gridy += 1;
887	1434	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
888	1435	// speakerMocapCB.addItemListener(this);
889	1436
890		- panel.Return();
891		-
892	1437	if (false)
893	1438	{
894	1439	// handled in scripts
895		- //constraints.gridy += 1;
896	1440	panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
897	1441	speakerCameraCB.addItemListener(this);
898	1442
899		- //constraints.gridy += 1;
900	1443	panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
901	1444	speakerFocusCB.addItemListener(this);
902	1445
903		- //constraints.gridy += 1;
904		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
905		- smoothfocusCB.addItemListener(this);
906	1446	panel.Return();
907	1447	}
908	1448
909		-//constraints.gridx += 1;
	1449	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1450	+ smoothfocusCB.addItemListener(this);
	1451	+
	1452	+ panel.Return();
	1453	+
910	1454	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
911	1455	// debugCB.addItemListener(this);
912	1456
..	..	@@ -919,7 +1463,7 @@
919	1463	oeilCB.addItemListener(this);
920	1464
921	1465	panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
922		- shadowCB.setToolTipText("Compute shadows when live");
	1466	+ shadowCB.setToolTipText("When live compute shadows");
923	1467	shadowCB.addItemListener(this);
924	1468
925	1469	panel.Return();
..	..	@@ -928,12 +1472,12 @@
928	1472	toggleTextureCB.addItemListener(this);
929	1473
930	1474	panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
931		- toggleSwitchCB.setToolTipText("Use switch");
	1475	+ toggleSwitchCB.setToolTipText("Choose a single item");
932	1476	toggleSwitchCB.addItemListener(this);
933	1477
934		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
935		- autosaveCB.setToolTipText("Auto-save on structure change");
936		- autosaveCB.addItemListener(this);
	1478	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1479	+ autokeepCB.setToolTipText("On structure change");
	1480	+ autokeepCB.addItemListener(this);
937	1481
938	1482	panel.Return();
939	1483	if (Globals.ADVANCED)
..	..	@@ -960,9 +1504,17 @@
960	1504
961	1505	void EditObject(Object3D obj)
962	1506	{
	1507	+ //assert(obj instanceof Composite);
	1508	+
	1509	+// if (obj.versionlist == null)
	1510	+// {
	1511	+// obj.versionlist = new Object3D[100];
	1512	+// obj.versionindex = -1;
	1513	+// }
	1514	+
963	1515	cRadio radioButton = new cRadio(obj.name);
964	1516
965		- // Patch to avoid bug with transparency.
	1517	+ // June 2019. Patch to avoid bug with transparency.
966	1518	radioButton.hadMaterial = obj.material != null;
967	1519	if (!radioButton.hadMaterial)
968	1520	{
..	..	@@ -970,7 +1522,7 @@
970	1522	}
971	1523
972	1524	radioButton.SetObject(obj);
973		- radioButton.layout = sevenButton;
	1525	+ radioButton.layout = threeButton; // sixButton;
974	1526	radioButton.SetCamera(cameraView.renderCamera, false);
975	1527	radioButton.addActionListener(this);
976	1528	radioPanel.add(radioButton);
..	..	@@ -984,6 +1536,7 @@
984	1536
985	1537	oe.SetupViews();
986	1538
	1539	+ if (Globals.DEBUG)
987	1540	System.out.println("SetupViews");
988	1541	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
989	1542	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -995,10 +1548,13 @@
995	1548	cCheckBox localCB;
996	1549	cCheckBox crowdCB;
997	1550	cCheckBox smoothCB;
	1551	+ cCheckBox minshaderCB;
	1552	+
998	1553	cToggleButton fastCB;
999	1554	cCheckBox slowCB;
1000	1555	cCheckBox boxCB;
1001	1556	cCheckBox zoomBoxCB;
	1557	+ cCheckBox freezeCB;
1002	1558	//cToggleButton trackCB;
1003	1559	cCheckBox trackCB;
1004	1560	cCheckBox smoothfocusCB;
..	..	@@ -1009,7 +1565,7 @@
1009	1565
1010	1566	cCheckBox oeilCB;
1011	1567	cCheckBox shadowCB;
1012		- cCheckBox autosaveCB;
	1568	+ cCheckBox autokeepCB;
1013	1569	cCheckBox lookAtCB;
1014	1570
1015	1571	// static int COLOR = 1;
..	..	@@ -1065,6 +1621,12 @@
1065	1621	cameraView.ToggleInertia();
1066	1622	cameraView.repaint();
1067	1623	}
	1624	+ else if(e.getSource() == minshaderCB)
	1625	+ {
	1626	+ Globals.MINSHADER ^= true;
	1627	+ cameraView.programInitialized = false;
	1628	+ cameraView.repaint();
	1629	+ }
1068	1630	else if(e.getSource() == localCB)
1069	1631	{
1070	1632	cameraView.ToggleLocal();
..	..	@@ -1117,9 +1679,13 @@
1117	1679	{
1118	1680	Globals.COMPUTESHADOWWHENLIVE ^= true;
1119	1681	}
1120		- else if(e.getSource() == autosaveCB)
	1682	+ else if(e.getSource() == freezeCB)
1121	1683	{
1122		- Globals.SAVEONMAKE ^= true;
	1684	+ Globals.FREEZEONMOVE ^= true;
	1685	+ }
	1686	+ else if(e.getSource() == autokeepCB)
	1687	+ {
	1688	+ Globals.REPLACEONMAKE ^= true;
1123	1689	}
1124	1690	else if(e.getSource() == lookAtCB)
1125	1691	{
..	..	@@ -1201,8 +1767,6 @@
1201	1767	}
1202	1768	}
1203	1769
1204		- String string = (String) object;
1205		-
1206	1770	System.out.println("Transfer = " + object + "; drop : " + target);
1207	1771	// if( object instanceof java.io.File[])
1208	1772	// {
..	..	@@ -1210,6 +1774,8 @@
1210	1774	// objEditor.DropFile((java.io.File[]) object, true);
1211	1775	// return;
1212	1776	// }
	1777	+
	1778	+ String string = object.toString();
1213	1779
1214	1780	// File path for Mac and Windows
1215	1781	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1337,7 +1903,12 @@
1337	1903	TreePath path;
1338	1904
1339	1905	public TransferableTreePath(TreePath tp) {
1340		- path = tp;
	1906	+ Object[] objs = new Object[tp.getPathCount()];
	1907	+ for (int i=0; i<objs.length; i++)
	1908	+ {
	1909	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1910	+ }
	1911	+ path = new TreePath(objs);
1341	1912	}
1342	1913
1343	1914	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1459,6 +2030,9 @@
1459	2030	animationItem.addItemListener(this);
1460	2031	animationItem.setState(Globals.ANIMATION);
1461	2032
	2033	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2034	+ archiveItem.addActionListener(this);
	2035	+
1462	2036	menu.add("-");
1463	2037	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1464	2038	parseverticesItem.addActionListener(this);
..	..	@@ -1471,6 +2045,8 @@
1471	2045	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1472	2046	reduce34MorphItem.addActionListener(this);
1473	2047	menu.add("-");
	2048	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2049	+ memoryItem.addActionListener(this);
1474	2050	menu.add(computeAOItem = new MenuItem("Compute AO"));
1475	2051	computeAOItem.addActionListener(this);
1476	2052
..	..	@@ -1479,8 +2055,6 @@
1479	2055	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1480	2056	mirrorItem.addActionListener(this);
1481	2057	menu.add("-");
1482		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1483		- memoryItem.addActionListener(this);
1484	2058	menu.add(analyzeItem = new MenuItem("Analyze"));
1485	2059	analyzeItem.addActionListener(this);
1486	2060	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1515,7 +2089,7 @@
1515	2089	Object3D obj = (Object3D)group.selection.elementAt(0);
1516	2090	objEditor.ScreenFit(obj, false);
1517	2091
1518		- cameraView.pingthread.StepToTarget(true);
	2092	+ cameraView.pingthread.StepToTarget(); //true);
1519	2093	refreshContents();
1520	2094	}
1521	2095
..	..	@@ -1552,7 +2126,7 @@
1552	2126	obj.parent.TransformToWorld(maxima); //, maxima);
1553	2127	}
1554	2128
1555		- Object3D shadow = new Object3D("Shadow " + obj.name);
	2129	+ Object3D shadow = new Object3D("Shadow" + obj.name);
1556	2130
1557	2131	shadow.toParent = LA.newMatrix();
1558	2132	shadow.fromParent = LA.newMatrix();
..	..	@@ -1566,24 +2140,24 @@
1566	2140	switch(axis)
1567	2141	{
1568	2142	case 0 :
1569		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1570		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1571		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1572		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2143	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2144	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2145	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2146	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
1573	2147	norm = cVector.X;
1574	2148	break;
1575	2149	case 1 :
1576		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1577		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1578		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1579		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2150	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2151	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2152	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2153	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
1580	2154	norm = cVector.Y;
1581	2155	break;
1582	2156	case 2 :
1583		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1584		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1585		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1586		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2157	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2158	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2159	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2160	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
1587	2161	norm = cVector.Z;
1588	2162	break;
1589	2163	}
..	..	@@ -1624,10 +2198,38 @@
1624	2198	shadow.material = new cMaterial(obj.material);
1625	2199	shadow.material.diffuse = 0.0001f;
1626	2200	shadow.material.specular = 0.0001f;
1627		- //shadow.projectedVertices[1].x = 300;
	2201	+ shadow.material.opacity = 0.75f;
	2202	+
	2203	+ AllocProjectedVertices(shadow);
	2204	+
	2205	+ shadow.projectedVertices[1].x = 300;
1628	2206
1629	2207	makeSomething(shadow);
1630	2208	}
	2209	+
	2210	+ private void ClearUnpinned()
	2211	+ {
	2212	+ //for (Object3D obj : listUI)
	2213	+ for (int i=listUI.size(); --i>=0;)
	2214	+ {
	2215	+ Object3D obj = listUI.elementAt(i);
	2216	+ if (!obj.pinned)
	2217	+ {
	2218	+ obj.CloseUI();
	2219	+ listUI.remove(i);
	2220	+ }
	2221	+ }
	2222	+ }
	2223	+
	2224	+ private void EditElement(Object3D elem, boolean newWindow)
	2225	+ {
	2226	+ // if (!(elem instanceof Composite))
	2227	+ // newWindow = false;
	2228	+ listUI.add(elem);
	2229	+ elem.openEditWindow(this, newWindow); //, false);
	2230	+ System.out.println("edit : " + elem);
	2231	+ elem.editWindow.refreshContents(true); // ? new
	2232	+ }
1631	2233
1632	2234	/**
1633	2235	* applyExample
..	..	@@ -2056,6 +2658,23 @@
2056	2658	{
2057	2659	makeSomething(new Light());
2058	2660	} else
	2661	+// if (source == skybox1Button \|\|
	2662	+// source == skybox2Button \|\|
	2663	+// source == skybox3Button \|\|
	2664	+// source == skybox4Button \|\|
	2665	+// source == skybox5Button \|\|
	2666	+// source == skybox6Button \|\|
	2667	+// source == skybox7Button \|\|
	2668	+// source == skybox11Button \|\|
	2669	+// source == skybox12Button \|\|
	2670	+// source == skybox13Button \|\|
	2671	+// source == skybox14Button \|\|
	2672	+// source == skybox15Button \|\|
	2673	+// source == skybox16Button \|\|
	2674	+// source == skybox17Button)
	2675	+// {
	2676	+// ChangeSkybox(source);
	2677	+// } else
2059	2678	if (source == csgItem)
2060	2679	{
2061	2680	group(new CSG());
..	..	@@ -2104,28 +2723,36 @@
2104	2723	} else
2105	2724	if (source == loopItem \|\| source == loopButton)
2106	2725	{
	2726	+ if (!group.selection.isEmpty())
	2727	+ {
2107	2728	Composite csg = new GroupLeaf();
2108		- csg.count = 5;
2109	2729	group(csg);
2110		- Composite child = new cGroup();
	2730	+ csg.count = 5;
	2731	+ Composite child = new cGroup("Branch");
2111	2732	csg.addChild(child);
2112	2733	child.addChild(csg);
	2734	+ }
2113	2735	} else
2114	2736	if (source == doubleItem)
2115	2737	{
2116		- Composite csg = new GroupLeaf();
2117		- csg.count = 5;
	2738	+ if (!group.selection.isEmpty())
	2739	+ {
	2740	+ Composite csg = new GroupLeaf("Fork");
2118	2741	group(csg);
2119		- Composite child = new cGroup();
	2742	+ csg.count = 5;
	2743	+ Composite child = new cGroup("Branch A");
2120	2744	csg.addChild(child);
2121	2745	child.addChild(csg);
2122		- child = new cGroup();
	2746	+ child = new cGroup("Branch B");
2123	2747	csg.addChild(child);
2124	2748	child.addChild(csg);
	2749	+ }
2125	2750	} else
2126	2751	if (source == tripleItem)
2127	2752	{
2128		- Composite csg = new GroupLeaf();
	2753	+ if (!group.selection.isEmpty())
	2754	+ {
	2755	+ Composite csg = new GroupLeaf("Trident");
2129	2756	csg.count = 4;
2130	2757	group(csg);
2131	2758	Composite child = new cGroup();
..	..	@@ -2137,11 +2764,12 @@
2137	2764	child = new cGroup();
2138	2765	csg.addChild(child);
2139	2766	child.addChild(csg);
	2767	+ }
2140	2768	} else
2141	2769	if (source == computeAOItem)
2142	2770	{
2143	2771	Globals.drawMode = CameraPane.OCCLUSION;
2144		- Globals.theRenderer.repaint();
	2772	+ cameraView.repaint();
2145	2773	} else
2146	2774	if (source == recompileItem)
2147	2775	{
..	..	@@ -2156,7 +2784,7 @@
2156	2784	if (source == invariantsItem)
2157	2785	{
2158	2786	System.out.println("Invariants:");
2159		- Grafreed.grafreeD.universe.invariants();
	2787	+ Grafreed.grafreed.universe.invariants();
2160	2788	} else
2161	2789	if (source == memoryItem)
2162	2790	{
..	..	@@ -2183,21 +2811,56 @@
2183	2811	{
2184	2812	Maximize();
2185	2813	} else
2186		- if (source == fullButton)
	2814	+ if (source == fullScreenButton)
2187	2815	{
2188	2816	ToggleFullScreen();
2189	2817	} else
2190		- if (source == undoButton)
	2818	+ if (source == collapseButton)
2191	2819	{
2192		- Undo();
	2820	+ this.expandedLayout = radio.layout;
	2821	+ CollapseToolbar();
2193	2822	} else
2194		- if (source == redoButton)
	2823	+// if (source == maximize3DButton)
	2824	+// {
	2825	+// this.expandedLayout = radio.layout;
	2826	+// radio.layout = twoButton;
	2827	+// CollapseToolbar();
	2828	+// Show3DView();
	2829	+// } else
	2830	+ if (source == previousVersionButton)
2195	2831	{
2196		- Redo();
	2832	+ // Go to previous version
	2833	+ //if (!Undo())
	2834	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2835	+ PreviousVersion();
2197	2836	} else
2198		- if (source == saveButton)
	2837	+ if (source == restoreButton)
2199	2838	{
2200		- Save();
	2839	+ // Restore current version
	2840	+ Restore();
	2841	+ //restoreButton.setEnabled(false);
	2842	+ } else
	2843	+ if (source == replaceButton)
	2844	+ {
	2845	+ // Overwrite current version
	2846	+ Replace();
	2847	+ //replaceButton.setEnabled(false);
	2848	+ } else
	2849	+ if (source == nextVersionButton)
	2850	+ {
	2851	+ // Go to next version
	2852	+ NextVersion();
	2853	+ } else
	2854	+ if (source == saveVersionButton)
	2855	+ {
	2856	+ // Save a new version
	2857	+ if (!DuplicateVersion()) //true))
	2858	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2859	+ } else
	2860	+ if (source == deleteVersionButton)
	2861	+ {
	2862	+ // Delete a new version
	2863	+ DeleteVersion();
2201	2864	} else
2202	2865	if (source == oneStepButton)
2203	2866	{
..	..	@@ -2206,17 +2869,14 @@
2206	2869	} else
2207	2870	if (source == screenfitButton)
2208	2871	{
2209		- //Reload(lastConverter, lastFilename, true);
2210	2872	ScreenFit();
2211	2873	} else
2212	2874	if (source == screenfitpointButton)
2213	2875	{
2214		- //Reload(lastConverter, lastFilename, true);
2215	2876	ScreenFitPoint();
2216	2877	} else
2217	2878	if (source == snapobjectButton)
2218	2879	{
2219		- //Reload(lastConverter, lastFilename, true);
2220	2880	SnapObject();
2221	2881	} else
2222	2882	// if (event.getSource() == recompileButton)
..	..	@@ -2255,11 +2915,11 @@
2255	2915	} else
2256	2916	if (source == undoItem)
2257	2917	{
2258		- Undo();
	2918	+ PreviousVersion();
2259	2919	} else
2260	2920	if (source == redoItem)
2261	2921	{
2262		- Redo();
	2922	+ NextVersion();
2263	2923	} else
2264	2924	if (source == duplicateItem)
2265	2925	{
..	..	@@ -2580,7 +3240,7 @@
2580	3240	{
2581	3241	StepAll();
2582	3242	} else
2583		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3243	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2584	3244	{
2585	3245	//int indices[] = jList.getSelectedIndices();
2586	3246	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2740,15 +3400,40 @@
2740	3400	} else
2741	3401	if (source == ungroupItem \|\| source == ungroupButton)
2742	3402	{
2743		- //ungroup();
	3403	+ boolean canUngroup = true;
	3404	+
2744	3405	for (int i=0; i<group.selection.size(); i++)
2745	3406	{
2746		- Ungroup(group.selection.get(i));
	3407	+ Object3D selectedItem = group.selection.get(i);
	3408	+
	3409	+ if (selectedItem.Size() == 0)
	3410	+ {
	3411	+ // Cannot ungroup leaves
	3412	+ canUngroup = false;
	3413	+ break;
	3414	+ }
	3415	+
	3416	+ if (selectedItem == group)
	3417	+ {
	3418	+ // Cannot ungroup root
	3419	+ canUngroup = false;
	3420	+ break;
	3421	+ }
2747	3422	}
2748	3423
2749		- ClearSelection(false);
2750		-
2751		- refreshContents();
	3424	+ if (canUngroup)
	3425	+ {
	3426	+ for (int i=0; i<group.selection.size(); i++)
	3427	+ {
	3428	+ Object3D selectedItem = group.selection.get(i);
	3429	+
	3430	+ Ungroup(selectedItem);
	3431	+ }
	3432	+
	3433	+ ClearSelection(false);
	3434	+
	3435	+ refreshContents();
	3436	+ }
2752	3437	} else
2753	3438	if (source == genUVItem)
2754	3439	{
..	..	@@ -2793,6 +3478,10 @@
2793	3478	if (source == clearMaterialsItem)
2794	3479	{
2795	3480	ClearMaterials();
	3481	+ } else
	3482	+ if (source == clearVersionsItem)
	3483	+ {
	3484	+ ClearVersions();
2796	3485	} else
2797	3486	if (source == liveleavesItem)
2798	3487	{
..	..	@@ -2934,6 +3623,18 @@
2934	3623	{
2935	3624	TransformChildren();
2936	3625	} else
	3626	+ if (source == textureRatioRItem)
	3627	+ {
	3628	+ TextureRatio(0);
	3629	+ } else
	3630	+ if (source == textureRatioGItem)
	3631	+ {
	3632	+ TextureRatio(1);
	3633	+ } else
	3634	+ if (source == textureRatioBItem)
	3635	+ {
	3636	+ TextureRatio(2);
	3637	+ } else
2937	3638	if (source == resetTransformItem)
2938	3639	{
2939	3640	ResetTransform();
..	..	@@ -3049,7 +3750,7 @@
3049	3750	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3050	3751	{
3051	3752	obj = (Object3D)e.nextElement();
3052		- obj.SetBumpTexture(null);
	3753	+ obj.ResetBumpTexture();
3053	3754	}
3054	3755
3055	3756	refreshContents();
..	..	@@ -3063,6 +3764,31 @@
3063	3764	obj.SetBumpTexture(obj.GetPigmentTexture());
3064	3765	}
3065	3766
	3767	+ refreshContents();
	3768	+ } else
	3769	+ if (source == embedTexturesItem)
	3770	+ {
	3771	+ Object3D obj;
	3772	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3773	+ {
	3774	+ obj = (Object3D)e.nextElement();
	3775	+ obj.EmbedTextures(true);
	3776	+ }
	3777	+
	3778	+ refreshContents();
	3779	+ } else
	3780	+ if (source == deEmbedTexturesItem)
	3781	+ {
	3782	+ Object3D obj;
	3783	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3784	+ {
	3785	+ obj = (Object3D)e.nextElement();
	3786	+ obj.EmbedTextures(false);
	3787	+ }
	3788	+
	3789	+ CameraPane.texturepigment.clear();
	3790	+ CameraPane.texturebump.clear();
	3791	+
3066	3792	refreshContents();
3067	3793	} else
3068	3794	if (source == flashSelectionButton)
..	..	@@ -3080,38 +3806,7 @@
3080	3806	if (CameraPane.FULLSCREEN)
3081	3807	fullscreenLayout = radio.layout;
3082	3808
3083		- // bug
3084		- //gridPanel.setDividerLocation(1.0);
3085		- //bigPanel.setDividerLocation(0.0);
3086		-// bigThree.remove(scenePanel);
3087		-// bigThree.remove(centralPanel);
3088		-// bigThree.remove(XYZPanel);
3089		-// aWindowConstraints.gridx = 0;
3090		-// aWindowConstraints.gridy = 0;
3091		-// aWindowConstraints.gridwidth = 1;
3092		-// // aConstraints.gridheight = 3;
3093		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3094		-// aWindowConstraints.weightx = 0;
3095		-// aWindowConstraints.weighty = 1;
3096		-// //bigThree.add(jtp, aWindowConstraints);
3097		-// aWindowConstraints.weightx = 1;
3098		-// aWindowConstraints.gridwidth = 3;
3099		-// // aConstraints.gridheight = 3;
3100		-// aWindowConstraints.gridx = 1;
3101		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3102		-// bigThree.add(centralPanel, aWindowConstraints);
3103		-// aWindowConstraints.weightx = 0;
3104		-// aWindowConstraints.gridx = 4;
3105		-// aWindowConstraints.gridwidth = 1;
3106		-// // aConstraints.gridheight = 3;
3107		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3108		-// //bigThree.add(XYZPanel, aWindowConstraints);
3109		-// scenePanel.setVisible(false);
3110		-// centralPanel.setVisible(true);
3111		-// XYZPanel.setVisible(false);
3112		- bigThree.ClearUI();
3113		- bigThree.add(centralPanel);
3114		- bigThree.FlushUI();
	3809	+ Show3DView();
3115	3810
3116	3811	cameraView.requestFocusInWindow();
3117	3812
..	..	@@ -3166,8 +3861,8 @@
3166	3861	// centralPanel.setVisible(true);
3167	3862	// XYZPanel.setVisible(true);
3168	3863	bigThree.ClearUI();
	3864	+ bigThree.add(scenePanel);
3169	3865	bigThree.add(centralPanel);
3170		- bigThree.add(XYZPanel);
3171	3866	bigThree.FlushUI();
3172	3867
3173	3868	cameraView.requestFocusInWindow();
..	..	@@ -3247,8 +3942,8 @@
3247	3942	// centralPanel.setVisible(true);
3248	3943	// XYZPanel.setVisible(false);
3249	3944	bigThree.ClearUI();
3250		- bigThree.add(scenePanel);
3251	3945	bigThree.add(centralPanel);
	3946	+ bigThree.add(scenePanel);
3252	3947	bigThree.FlushUI();
3253	3948
3254	3949	cameraView.requestFocusInWindow();
..	..	@@ -3297,6 +3992,7 @@
3297	3992	} else
3298	3993	if (source == rootButton)
3299	3994	{
	3995	+ Replace();
3300	3996	Object3D obj;
3301	3997	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3302	3998	{
..	..	@@ -3311,6 +4007,9 @@
3311	4007	if (source == closeButton)
3312	4008	{
3313	4009	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	4010	+ if (copy.versionlist != null)
	4011	+ Replace();
	4012	+
3314	4013	cRadio ab;
3315	4014	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3316	4015	{
..	..	@@ -3354,10 +4053,10 @@
3354	4053	{
3355	4054	Object3D child = (Object3D)e.nextElement();
3356	4055	if(child.editWindow != null)
3357		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3358	4056	child.pinned = false;
3359	4057	child.CloseUI();
3360	4058	listUI.remove(child);
	4059	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3361	4060
3362	4061	//child.editWindow = null; // ???????????
3363	4062	}
..	..	@@ -3372,10 +4071,11 @@
3372	4071	//copy.ClearUI();
3373	4072	for (Object3D obj : listUI)
3374	4073	{
3375		- obj.pinned = true;
	4074	+ obj.pinned = false;
3376	4075	obj.CloseUI();
3377	4076	}
3378	4077	listUI.clear();
	4078	+ SetPinStates(group.selection.size() > 0);
3379	4079	refreshContents(true);
3380	4080	} else
3381	4081	if (source == allParamsButton)
..	..	@@ -3408,6 +4108,9 @@
3408	4108	} else
3409	4109	if(source instanceof cRadio)
3410	4110	{
	4111	+ if (copy.versionlist != null)
	4112	+ Replace();
	4113	+
3411	4114	group.parent = keepparent;
3412	4115	group.attributes = 0;
3413	4116	//group.editWindow = null;
..	..	@@ -3431,6 +4134,7 @@
3431	4134	}
3432	4135
3433	4136	copy = group;
	4137	+
3434	4138	//Globals.theRenderer.object = group;
3435	4139	if(!useclient)
3436	4140	{
..	..	@@ -3457,6 +4161,40 @@
3457	4161	currentLayout = sevenButton;
3458	4162	*/
3459	4163	radio.layout.doClick();
	4164	+
	4165	+ //assert(copy instanceof Composite);
	4166	+
	4167	+ if (copy.versionlist == null)
	4168	+ {
	4169	+ copy.versionindex = -1;
	4170	+
	4171	+ // Cannot work with loops
	4172	+ // To fix this issue, we first mark all nodes above the root,
	4173	+ // and check if any of these nodes are reachable below the root.
	4174	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4175	+
	4176	+ if (copy instanceof Composite && !copy.HasTags())
	4177	+ {
	4178	+ if (copy.versionlist == null)
	4179	+ copy.versionlist = new Object3D[100];
	4180	+
	4181	+ //Save(true);
	4182	+ }
	4183	+ else
	4184	+ copy.versionindex = -2;
	4185	+
	4186	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4187	+ }
	4188	+
	4189	+ SetVersionStates();
	4190	+
	4191	+ ClearUnpinned();
	4192	+
	4193	+ //Grafreed.Assert(group != null);
	4194	+ //Grafreed.Assert(group.selection != null);
	4195	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4196	+ if (group.selection == null \|\| group.selection.size() == 1)
	4197	+ EditSelection(false);
3460	4198	keepparent = group.parent;
3461	4199	// PARENT = NULL or not???
3462	4200	//group.parent = null; // ROOT
..	..	@@ -3468,11 +4206,13 @@
3468	4206	} else if (event.getSource() == editCameraItem)
3469	4207	{
3470	4208	cameraView.ProtectCamera();
	4209	+ cameraView.requestFocusInWindow();
3471	4210	cameraView.repaint();
3472	4211	return;
3473	4212	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3474	4213	{
3475	4214	cameraView.RevertCamera();
	4215	+ cameraView.requestFocusInWindow();
3476	4216	cameraView.repaint();
3477	4217	return;
3478	4218	// } else if (event.getSource() == textureButton)
..	..	@@ -3561,9 +4301,46 @@
3561	4301	refreshContents();
3562	4302	}
3563	4303
	4304	+ void TextureRatio(int axis)
	4305	+ {
	4306	+ Object3D obj;
	4307	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4308	+ {
	4309	+ obj = (Object3D)e.nextElement();
	4310	+ obj.TextureRatio(axis);
	4311	+ }
	4312	+
	4313	+ refreshContents();
	4314	+ }
	4315	+
3564	4316	void ResetTransform()
3565	4317	{
3566	4318	ResetTransform(-1);
	4319	+ }
	4320	+
	4321	+ void ScaleSelection(int scale)
	4322	+ {
	4323	+ Object3D obj;
	4324	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4325	+ {
	4326	+ obj = (Object3D)e.nextElement();
	4327	+
	4328	+ if (obj.toParent == null)
	4329	+ continue;
	4330	+
	4331	+ obj.Scale(scale);
	4332	+
	4333	+ if (obj.parent == null)
	4334	+ {
	4335	+ System.out.println("NULL PARENT!");
	4336	+ // new Exception().printStackTrace();
	4337	+ }
	4338	+ else
	4339	+ TouchTransform(obj);
	4340	+ //obj.parent.Touch();
	4341	+ }
	4342	+
	4343	+ refreshContents();
3567	4344	}
3568	4345
3569	4346	void ResetTransform(int mask)
..	..	@@ -3576,42 +4353,8 @@
3576	4353	if (obj.toParent == null)
3577	4354	continue;
3578	4355
3579		- if (mask == -1)
3580		- {
3581		- if (obj instanceof Camera) // jan 2014
3582		- {
3583		- LA.matIdentity(obj.toParent);
3584		- LA.matIdentity(obj.fromParent);
3585		- }
3586		- else
3587		- {
3588		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
3589		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
3590		- }
3591		- TouchTransform(obj);
3592		- continue;
3593		- }
3594		- if ((mask&2) != 0) // Scale
3595		- {
3596		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3597		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3598		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3599		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3600		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3601		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3602		- }
3603		- if ((mask&4) != 0) // Rotation
3604		- {
3605		- // ?
3606		- }
3607		- if ((mask&1) != 0) // Translation
3608		- {
3609		- if (obj.toParent != null)
3610		- {
3611		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
3612		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
3613		- }
3614		- }
	4356	+ obj.ResetTransform(mask);
	4357	+
3615	4358	if (obj.parent == null)
3616	4359	{
3617	4360	System.out.println("NULL PARENT!");
..	..	@@ -4049,7 +4792,7 @@
4049	4792
4050	4793	try
4051	4794	{
4052		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4795	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4053	4796	}
4054	4797	catch (Exception e)
4055	4798	{
..	..	@@ -4120,10 +4863,17 @@
4120	4863	{
4121	4864	Object3D obj = group.selection.get(i);
4122	4865
	4866	+ if (obj.toParent == null)
	4867	+ {
	4868	+ obj.toParent = LA.newMatrix();
	4869	+ obj.fromParent = LA.newMatrix();
	4870	+ }
	4871	+
4123	4872	LA.matTranslate(obj.toParent, i * scale, 0, 0);
4124	4873	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
4125	4874	}
4126	4875
	4876	+ Globals.lighttouched = true;
4127	4877	refreshContents();
4128	4878	}
4129	4879
..	..	@@ -4411,6 +5161,12 @@
4411	5161	refreshContents();
4412	5162	}
4413	5163
	5164	+ void ClearVersions()
	5165	+ {
	5166	+ group.selection.ClearVersions();
	5167	+ refreshContents();
	5168	+ }
	5169	+
4414	5170	void FlipV(boolean flip)
4415	5171	{
4416	5172	group.selection.FlipV(flip);
..	..	@@ -4526,6 +5282,12 @@
4526	5282
4527	5283	void EditSelection(boolean newWindow)
4528	5284	{
	5285	+ if (group.selection == null)
	5286	+ {
	5287	+ EditElement(group, newWindow); // ? new
	5288	+ return;
	5289	+ }
	5290	+
4529	5291	// aConstraints.gridy = 0;
4530	5292	for (int i=0; i<group.selection.size(); i++)
4531	5293	{
..	..	@@ -4536,12 +5298,7 @@
4536	5298	Object3D elem = (Object3D)group.selection.elementAt(i);
4537	5299	if(elem != group \|\| !newWindow)
4538	5300	{
4539		- // if (!(elem instanceof Composite))
4540		- // newWindow = false;
4541		- listUI.add(elem);
4542		- elem.openEditWindow(this, newWindow); //, false);
4543		- System.out.println("edit : " + elem);
4544		- elem.editWindow.refreshContents(true); // ? new
	5301	+ EditElement(elem, newWindow); // ? new
4545	5302	}
4546	5303	}
4547	5304	}
..	..	@@ -4604,9 +5361,7 @@
4604	5361
4605	5362	freezemodel = false;
4606	5363	}
4607		-
4608		- boolean flashIt = true;
4609		-
	5364	+
4610	5365	public void valueChanged(TreeSelectionEvent e)
4611	5366	//public boolean handleEvent(Event event)
4612	5367	{
..	..	@@ -4616,17 +5371,7 @@
4616	5371	//new Exception().printStackTrace();
4617	5372
4618	5373	freezemodel = true;
4619		-
4620		- //for (Object3D obj : listUI)
4621		- for (int i=listUI.size(); --i>=0;)
4622		- {
4623		- Object3D obj = listUI.elementAt(i);
4624		- if (!obj.pinned)
4625		- {
4626		- obj.CloseUI();
4627		- listUI.remove(i);
4628		- }
4629		- }
	5374	+ ClearUnpinned();
4630	5375
4631	5376	/**/
4632	5377	//switch (event.id)
..	..	@@ -4660,10 +5405,10 @@
4660	5405	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4661	5406	// a camera
4662	5407	{
4663		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5408	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
4664	5409	{
4665	5410	CameraPane.camerachangeframe = 0; // don't refuse it
4666		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5411	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent(), true);
4667	5412	}
4668	5413	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4669	5414	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
..	..	@@ -4689,12 +5434,32 @@
4689	5434	{
4690	5435	editButton.setEnabled(enabled);
4691	5436	uneditButton.setEnabled(enabled);
	5437	+ //unselectButton.setEnabled(enabled);
	5438	+ flashSelectionButton.setEnabled(enabled);
	5439	+
	5440	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5441	+
	5442	+ boolean allComposites = true;
	5443	+
	5444	+ if (group.selection != null)
	5445	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5446	+ {
	5447	+ Object next = e.nextElement();
	5448	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5449	+ {
	5450	+ allComposites = false;
	5451	+ break;
	5452	+ }
	5453	+ }
	5454	+
	5455	+ rootButton.setEnabled(true); // allComposites);
4692	5456	}
4693	5457
4694	5458	void refreshContents(boolean cp)
4695	5459	{
4696		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4697		- if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	5460	+ if (Globals.SHOWINFO)
	5461	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5462	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4698	5463	{
4699	5464	objEditor.ClearInfo(); // .GetMaterial());
4700	5465
..	..	@@ -4703,7 +5468,7 @@
4703	5468	Object3D child = (Object3D) group.selection.get(i);
4704	5469
4705	5470	objEditor.AddInfo(child, this, true);
4706		- System.err.println("info : " + child.GetPath());
	5471	+// System.err.println("info : " + child.GetPath());
4707	5472	}
4708	5473
4709	5474	objEditor.SetText(); // jan 2014
..	..	@@ -4793,8 +5558,8 @@
4793	5558
4794	5559	if (cut)
4795	5560	{
4796		- if (Globals.SAVEONMAKE)
4797		- Save();
	5561	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5562	+// Save();
4798	5563	//int indices[] = jList.getSelectedIndices();
4799	5564	//for (int i = indices.length - 1; i >= 0; i--)
4800	5565	//jList.remove(indices[i]);
..	..	@@ -4897,6 +5662,10 @@
4897	5662
4898	5663	void paste(boolean expand)
4899	5664	{
	5665	+ if (Globals.REPLACEONMAKE)
	5666	+ Save();
	5667	+ boolean keep = Globals.REPLACEONMAKE;
	5668	+ Globals.REPLACEONMAKE = false;
4900	5669	// if (GrafreeD.clipboard == null)
4901	5670	// return;
4902	5671	boolean first = true;
..	..	@@ -4956,6 +5725,7 @@
4956	5725	Grafreed.clipboard.get(0).parent = keepparent;
4957	5726	}
4958	5727
	5728	+ Globals.REPLACEONMAKE = keep;
4959	5729	ResetModel();
4960	5730	refreshContents();
4961	5731	}
..	..	@@ -5091,6 +5861,10 @@
5091	5861
5092	5862	void group(Object3D csg, boolean grab)
5093	5863	{
	5864	+ if (Globals.REPLACEONMAKE)
	5865	+ Save();
	5866	+ boolean keep = Globals.REPLACEONMAKE;
	5867	+ Globals.REPLACEONMAKE = false;
5094	5868	if (//false) // why??
5095	5869	!group.selection.isEmpty())
5096	5870	{
..	..	@@ -5204,10 +5978,15 @@
5204	5978	//node.add(csg);
5205	5979	//makeSomething(node);
5206	5980	makeSomething(csg);
	5981	+ Globals.REPLACEONMAKE = keep;
5207	5982	}
5208	5983
5209	5984	void Ungroup(Object3D g)
5210	5985	{
	5986	+ if (Globals.REPLACEONMAKE)
	5987	+ Save();
	5988	+ boolean keep = Globals.REPLACEONMAKE;
	5989	+ Globals.REPLACEONMAKE = false;
5211	5990	if (g instanceof HiddenObject)
5212	5991	{
5213	5992	HiddenObject h = (HiddenObject) g;
..	..	@@ -5224,6 +6003,7 @@
5224	6003	objEditor.makeSomething(g.get(i), false);
5225	6004	}
5226	6005	}
	6006	+ Globals.REPLACEONMAKE = keep;
5227	6007	}
5228	6008
5229	6009	void ungroup()
..	..	@@ -5514,10 +6294,6 @@
5514	6294
5515	6295	cButton restoreCameraButton;
5516	6296
5517		- cButton minButton;
5518		- cButton maxButton;
5519		- cButton fullButton;
5520		- cButton saveButton;
5521	6297	cButton oneStepButton;
5522	6298
5523	6299	cButton groupButton;
..	..	@@ -5526,6 +6302,22 @@
5526	6302	cButton switchButton;
5527	6303	cButton loopButton;
5528	6304	cButton textureButton;
	6305	+
	6306	+ cButton skybox1Button;
	6307	+ cButton skybox2Button;
	6308	+ cButton skybox3Button;
	6309	+ cButton skybox4Button;
	6310	+ cButton skybox5Button;
	6311	+ cButton skybox6Button;
	6312	+ cButton skybox7Button;
	6313	+
	6314	+ cButton skybox11Button;
	6315	+ cButton skybox12Button;
	6316	+ cButton skybox13Button;
	6317	+ cButton skybox14Button;
	6318	+ cButton skybox15Button;
	6319	+ cButton skybox16Button;
	6320	+ cButton skybox17Button;
5529	6321
5530	6322	cButton gridButton;
5531	6323	cButton boxButton;
..	..	@@ -5559,11 +6351,11 @@
5559	6351	private MenuItem lookAtItem;
5560	6352	private MenuItem lookFromItem;
5561	6353	private MenuItem switchViewItem;
5562		- private MenuItem cutItem;
	6354	+ private JMenuItem cutItem;
5563	6355	private MenuItem undoItem;
5564	6356	private MenuItem redoItem;
5565	6357	private JMenuItem duplicateItem;
5566		- private MenuItem cloneItem;
	6358	+ private JMenuItem cloneItem;
5567	6359	private MenuItem cloneSupportItem;
5568	6360	private MenuItem overwriteGeoItem;
5569	6361	private MenuItem overwriteMatItem;
..	..	@@ -5584,13 +6376,13 @@
5584	6376	private MenuItem cloneGeometriesItem;
5585	6377	private MenuItem shareGeometriesItem;
5586	6378	private MenuItem mergeGeometriesItem;
5587		- private MenuItem copyItem;
	6379	+ private JMenuItem copyItem;
5588	6380	private MenuItem pasteItem;
5589		- private MenuItem pasteIntoItem;
5590		- private MenuItem pasteLinkItem;
5591		- private MenuItem pasteCloneItem;
5592		- private MenuItem pasteExpandItem;
5593		- private MenuItem clearItem;
	6381	+ private JMenuItem pasteIntoItem;
	6382	+ private JMenuItem pasteLinkItem;
	6383	+ private JMenuItem pasteCloneItem;
	6384	+ private JMenuItem pasteExpandItem;
	6385	+ private JMenuItem deleteItem;
5594	6386	private MenuItem clearAllItem;
5595	6387	private MenuItem genUVItem;
5596	6388	private MenuItem genNormalsMESHItem;
..	..	@@ -5616,6 +6408,7 @@
5616	6408	private MenuItem clipMeshItem;
5617	6409	private MenuItem smoothMeshItem;
5618	6410	private MenuItem clearMaterialsItem;
	6411	+ private MenuItem clearVersionsItem;
5619	6412
5620	6413	private MenuItem liveleavesItem;
5621	6414	private MenuItem unliveleavesItem;
..	..	@@ -5639,13 +6432,16 @@
5639	6432	private MenuItem maxTexturesItem;
5640	6433	private MenuItem panoTexturesItem;
5641	6434
	6435	+ private MenuItem textureRatioRItem;
	6436	+ private MenuItem textureRatioGItem;
	6437	+ private MenuItem textureRatioBItem;
5642	6438	private MenuItem resetCentroidItem;
5643	6439	private MenuItem resetCentroidXZItem;
5644	6440	private MenuItem resetTransformItem;
5645	6441	private MenuItem transformGeometryItem;
5646	6442	private MenuItem transformChildrenItem;
5647	6443	private MenuItem hideItem;
5648		- private MenuItem grabItem;
	6444	+ private JMenuItem grabItem;
5649	6445	private MenuItem backItem;
5650	6446	private MenuItem frontItem;
5651	6447	private MenuItem cameraItem;
..	..	@@ -5658,7 +6454,7 @@
5658	6454	private MenuItem switchTransfoItem;
5659	6455	private MenuItem morphItem;
5660	6456	private MenuItem linkerItem;
5661		- private MenuItem ungroupItem;
	6457	+ private JMenuItem ungroupItem;
5662	6458	private MenuItem editItem;
5663	6459	private MenuItem openWindowItem;
5664	6460	private MenuItem editLeafItem;
..	..	@@ -5674,6 +6470,8 @@
5674	6470	private MenuItem attachBumpItem;
5675	6471	private MenuItem detachBumpItem;
5676	6472	private MenuItem pigmentBumpItem;
	6473	+ private MenuItem embedTexturesItem;
	6474	+ private MenuItem deEmbedTexturesItem;
5677	6475
5678	6476	private MenuItem particleItem;
5679	6477	private MenuItem ragdollItem;