~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,10 +445,22 @@
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)
86	459	{
	460	+ if (Globals.REPLACEONMAKE)
	461	+ Save();
	462	+ boolean keep = Globals.REPLACEONMAKE;
	463	+ Globals.REPLACEONMAKE = false;
87	464	// Object3D keep = GrafreeD.clipboard;
88	465	//Object3D obj;
89	466	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +471,7 @@
94	471
95	472	makeSomething(clone, i==group.selection.size()-1);
96	473	}
	474	+ Globals.REPLACEONMAKE = keep;
97	475	}
98	476
99	477	void CloneClipboard(boolean supports)
..	..	@@ -164,33 +542,35 @@
164	542	// menu.add("-");
165	543	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
166	544	duplicateItem.addActionListener(this);
167		- cloneItem = menu.add(new MenuItem("Clone"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
168	547	cloneItem.addActionListener(this);
169		- if (Globals.ADVANCED)
	548	+ //if (Globals.ADVANCED)
170	549	{
171	550	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
172	551	cloneSupportItem.addActionListener(this);
173	552	}
	553	+ oe.jTree.popup.addSeparator();
174	554	menu.add("-");
175		- cutItem = menu.add(new MenuItem("Cut"));
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
176	556	cutItem.addActionListener(this);
177		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
178	558	copyItem.addActionListener(this);
179	559	pasteItem = menu.add(new MenuItem("Paste"));
180	560	pasteItem.addActionListener(this);
181	561
182		- menu.add("-");
183		- 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"));
184	565	pasteIntoItem.addActionListener(this);
185		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
186	567	pasteLinkItem.addActionListener(this);
187		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
188	569	pasteCloneItem.addActionListener(this);
189		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
190	571	// pasteExpandItem.addActionListener(this);
191		- menu.add("-");
192		- clearItem = menu.add(new MenuItem("Clear"));
193		- clearItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
194	574
195	575	if (Globals.ADVANCED)
196	576	{
..	..	@@ -220,7 +600,7 @@
220	600	// toggleSwitchItem.addItemListener(this);
221	601	// toggleSwitchItem.setState(CameraPane.SWITCH);
222	602
223		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	603	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
224	604	toggleHandleItem.addItemListener(this);
225	605	toggleHandleItem.setState(CameraPane.HANDLES);
226	606
..	..	@@ -276,11 +656,9 @@
276	656	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
277	657	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
278	658	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
279		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
280	659	oe.cameraMenu.add("-");
281	660	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
282	661	openWindowItem.addActionListener(this);
283		- editLeafItem.addActionListener(this);
284	662	lookAtItem.addActionListener(this);
285	663	//lookFromItem.addActinoListener(this);
286	664	//switchViewItem.addActionListener(this);
..	..	@@ -327,9 +705,8 @@
327	705	setMasterItem.addActionListener(this);
328	706	}
329	707
330		- oe.menuBar.add(menu = new Menu("Group"));
331		-// grabItem = menu.add(new MenuItem("Grab"));
332		-// grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
333	710	backItem = menu.add(new MenuItem("Back"));
334	711	backItem.addActionListener(this);
335	712	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -337,13 +714,21 @@
337	714	// compositeItem = menu.add(new MenuItem("Composite"));
338	715	// compositeItem.addActionListener(this);
339	716
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
	719	+
340	720	if (Globals.ADVANCED)
341	721	{
342	722	hideItem = menu.add(new MenuItem("Hidden Group"));
343	723	hideItem.addActionListener(this);
344	724	}
345		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
346	726	ungroupItem.addActionListener(this);
	727	+
	728	+ oe.jTree.popup.addSeparator();
	729	+
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
347	732
348	733	// menu.add("-");
349	734	//
..	..	@@ -380,13 +765,14 @@
380	765	shadowYItem.addActionListener(this);
381	766	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
382	767	shadowZItem.addActionListener(this);
	768	+ attributeItem = menu.add(new MenuItem("Attribute"));
	769	+ attributeItem.addActionListener(this);
	770	+
383	771	if (Globals.ADVANCED)
384	772	{
385	773	menu.add("-");
386	774	linkerItem = menu.add(new MenuItem("Linker"));
387	775	linkerItem.addActionListener(this);
388		- attributeItem = menu.add(new MenuItem("Attribute"));
389		- attributeItem.addActionListener(this);
390	776	templateItem = menu.add(new MenuItem("Template"));
391	777	templateItem.addActionListener(this);
392	778	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -415,7 +801,7 @@
415	801	genNormalsMESHItem.addActionListener(this);
416	802	if (Globals.ADVANCED)
417	803	{
418		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	804	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
419	805	genNormalsMINEItem.addActionListener(this);
420	806	}
421	807	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -471,9 +857,9 @@
471	857	hideleavesItem.addActionListener(this);
472	858	showleavesItem = menu.add(new MenuItem("Show Leaves"));
473	859	showleavesItem.addActionListener(this);
474		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	860	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
475	861	markleavesItem.addActionListener(this);
476		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	862	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
477	863	unmarkleavesItem.addActionListener(this);
478	864	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
479	865	rewindleavesItem.addActionListener(this);
..	..	@@ -508,10 +894,15 @@
508	894	attachBumpItem.addActionListener(this);
509	895	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
510	896	pigmentBumpItem.addActionListener(this);
	897	+ //embedTexturesItem
511	898	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
512	899	detachPigmentItem.addActionListener(this);
513	900	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
514	901	detachBumpItem.addActionListener(this);
	902	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	903	+ embedTexturesItem.addActionListener(this);
	904	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	905	+ deEmbedTexturesItem.addActionListener(this);
515	906	menu.add("-");
516	907	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
517	908	sortbysizeItem.addActionListener(this);
..	..	@@ -522,6 +913,9 @@
522	913	shareGeometriesItem.addActionListener(this);
523	914	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
524	915	mergeGeometriesItem.addActionListener(this);
	916	+ menu.add("-");
	917	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	918	+ editLeafItem.addActionListener(this);
525	919	if (Globals.ADVANCED)
526	920	{
527	921	// Pretty much the same as duplicate and clone.
..	..	@@ -538,6 +932,75 @@
538	932	buildToolsMenu(menu);
539	933	}
540	934
	935	+ JTabbedPane resourcecontainer;
	936	+ cGridBag currenttab;
	937	+ //boolean added; // patch for jar
	938	+
	939	+ int tabcount = 0;
	940	+ int colcount = 0;
	941	+ int rowcount = 0;
	942	+ int texturecount = 0;
	943	+
	944	+ int columns = 5;
	945	+ int rows = 7;
	946	+
	947	+ public void ResourceCallBack(String[] path)
	948	+ {
	949	+// for (int i = 0; i < path.length; i++)
	950	+// System.out.print(path[i] + "/");
	951	+// System.out.println();
	952	+
	953	+ if (//rowcount == 0 \|\|
	954	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	955	+ {
	956	+ currenttab = new cGridBag();
	957	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	958	+ currenttab.setName(tabname);
	959	+ //added = false;
	960	+ resourcecontainer.add(currenttab);
	961	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	962	+ rowcount = 1;
	963	+ colcount = 0;
	964	+ texturecount = 0;
	965	+ }
	966	+
	967	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	968	+ {
	969	+ //if (!added)
	970	+ {
	971	+ //added = true;
	972	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	973	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	974	+ }
	975	+
	976	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	977	+
	978	+ if (++colcount >= columns)
	979	+ {
	980	+ colcount = 0;
	981	+ currenttab.Return();
	982	+
	983	+ if (rowcount++ >= rows)
	984	+ {
	985	+ rowcount = 0;
	986	+ }
	987	+ }
	988	+ }
	989	+ else
	990	+ {
	991	+// if (!path[path.length-1].equals("icons"))
	992	+// resourcecontainer.Return();
	993	+ }
	994	+ }
	995	+
	996	+ void CreateTexturePanel(cGridBag container)
	997	+ {
	998	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	999	+ container.add(resourcecontainer);
	1000	+
	1001	+ Grafreed.ParseResources("textures", this);
	1002	+ }
	1003	+
541	1004	void SetupUI2(ObjEditor oe)
542	1005	{
543	1006	// June 2019
..	..	@@ -555,11 +1018,6 @@
555	1018	//new Exception().printStackTrace();
556	1019
557	1020	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	1021	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
564	1022
565	1023	oe.buttonGroup = new ButtonGroup();
..	..	@@ -580,9 +1038,9 @@
580	1038	oe.radioPanel.add(dummyButton);
581	1039	oe.buttonGroup.add(dummyButton);
582	1040	*/
583		- cGridBag copyOptionsPanel = new cGridBag();
	1041	+ cGridBag versionManagerPanel = new cGridBag();
584	1042
585		- copyOptionsPanel.preferredHeight = 2;
	1043	+ versionManagerPanel.preferredHeight = 4;
586	1044
587	1045	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
588	1046
..	..	@@ -590,50 +1048,110 @@
590	1048	//minButton.setToolTipText("Minimize window");
591	1049	//minButton.addActionListener(this);
592	1050
593		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594		- maxButton.setToolTipText("Maximize window");
595		- maxButton.addActionListener(this);
	1051	+ if (Globals.ADVANCED)
	1052	+ {
	1053	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+// maxButton.setToolTipText("Maximize window");
	1055	+// maxButton.addActionListener(this);
	1056	+ }
596	1057
597		- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+ cButton gcButton;
	1059	+
	1060	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+// gcButton.setToolTipText("Garbage collect");
	1062	+// gcButton.addActionListener(new ActionListener()
	1063	+// {
	1064	+// public void actionPerformed(ActionEvent e)
	1065	+// {
	1066	+// System.gc();
	1067	+// }
	1068	+// });
	1069	+
	1070	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1071	+ collapseButton.setToolTipText("Collapse toolbar");
	1072	+ collapseButton.addActionListener(this);
	1073	+
	1074	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1075	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1076	+ maximize3DButton.addActionListener(this);
	1077	+
	1078	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1079	+ twoButton.setToolTipText("Show 3D view only");
	1080	+ twoButton.addActionListener(this);
	1081	+ this.fullscreenLayout = twoButton;
	1082	+
	1083	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ threeButton.setToolTipText("Show controls and 3D view");
	1085	+ threeButton.addActionListener(this);
	1086	+ if (Globals.ADVANCED)
	1087	+ {
	1088	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ sixButton.setToolTipText("Show 3D view and controls");
	1090	+ sixButton.addActionListener(this);
	1091	+ }
	1092	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+// sevenButton.setToolTipText("3-column layout");
	1094	+// sevenButton.addActionListener(this);
	1095	+ //
	1096	+
	1097	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
598	1098	fullButton.setToolTipText("Full-screen window");
599	1099	fullButton.addActionListener(this);
600	1100
601		- oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1101	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1102	+ screenfitButton.setToolTipText("Screen fit");
	1103	+ screenfitButton.addActionListener(this);
	1104	+
	1105	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
602	1106	restoreCameraButton.setToolTipText("Restore viewpoint");
603	1107	restoreCameraButton.addActionListener(this);
604	1108
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);
	1109	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1110	+ saveVersionButton.setToolTipText("Duplicate current version");
	1111	+ saveVersionButton.addActionListener(this);
	1112	+
	1113	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1114	+ deleteVersionButton.setToolTipText("Delete current version");
	1115	+ deleteVersionButton.addActionListener(this);
	1116	+ deleteVersionButton.setEnabled(false);
	1117	+
	1118	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1119	+ previousVersionButton.setToolTipText("Previous version");
	1120	+ previousVersionButton.addActionListener(this);
	1121	+ previousVersionButton.setEnabled(false);
609	1122
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);
	1123	+ cGridBag updown = new cGridBag().setVertical(true);
	1124	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1125	+ restoreButton.setToolTipText("Undo (restore current version)");
	1126	+ restoreButton.addActionListener(this);
	1127	+ restoreButton.setEnabled(false);
614	1128
615		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
616		- saveButton.setToolTipText("Save changes");
617		- saveButton.addActionListener(this);
	1129	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ replaceButton.setToolTipText("Save (replace current version)");
	1131	+ replaceButton.addActionListener(this);
	1132	+ replaceButton.setEnabled(false);
618	1133
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);
	1134	+ versionManagerPanel.add(updown);
	1135	+
	1136	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1137	+ nextVersionButton.setToolTipText("Next version");
	1138	+ nextVersionButton.addActionListener(this);
	1139	+ nextVersionButton.setEnabled(false);
	1140	+
	1141	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
624	1142	oneStepButton.setToolTipText("Animate one step forward");
625	1143	oneStepButton.addActionListener(this);
626	1144
627		- copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1145	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1146	+ liveCB.setToolTipText("Enable animation");
	1147	+ liveCB.addItemListener(this);
	1148	+
	1149	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
628	1150	fastCB.setToolTipText("Fast mode");
629	1151	fastCB.addItemListener(this);
630	1152
631	1153	//oe.toolboxPanel.Return();
632	1154
633		- copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- screenfitButton.setToolTipText("Screen fit");
635		- screenfitButton.addActionListener(this);
636		-
637	1155	// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
638	1156	// trackCB.setToolTipText("Enable tracking");
639	1157	// trackCB.addItemListener(this);
..	..	@@ -643,142 +1161,137 @@
643	1161
644	1162	if (Globals.ADVANCED)
645	1163	{
646		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1164	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
647	1165	snapobjectButton.addActionListener(this);
648	1166	snapobjectButton.setToolTipText("Snap Object");
	1167	+
	1168	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1169	+ fourButton.addActionListener(this);
	1170	+ fourButton.setToolTipText("Show control panel only");
649	1171	}
650	1172
651	1173	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
652	1174
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	1175
672		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
673		- rootButton.setToolTipText("Edit selection in new tab");
	1176	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1177	+ rootButton.setToolTipText("Open selection in new tab");
674	1178	rootButton.addActionListener(this);
675	1179
676		- oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
677	1181	closeButton.setToolTipText("Close tab");
678	1182	closeButton.addActionListener(this);
679	1183	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
680	1184	//clearButton.addActionListener(this);
681	1185
	1186	+ cGridBag row1 = new cGridBag();
	1187	+
682	1188	// INSERT
683		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
684		- gridButton.setToolTipText("Create grid");
	1189	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ gridButton.setToolTipText("Create ground");
685	1191	gridButton.addActionListener(this);
686	1192
687		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1193	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
688	1194	boxButton.setToolTipText("Create box");
689	1195	boxButton.addActionListener(this);
690	1196
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);
	1197	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
704	1198	superButton.setToolTipText("Create superellipsoid");
705	1199	superButton.addActionListener(this);
706	1200
	1201	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1202	+ sphereButton.setToolTipText("Create sphere");
	1203	+ sphereButton.addActionListener(this);
	1204	+
	1205	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1206	+ coneButton.setToolTipText("Create cone");
	1207	+ coneButton.addActionListener(this);
	1208	+
	1209	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ torusButton.setToolTipText("Create torus");
	1211	+ torusButton.addActionListener(this);
	1212	+
707	1213	if (Globals.ADVANCED)
708	1214	{
709		- oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1215	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
710	1216	kleinButton.setToolTipText("Create Klein bottle");
711	1217	kleinButton.addActionListener(this);
712	1218	}
713	1219
714		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
715	1221	particlesButton.setToolTipText("Create particle system");
716	1222	particlesButton.addActionListener(this);
717	1223
718		- oe.toolboxPanel.Return();
	1224	+ oe.toolboxPanel.add(row1);
719	1225
720		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1226	+ cGridBag row2 = new cGridBag();
	1227	+
	1228	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
721	1229	groupButton.setToolTipText("Create group");
722	1230	groupButton.addActionListener(this);
723	1231
724		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1232	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
725	1233	compositeButton.setToolTipText("Create composite");
726	1234	compositeButton.addActionListener(this);
727	1235
728		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
729		- switchButton.setToolTipText("Create switch");
	1236	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ switchButton.setToolTipText("Create item switcher");
730	1238	switchButton.addActionListener(this);
731	1239
732		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1240	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
733	1241	loopButton.setToolTipText("Create loop");
734	1242	loopButton.addActionListener(this);
735	1243
736		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1244	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
737	1245	textureButton.setToolTipText("Create texture");
738	1246	textureButton.addActionListener(this);
739	1247
740		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1248	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
741	1249	overlayButton.setToolTipText("Create overlay");
742	1250	overlayButton.addActionListener(this);
743	1251
744		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1252	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
745	1253	lightButton.setToolTipText("Create light");
746	1254	lightButton.addActionListener(this);
747	1255
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		- }
	1256	+ oe.toolboxPanel.add(row2);
	1257	+
	1258	+ cGridBag textures = new cGridBag();
	1259	+
	1260	+ CreateTexturePanel(textures);
	1261	+
	1262	+ int tabCount = resourcecontainer.getTabCount();
	1263	+
	1264	+ if (tabCount > 0)
	1265	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1266	+
	1267	+ oe.toolboxPanel.add(textures);
	1268	+
	1269	+ textures.preferredHeight = 100;
	1270	+
	1271	+ CreateSkyboxPanel(oe.skyboxPanel);
759	1272
760	1273	// EDIT panel
761		- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1274	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
762	1275	editButton.setToolTipText("Pin selection controls");
763	1276	editButton.addActionListener(this);
764	1277
765		- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
766		- uneditButton.setToolTipText("Remove selection controls");
	1278	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ uneditButton.setToolTipText("Unpin and remove selection controls");
767	1280	uneditButton.addActionListener(this);
768	1281
769	1282	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
770		- allParamsButton.setToolTipText("Show all controle");
	1283	+ allParamsButton.setToolTipText("Show all controls");
771	1284	allParamsButton.addActionListener(this);
772	1285
773		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
774		- clearPanelButton.setToolTipText("Clear edit panel");
	1286	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1287	+ clearPanelButton.setToolTipText("Clear all controls");
775	1288	clearPanelButton.addActionListener(this);
776	1289
777		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
778		- unselectButton.setToolTipText("Unselect");
779		- unselectButton.addActionListener(this);
	1290	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1291	+ //unselectButton.setToolTipText("Unselect");
	1292	+ //unselectButton.addActionListener(this);
780	1293
781		- editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1294	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
782	1295	flashSelectionButton.setToolTipText("Highlight selection");
783	1296	flashSelectionButton.addActionListener(this);
784	1297
..	..	@@ -801,6 +1314,8 @@
801	1314
802	1315	cGridBag jSPPanel = new cGridBag();
803	1316
	1317	+ jSPPanel.preferredHeight = 20;
	1318	+
804	1319	JScrollPane jSP;
805	1320	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
806	1321	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -809,11 +1324,14 @@
809	1324	oe.treePanel.add(jSPPanel);
810	1325	oe.treePanel.Return();
811	1326
812		- oe.treePanel.add(copyOptionsPanel);
	1327	+ oe.treePanel.add(versionManagerPanel);
813	1328	oe.treePanel.Return();
	1329	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1330	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1331	+ versionSliderPane.preferredHeight = 3;
814	1332
815		-// mainPanel.setDividerLocation(0.5); //1.0);
816		-// mainPanel.setResizeWeight(0.5);
	1333	+// mainPanel.setDividerLocation(0.1); //1.0);
	1334	+ mainPanel.setResizeWeight(0.4);
817	1335
818	1336	//jList.addListSelectionListener(this);
819	1337	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -821,7 +1339,7 @@
821	1339	//jTree.setEditable(true);
822	1340	oe.jTree.setDragEnabled(true);
823	1341	//jTree.setPreferredSize(new Dimension(10,10));
824		- jSP.setPreferredSize(new Dimension(100,200));
	1342	+ //jSP.setPreferredSize(new Dimension(100,200));
825	1343
826	1344	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
827	1345
..	..	@@ -833,7 +1351,7 @@
833	1351	dgr.addDragGestureListener(this);
834	1352	}catch(Exception e) {}
835	1353	*/
836		- radio.layout = sevenButton;
	1354	+ radio.layout = threeButton; // sixButton;
837	1355	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
838	1356	}
839	1357
..	..	@@ -863,9 +1381,13 @@
863	1381
864	1382	if (true) // Globals.ADVANCED)
865	1383	{
866		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
867		- supportCB.setToolTipText("Enable rigging");
868		- supportCB.addItemListener(this);
	1384	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1385	+// supportCB.setToolTipText("Enable rigging");
	1386	+// supportCB.addItemListener(this);
	1387	+
	1388	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1389	+ freezeCB.setToolTipText("Fast moving camera");
	1390	+ freezeCB.addItemListener(this);
869	1391
870	1392	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
871	1393	// localCB.addItemListener(this);
..	..	@@ -880,9 +1402,12 @@
880	1402	smoothCB.setToolTipText("Snapping delay");
881	1403	smoothCB.addItemListener(this);
882	1404
883		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
884		- slowCB.setToolTipText("Smooth interpolation");
885		- slowCB.addItemListener(this);
	1405	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1406	+// slowCB.setToolTipText("Smooth interpolation");
	1407	+// slowCB.addItemListener(this);
	1408	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1409	+ minshaderCB.setToolTipText("Minimal fast shader");
	1410	+ minshaderCB.addItemListener(this);
886	1411
887	1412	// constraints.gridy += 1;
888	1413	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -929,12 +1454,12 @@
929	1454	toggleTextureCB.addItemListener(this);
930	1455
931	1456	panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
932		- toggleSwitchCB.setToolTipText("Use switch");
	1457	+ toggleSwitchCB.setToolTipText("Choose a single item");
933	1458	toggleSwitchCB.addItemListener(this);
934	1459
935		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
936		- autosaveCB.setToolTipText("On structure change");
937		- autosaveCB.addItemListener(this);
	1460	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1461	+ autokeepCB.setToolTipText("On structure change");
	1462	+ autokeepCB.addItemListener(this);
938	1463
939	1464	panel.Return();
940	1465	if (Globals.ADVANCED)
..	..	@@ -961,9 +1486,17 @@
961	1486
962	1487	void EditObject(Object3D obj)
963	1488	{
	1489	+ assert(obj instanceof Composite);
	1490	+
	1491	+// if (obj.versionlist == null)
	1492	+// {
	1493	+// obj.versionlist = new Object3D[100];
	1494	+// obj.versionindex = -1;
	1495	+// }
	1496	+
964	1497	cRadio radioButton = new cRadio(obj.name);
965	1498
966		- // Patch to avoid bug with transparency.
	1499	+ // June 2019. Patch to avoid bug with transparency.
967	1500	radioButton.hadMaterial = obj.material != null;
968	1501	if (!radioButton.hadMaterial)
969	1502	{
..	..	@@ -971,7 +1504,7 @@
971	1504	}
972	1505
973	1506	radioButton.SetObject(obj);
974		- radioButton.layout = sevenButton;
	1507	+ radioButton.layout = threeButton; // sixButton;
975	1508	radioButton.SetCamera(cameraView.renderCamera, false);
976	1509	radioButton.addActionListener(this);
977	1510	radioPanel.add(radioButton);
..	..	@@ -985,6 +1518,7 @@
985	1518
986	1519	oe.SetupViews();
987	1520
	1521	+ if (Globals.DEBUG)
988	1522	System.out.println("SetupViews");
989	1523	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
990	1524	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -996,10 +1530,13 @@
996	1530	cCheckBox localCB;
997	1531	cCheckBox crowdCB;
998	1532	cCheckBox smoothCB;
	1533	+ cCheckBox minshaderCB;
	1534	+
999	1535	cToggleButton fastCB;
1000	1536	cCheckBox slowCB;
1001	1537	cCheckBox boxCB;
1002	1538	cCheckBox zoomBoxCB;
	1539	+ cCheckBox freezeCB;
1003	1540	//cToggleButton trackCB;
1004	1541	cCheckBox trackCB;
1005	1542	cCheckBox smoothfocusCB;
..	..	@@ -1010,7 +1547,7 @@
1010	1547
1011	1548	cCheckBox oeilCB;
1012	1549	cCheckBox shadowCB;
1013		- cCheckBox autosaveCB;
	1550	+ cCheckBox autokeepCB;
1014	1551	cCheckBox lookAtCB;
1015	1552
1016	1553	// static int COLOR = 1;
..	..	@@ -1066,6 +1603,12 @@
1066	1603	cameraView.ToggleInertia();
1067	1604	cameraView.repaint();
1068	1605	}
	1606	+ else if(e.getSource() == minshaderCB)
	1607	+ {
	1608	+ Globals.MINSHADER ^= true;
	1609	+ cameraView.programInitialized = false;
	1610	+ cameraView.repaint();
	1611	+ }
1069	1612	else if(e.getSource() == localCB)
1070	1613	{
1071	1614	cameraView.ToggleLocal();
..	..	@@ -1118,9 +1661,13 @@
1118	1661	{
1119	1662	Globals.COMPUTESHADOWWHENLIVE ^= true;
1120	1663	}
1121		- else if(e.getSource() == autosaveCB)
	1664	+ else if(e.getSource() == freezeCB)
1122	1665	{
1123		- Globals.SAVEONMAKE ^= true;
	1666	+ Globals.FREEZEONMOVE ^= true;
	1667	+ }
	1668	+ else if(e.getSource() == autokeepCB)
	1669	+ {
	1670	+ Globals.REPLACEONMAKE ^= true;
1124	1671	}
1125	1672	else if(e.getSource() == lookAtCB)
1126	1673	{
..	..	@@ -1202,8 +1749,6 @@
1202	1749	}
1203	1750	}
1204	1751
1205		- String string = (String) object;
1206		-
1207	1752	System.out.println("Transfer = " + object + "; drop : " + target);
1208	1753	// if( object instanceof java.io.File[])
1209	1754	// {
..	..	@@ -1211,6 +1756,8 @@
1211	1756	// objEditor.DropFile((java.io.File[]) object, true);
1212	1757	// return;
1213	1758	// }
	1759	+
	1760	+ String string = object.toString();
1214	1761
1215	1762	// File path for Mac and Windows
1216	1763	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1338,7 +1885,12 @@
1338	1885	TreePath path;
1339	1886
1340	1887	public TransferableTreePath(TreePath tp) {
1341		- path = tp;
	1888	+ Object[] objs = new Object[tp.getPathCount()];
	1889	+ for (int i=0; i<objs.length; i++)
	1890	+ {
	1891	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1892	+ }
	1893	+ path = new TreePath(objs);
1342	1894	}
1343	1895
1344	1896	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1460,6 +2012,9 @@
1460	2012	animationItem.addItemListener(this);
1461	2013	animationItem.setState(Globals.ANIMATION);
1462	2014
	2015	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2016	+ archiveItem.addActionListener(this);
	2017	+
1463	2018	menu.add("-");
1464	2019	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1465	2020	parseverticesItem.addActionListener(this);
..	..	@@ -1472,6 +2027,8 @@
1472	2027	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1473	2028	reduce34MorphItem.addActionListener(this);
1474	2029	menu.add("-");
	2030	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2031	+ memoryItem.addActionListener(this);
1475	2032	menu.add(computeAOItem = new MenuItem("Compute AO"));
1476	2033	computeAOItem.addActionListener(this);
1477	2034
..	..	@@ -1480,8 +2037,6 @@
1480	2037	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1481	2038	mirrorItem.addActionListener(this);
1482	2039	menu.add("-");
1483		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1484		- memoryItem.addActionListener(this);
1485	2040	menu.add(analyzeItem = new MenuItem("Analyze"));
1486	2041	analyzeItem.addActionListener(this);
1487	2042	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1625,7 +2180,11 @@
1625	2180	shadow.material = new cMaterial(obj.material);
1626	2181	shadow.material.diffuse = 0.0001f;
1627	2182	shadow.material.specular = 0.0001f;
1628		- //shadow.projectedVertices[1].x = 300;
	2183	+ shadow.material.opacity = 0.75f;
	2184	+
	2185	+ AllocProjectedVertices(shadow);
	2186	+
	2187	+ shadow.projectedVertices[1].x = 300;
1629	2188
1630	2189	makeSomething(shadow);
1631	2190	}
..	..	@@ -1642,6 +2201,16 @@
1642	2201	listUI.remove(i);
1643	2202	}
1644	2203	}
	2204	+ }
	2205	+
	2206	+ private void EditElement(Object3D elem, boolean newWindow)
	2207	+ {
	2208	+ // if (!(elem instanceof Composite))
	2209	+ // newWindow = false;
	2210	+ listUI.add(elem);
	2211	+ elem.openEditWindow(this, newWindow); //, false);
	2212	+ System.out.println("edit : " + elem);
	2213	+ elem.editWindow.refreshContents(true); // ? new
1645	2214	}
1646	2215
1647	2216	/**
..	..	@@ -2071,6 +2640,23 @@
2071	2640	{
2072	2641	makeSomething(new Light());
2073	2642	} else
	2643	+// if (source == skybox1Button \|\|
	2644	+// source == skybox2Button \|\|
	2645	+// source == skybox3Button \|\|
	2646	+// source == skybox4Button \|\|
	2647	+// source == skybox5Button \|\|
	2648	+// source == skybox6Button \|\|
	2649	+// source == skybox7Button \|\|
	2650	+// source == skybox11Button \|\|
	2651	+// source == skybox12Button \|\|
	2652	+// source == skybox13Button \|\|
	2653	+// source == skybox14Button \|\|
	2654	+// source == skybox15Button \|\|
	2655	+// source == skybox16Button \|\|
	2656	+// source == skybox17Button)
	2657	+// {
	2658	+// ChangeSkybox(source);
	2659	+// } else
2074	2660	if (source == csgItem)
2075	2661	{
2076	2662	group(new CSG());
..	..	@@ -2119,28 +2705,36 @@
2119	2705	} else
2120	2706	if (source == loopItem \|\| source == loopButton)
2121	2707	{
	2708	+ if (!group.selection.isEmpty())
	2709	+ {
2122	2710	Composite csg = new GroupLeaf();
2123	2711	csg.count = 5;
2124		- group(csg);
2125		- Composite child = new cGroup();
	2712	+ Composite child = new cGroup("Branch");
2126	2713	csg.addChild(child);
2127	2714	child.addChild(csg);
	2715	+ group(csg);
	2716	+ }
2128	2717	} else
2129	2718	if (source == doubleItem)
2130	2719	{
2131		- Composite csg = new GroupLeaf();
	2720	+ if (!group.selection.isEmpty())
	2721	+ {
	2722	+ Composite csg = new GroupLeaf("Fork");
2132	2723	csg.count = 5;
	2724	+ Composite child = new cGroup("Branch A");
	2725	+ csg.addChild(child);
	2726	+ child.addChild(csg);
	2727	+ child = new cGroup("Branch B");
	2728	+ csg.addChild(child);
	2729	+ child.addChild(csg);
2133	2730	group(csg);
2134		- Composite child = new cGroup();
2135		- csg.addChild(child);
2136		- child.addChild(csg);
2137		- child = new cGroup();
2138		- csg.addChild(child);
2139		- child.addChild(csg);
	2731	+ }
2140	2732	} else
2141	2733	if (source == tripleItem)
2142	2734	{
2143		- Composite csg = new GroupLeaf();
	2735	+ if (!group.selection.isEmpty())
	2736	+ {
	2737	+ Composite csg = new GroupLeaf("Trident");
2144	2738	csg.count = 4;
2145	2739	group(csg);
2146	2740	Composite child = new cGroup();
..	..	@@ -2152,11 +2746,12 @@
2152	2746	child = new cGroup();
2153	2747	csg.addChild(child);
2154	2748	child.addChild(csg);
	2749	+ }
2155	2750	} else
2156	2751	if (source == computeAOItem)
2157	2752	{
2158	2753	Globals.drawMode = CameraPane.OCCLUSION;
2159		- Globals.theRenderer.repaint();
	2754	+ cameraView.repaint();
2160	2755	} else
2161	2756	if (source == recompileItem)
2162	2757	{
..	..	@@ -2171,7 +2766,7 @@
2171	2766	if (source == invariantsItem)
2172	2767	{
2173	2768	System.out.println("Invariants:");
2174		- Grafreed.grafreeD.universe.invariants();
	2769	+ Grafreed.grafreed.universe.invariants();
2175	2770	} else
2176	2771	if (source == memoryItem)
2177	2772	{
..	..	@@ -2202,17 +2797,52 @@
2202	2797	{
2203	2798	ToggleFullScreen();
2204	2799	} else
2205		- if (source == undoButton)
	2800	+ if (source == collapseButton)
2206	2801	{
2207		- Undo();
	2802	+ this.expandedLayout = radio.layout;
	2803	+ CollapseToolbar();
2208	2804	} else
2209		- if (source == redoButton)
	2805	+ if (source == maximize3DButton)
2210	2806	{
2211		- Redo();
	2807	+ this.expandedLayout = radio.layout;
	2808	+ radio.layout = twoButton;
	2809	+ Show3DView();
	2810	+ CollapseToolbar();
2212	2811	} else
2213		- if (source == saveButton)
	2812	+ if (source == previousVersionButton)
2214	2813	{
2215		- Save();
	2814	+ // Go to previous version
	2815	+ //if (!Undo())
	2816	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2817	+ PreviousVersion();
	2818	+ } else
	2819	+ if (source == restoreButton)
	2820	+ {
	2821	+ // Restore current version
	2822	+ Restore();
	2823	+ //restoreButton.setEnabled(false);
	2824	+ } else
	2825	+ if (source == replaceButton)
	2826	+ {
	2827	+ // Overwrite current version
	2828	+ Replace();
	2829	+ //replaceButton.setEnabled(false);
	2830	+ } else
	2831	+ if (source == nextVersionButton)
	2832	+ {
	2833	+ // Go to next version
	2834	+ NextVersion();
	2835	+ } else
	2836	+ if (source == saveVersionButton)
	2837	+ {
	2838	+ // Save a new version
	2839	+ if (!Save(true))
	2840	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2841	+ } else
	2842	+ if (source == deleteVersionButton)
	2843	+ {
	2844	+ // Delete a new version
	2845	+ DeleteVersion();
2216	2846	} else
2217	2847	if (source == oneStepButton)
2218	2848	{
..	..	@@ -2221,17 +2851,14 @@
2221	2851	} else
2222	2852	if (source == screenfitButton)
2223	2853	{
2224		- //Reload(lastConverter, lastFilename, true);
2225	2854	ScreenFit();
2226	2855	} else
2227	2856	if (source == screenfitpointButton)
2228	2857	{
2229		- //Reload(lastConverter, lastFilename, true);
2230	2858	ScreenFitPoint();
2231	2859	} else
2232	2860	if (source == snapobjectButton)
2233	2861	{
2234		- //Reload(lastConverter, lastFilename, true);
2235	2862	SnapObject();
2236	2863	} else
2237	2864	// if (event.getSource() == recompileButton)
..	..	@@ -2270,11 +2897,11 @@
2270	2897	} else
2271	2898	if (source == undoItem)
2272	2899	{
2273		- Undo();
	2900	+ PreviousVersion();
2274	2901	} else
2275	2902	if (source == redoItem)
2276	2903	{
2277		- Redo();
	2904	+ NextVersion();
2278	2905	} else
2279	2906	if (source == duplicateItem)
2280	2907	{
..	..	@@ -2595,7 +3222,7 @@
2595	3222	{
2596	3223	StepAll();
2597	3224	} else
2598		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3225	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2599	3226	{
2600	3227	//int indices[] = jList.getSelectedIndices();
2601	3228	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2755,15 +3382,40 @@
2755	3382	} else
2756	3383	if (source == ungroupItem \|\| source == ungroupButton)
2757	3384	{
2758		- //ungroup();
	3385	+ boolean canUngroup = true;
	3386	+
2759	3387	for (int i=0; i<group.selection.size(); i++)
2760	3388	{
2761		- Ungroup(group.selection.get(i));
	3389	+ Object3D selectedItem = group.selection.get(i);
	3390	+
	3391	+ if (selectedItem.Size() == 0)
	3392	+ {
	3393	+ // Cannot ungroup leaves
	3394	+ canUngroup = false;
	3395	+ break;
	3396	+ }
	3397	+
	3398	+ if (selectedItem == group)
	3399	+ {
	3400	+ // Cannot ungroup root
	3401	+ canUngroup = false;
	3402	+ break;
	3403	+ }
2762	3404	}
2763	3405
2764		- ClearSelection(false);
2765		-
2766		- refreshContents();
	3406	+ if (canUngroup)
	3407	+ {
	3408	+ for (int i=0; i<group.selection.size(); i++)
	3409	+ {
	3410	+ Object3D selectedItem = group.selection.get(i);
	3411	+
	3412	+ Ungroup(selectedItem);
	3413	+ }
	3414	+
	3415	+ ClearSelection(false);
	3416	+
	3417	+ refreshContents();
	3418	+ }
2767	3419	} else
2768	3420	if (source == genUVItem)
2769	3421	{
..	..	@@ -3064,7 +3716,7 @@
3064	3716	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3065	3717	{
3066	3718	obj = (Object3D)e.nextElement();
3067		- obj.SetBumpTexture(null);
	3719	+ obj.ResetBumpTexture();
3068	3720	}
3069	3721
3070	3722	refreshContents();
..	..	@@ -3078,6 +3730,31 @@
3078	3730	obj.SetBumpTexture(obj.GetPigmentTexture());
3079	3731	}
3080	3732
	3733	+ refreshContents();
	3734	+ } else
	3735	+ if (source == embedTexturesItem)
	3736	+ {
	3737	+ Object3D obj;
	3738	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3739	+ {
	3740	+ obj = (Object3D)e.nextElement();
	3741	+ obj.EmbedTextures(true);
	3742	+ }
	3743	+
	3744	+ refreshContents();
	3745	+ } else
	3746	+ if (source == deEmbedTexturesItem)
	3747	+ {
	3748	+ Object3D obj;
	3749	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3750	+ {
	3751	+ obj = (Object3D)e.nextElement();
	3752	+ obj.EmbedTextures(false);
	3753	+ }
	3754	+
	3755	+ CameraPane.texturepigment.clear();
	3756	+ CameraPane.texturebump.clear();
	3757	+
3081	3758	refreshContents();
3082	3759	} else
3083	3760	if (source == flashSelectionButton)
..	..	@@ -3095,38 +3772,7 @@
3095	3772	if (CameraPane.FULLSCREEN)
3096	3773	fullscreenLayout = radio.layout;
3097	3774
3098		- // bug
3099		- //gridPanel.setDividerLocation(1.0);
3100		- //bigPanel.setDividerLocation(0.0);
3101		-// bigThree.remove(scenePanel);
3102		-// bigThree.remove(centralPanel);
3103		-// bigThree.remove(XYZPanel);
3104		-// aWindowConstraints.gridx = 0;
3105		-// aWindowConstraints.gridy = 0;
3106		-// aWindowConstraints.gridwidth = 1;
3107		-// // aConstraints.gridheight = 3;
3108		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3109		-// aWindowConstraints.weightx = 0;
3110		-// aWindowConstraints.weighty = 1;
3111		-// //bigThree.add(jtp, aWindowConstraints);
3112		-// aWindowConstraints.weightx = 1;
3113		-// aWindowConstraints.gridwidth = 3;
3114		-// // aConstraints.gridheight = 3;
3115		-// aWindowConstraints.gridx = 1;
3116		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3117		-// bigThree.add(centralPanel, aWindowConstraints);
3118		-// aWindowConstraints.weightx = 0;
3119		-// aWindowConstraints.gridx = 4;
3120		-// aWindowConstraints.gridwidth = 1;
3121		-// // aConstraints.gridheight = 3;
3122		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3123		-// //bigThree.add(XYZPanel, aWindowConstraints);
3124		-// scenePanel.setVisible(false);
3125		-// centralPanel.setVisible(true);
3126		-// XYZPanel.setVisible(false);
3127		- bigThree.ClearUI();
3128		- bigThree.add(centralPanel);
3129		- bigThree.FlushUI();
	3775	+ Show3DView();
3130	3776
3131	3777	cameraView.requestFocusInWindow();
3132	3778
..	..	@@ -3181,8 +3827,8 @@
3181	3827	// centralPanel.setVisible(true);
3182	3828	// XYZPanel.setVisible(true);
3183	3829	bigThree.ClearUI();
	3830	+ bigThree.add(scenePanel);
3184	3831	bigThree.add(centralPanel);
3185		- bigThree.add(XYZPanel);
3186	3832	bigThree.FlushUI();
3187	3833
3188	3834	cameraView.requestFocusInWindow();
..	..	@@ -3262,8 +3908,8 @@
3262	3908	// centralPanel.setVisible(true);
3263	3909	// XYZPanel.setVisible(false);
3264	3910	bigThree.ClearUI();
3265		- bigThree.add(scenePanel);
3266	3911	bigThree.add(centralPanel);
	3912	+ bigThree.add(scenePanel);
3267	3913	bigThree.FlushUI();
3268	3914
3269	3915	cameraView.requestFocusInWindow();
..	..	@@ -3312,6 +3958,7 @@
3312	3958	} else
3313	3959	if (source == rootButton)
3314	3960	{
	3961	+ Replace();
3315	3962	Object3D obj;
3316	3963	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3317	3964	{
..	..	@@ -3326,6 +3973,8 @@
3326	3973	if (source == closeButton)
3327	3974	{
3328	3975	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3976	+ Replace();
	3977	+
3329	3978	cRadio ab;
3330	3979	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3331	3980	{
..	..	@@ -3369,10 +4018,10 @@
3369	4018	{
3370	4019	Object3D child = (Object3D)e.nextElement();
3371	4020	if(child.editWindow != null)
3372		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3373	4021	child.pinned = false;
3374	4022	child.CloseUI();
3375	4023	listUI.remove(child);
	4024	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3376	4025
3377	4026	//child.editWindow = null; // ???????????
3378	4027	}
..	..	@@ -3391,6 +4040,7 @@
3391	4040	obj.CloseUI();
3392	4041	}
3393	4042	listUI.clear();
	4043	+ SetPinStates(group.selection.size() > 0);
3394	4044	refreshContents(true);
3395	4045	} else
3396	4046	if (source == allParamsButton)
..	..	@@ -3423,6 +4073,8 @@
3423	4073	} else
3424	4074	if(source instanceof cRadio)
3425	4075	{
	4076	+ Replace();
	4077	+
3426	4078	group.parent = keepparent;
3427	4079	group.attributes = 0;
3428	4080	//group.editWindow = null;
..	..	@@ -3446,6 +4098,7 @@
3446	4098	}
3447	4099
3448	4100	copy = group;
	4101	+
3449	4102	//Globals.theRenderer.object = group;
3450	4103	if(!useclient)
3451	4104	{
..	..	@@ -3473,9 +4126,35 @@
3473	4126	*/
3474	4127	radio.layout.doClick();
3475	4128
	4129	+ assert(copy instanceof Composite);
	4130	+
	4131	+ if (copy.versionlist == null)
	4132	+ {
	4133	+ copy.versionindex = -1;
	4134	+
	4135	+ // Cannot work with loops
	4136	+ // To fix this issue, we first mark all nodes above the root,
	4137	+ // and check if any of these nodes are reachable below the root.
	4138	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4139	+
	4140	+ if (!copy.HasTags())
	4141	+ {
	4142	+ copy.versionlist = new Object3D[100];
	4143	+
	4144	+ Save(true);
	4145	+ }
	4146	+
	4147	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4148	+ }
	4149	+
	4150	+ SetVersionStates();
	4151	+
3476	4152	ClearUnpinned();
3477		- SetPinStates(group.selection.size() > 0);
3478		- if (group.selection.size() == 1)
	4153	+
	4154	+ //Grafreed.Assert(group != null);
	4155	+ //Grafreed.Assert(group.selection != null);
	4156	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4157	+ if (group.selection == null \|\| group.selection.size() == 1)
3479	4158	EditSelection(false);
3480	4159	keepparent = group.parent;
3481	4160	// PARENT = NULL or not???
..	..	@@ -3488,11 +4167,13 @@
3488	4167	} else if (event.getSource() == editCameraItem)
3489	4168	{
3490	4169	cameraView.ProtectCamera();
	4170	+ cameraView.requestFocusInWindow();
3491	4171	cameraView.repaint();
3492	4172	return;
3493	4173	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3494	4174	{
3495	4175	cameraView.RevertCamera();
	4176	+ cameraView.requestFocusInWindow();
3496	4177	cameraView.repaint();
3497	4178	return;
3498	4179	// } else if (event.getSource() == textureButton)
..	..	@@ -3611,7 +4292,7 @@
3611	4292	TouchTransform(obj);
3612	4293	continue;
3613	4294	}
3614		- if ((mask&2) != 0) // Scale
	4295	+ if ((mask&2) != 0) // Scale/rotation
3615	4296	{
3616	4297	obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3617	4298	obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..	..	@@ -3619,10 +4300,6 @@
3619	4300	obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3620	4301	obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3621	4302	obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3622		- }
3623		- if ((mask&4) != 0) // Rotation
3624		- {
3625		- // ?
3626	4303	}
3627	4304	if ((mask&1) != 0) // Translation
3628	4305	{
..	..	@@ -4069,7 +4746,7 @@
4069	4746
4070	4747	try
4071	4748	{
4072		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4749	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4073	4750	}
4074	4751	catch (Exception e)
4075	4752	{
..	..	@@ -4546,6 +5223,12 @@
4546	5223
4547	5224	void EditSelection(boolean newWindow)
4548	5225	{
	5226	+ if (group.selection == null)
	5227	+ {
	5228	+ EditElement(group, newWindow); // ? new
	5229	+ return;
	5230	+ }
	5231	+
4549	5232	// aConstraints.gridy = 0;
4550	5233	for (int i=0; i<group.selection.size(); i++)
4551	5234	{
..	..	@@ -4556,12 +5239,7 @@
4556	5239	Object3D elem = (Object3D)group.selection.elementAt(i);
4557	5240	if(elem != group \|\| !newWindow)
4558	5241	{
4559		- // if (!(elem instanceof Composite))
4560		- // newWindow = false;
4561		- listUI.add(elem);
4562		- elem.openEditWindow(this, newWindow); //, false);
4563		- System.out.println("edit : " + elem);
4564		- elem.editWindow.refreshContents(true); // ? new
	5242	+ EditElement(elem, newWindow); // ? new
4565	5243	}
4566	5244	}
4567	5245	}
..	..	@@ -4624,9 +5302,7 @@
4624	5302
4625	5303	freezemodel = false;
4626	5304	}
4627		-
4628		- boolean flashIt = true;
4629		-
	5305	+
4630	5306	public void valueChanged(TreeSelectionEvent e)
4631	5307	//public boolean handleEvent(Event event)
4632	5308	{
..	..	@@ -4699,14 +5375,32 @@
4699	5375	{
4700	5376	editButton.setEnabled(enabled);
4701	5377	uneditButton.setEnabled(enabled);
4702		- unselectButton.setEnabled(enabled);
	5378	+ //unselectButton.setEnabled(enabled);
4703	5379	flashSelectionButton.setEnabled(enabled);
	5380	+
	5381	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5382	+
	5383	+ boolean allComposites = true;
	5384	+
	5385	+ if (group.selection != null)
	5386	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5387	+ {
	5388	+ Object next = e.nextElement();
	5389	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5390	+ {
	5391	+ allComposites = false;
	5392	+ break;
	5393	+ }
	5394	+ }
	5395	+
	5396	+ rootButton.setEnabled(allComposites);
4704	5397	}
4705	5398
4706	5399	void refreshContents(boolean cp)
4707	5400	{
4708		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4709		- if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	5401	+ if (Globals.ADVANCED)
	5402	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5403	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4710	5404	{
4711	5405	objEditor.ClearInfo(); // .GetMaterial());
4712	5406
..	..	@@ -4715,7 +5409,7 @@
4715	5409	Object3D child = (Object3D) group.selection.get(i);
4716	5410
4717	5411	objEditor.AddInfo(child, this, true);
4718		- System.err.println("info : " + child.GetPath());
	5412	+// System.err.println("info : " + child.GetPath());
4719	5413	}
4720	5414
4721	5415	objEditor.SetText(); // jan 2014
..	..	@@ -4805,8 +5499,8 @@
4805	5499
4806	5500	if (cut)
4807	5501	{
4808		- if (Globals.SAVEONMAKE)
4809		- Save();
	5502	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5503	+// Save();
4810	5504	//int indices[] = jList.getSelectedIndices();
4811	5505	//for (int i = indices.length - 1; i >= 0; i--)
4812	5506	//jList.remove(indices[i]);
..	..	@@ -4909,6 +5603,10 @@
4909	5603
4910	5604	void paste(boolean expand)
4911	5605	{
	5606	+ if (Globals.REPLACEONMAKE)
	5607	+ Save();
	5608	+ boolean keep = Globals.REPLACEONMAKE;
	5609	+ Globals.REPLACEONMAKE = false;
4912	5610	// if (GrafreeD.clipboard == null)
4913	5611	// return;
4914	5612	boolean first = true;
..	..	@@ -4968,6 +5666,7 @@
4968	5666	Grafreed.clipboard.get(0).parent = keepparent;
4969	5667	}
4970	5668
	5669	+ Globals.REPLACEONMAKE = keep;
4971	5670	ResetModel();
4972	5671	refreshContents();
4973	5672	}
..	..	@@ -5103,6 +5802,10 @@
5103	5802
5104	5803	void group(Object3D csg, boolean grab)
5105	5804	{
	5805	+ if (Globals.REPLACEONMAKE)
	5806	+ Save();
	5807	+ boolean keep = Globals.REPLACEONMAKE;
	5808	+ Globals.REPLACEONMAKE = false;
5106	5809	if (//false) // why??
5107	5810	!group.selection.isEmpty())
5108	5811	{
..	..	@@ -5216,10 +5919,15 @@
5216	5919	//node.add(csg);
5217	5920	//makeSomething(node);
5218	5921	makeSomething(csg);
	5922	+ Globals.REPLACEONMAKE = keep;
5219	5923	}
5220	5924
5221	5925	void Ungroup(Object3D g)
5222	5926	{
	5927	+ if (Globals.REPLACEONMAKE)
	5928	+ Save();
	5929	+ boolean keep = Globals.REPLACEONMAKE;
	5930	+ Globals.REPLACEONMAKE = false;
5223	5931	if (g instanceof HiddenObject)
5224	5932	{
5225	5933	HiddenObject h = (HiddenObject) g;
..	..	@@ -5236,6 +5944,7 @@
5236	5944	objEditor.makeSomething(g.get(i), false);
5237	5945	}
5238	5946	}
	5947	+ Globals.REPLACEONMAKE = keep;
5239	5948	}
5240	5949
5241	5950	void ungroup()
..	..	@@ -5526,10 +6235,6 @@
5526	6235
5527	6236	cButton restoreCameraButton;
5528	6237
5529		- cButton minButton;
5530		- cButton maxButton;
5531		- cButton fullButton;
5532		- cButton saveButton;
5533	6238	cButton oneStepButton;
5534	6239
5535	6240	cButton groupButton;
..	..	@@ -5538,6 +6243,22 @@
5538	6243	cButton switchButton;
5539	6244	cButton loopButton;
5540	6245	cButton textureButton;
	6246	+
	6247	+ cButton skybox1Button;
	6248	+ cButton skybox2Button;
	6249	+ cButton skybox3Button;
	6250	+ cButton skybox4Button;
	6251	+ cButton skybox5Button;
	6252	+ cButton skybox6Button;
	6253	+ cButton skybox7Button;
	6254	+
	6255	+ cButton skybox11Button;
	6256	+ cButton skybox12Button;
	6257	+ cButton skybox13Button;
	6258	+ cButton skybox14Button;
	6259	+ cButton skybox15Button;
	6260	+ cButton skybox16Button;
	6261	+ cButton skybox17Button;
5541	6262
5542	6263	cButton gridButton;
5543	6264	cButton boxButton;
..	..	@@ -5571,11 +6292,11 @@
5571	6292	private MenuItem lookAtItem;
5572	6293	private MenuItem lookFromItem;
5573	6294	private MenuItem switchViewItem;
5574		- private MenuItem cutItem;
	6295	+ private JMenuItem cutItem;
5575	6296	private MenuItem undoItem;
5576	6297	private MenuItem redoItem;
5577	6298	private JMenuItem duplicateItem;
5578		- private MenuItem cloneItem;
	6299	+ private JMenuItem cloneItem;
5579	6300	private MenuItem cloneSupportItem;
5580	6301	private MenuItem overwriteGeoItem;
5581	6302	private MenuItem overwriteMatItem;
..	..	@@ -5596,13 +6317,13 @@
5596	6317	private MenuItem cloneGeometriesItem;
5597	6318	private MenuItem shareGeometriesItem;
5598	6319	private MenuItem mergeGeometriesItem;
5599		- private MenuItem copyItem;
	6320	+ private JMenuItem copyItem;
5600	6321	private MenuItem pasteItem;
5601		- private MenuItem pasteIntoItem;
5602		- private MenuItem pasteLinkItem;
5603		- private MenuItem pasteCloneItem;
5604		- private MenuItem pasteExpandItem;
5605		- private MenuItem clearItem;
	6322	+ private JMenuItem pasteIntoItem;
	6323	+ private JMenuItem pasteLinkItem;
	6324	+ private JMenuItem pasteCloneItem;
	6325	+ private JMenuItem pasteExpandItem;
	6326	+ private JMenuItem deleteItem;
5606	6327	private MenuItem clearAllItem;
5607	6328	private MenuItem genUVItem;
5608	6329	private MenuItem genNormalsMESHItem;
..	..	@@ -5657,7 +6378,7 @@
5657	6378	private MenuItem transformGeometryItem;
5658	6379	private MenuItem transformChildrenItem;
5659	6380	private MenuItem hideItem;
5660		- private MenuItem grabItem;
	6381	+ private JMenuItem grabItem;
5661	6382	private MenuItem backItem;
5662	6383	private MenuItem frontItem;
5663	6384	private MenuItem cameraItem;
..	..	@@ -5670,7 +6391,7 @@
5670	6391	private MenuItem switchTransfoItem;
5671	6392	private MenuItem morphItem;
5672	6393	private MenuItem linkerItem;
5673		- private MenuItem ungroupItem;
	6394	+ private JMenuItem ungroupItem;
5674	6395	private MenuItem editItem;
5675	6396	private MenuItem openWindowItem;
5676	6397	private MenuItem editLeafItem;
..	..	@@ -5686,6 +6407,8 @@
5686	6407	private MenuItem attachBumpItem;
5687	6408	private MenuItem detachBumpItem;
5688	6409	private MenuItem pigmentBumpItem;
	6410	+ private MenuItem embedTexturesItem;
	6411	+ private MenuItem deEmbedTexturesItem;
5689	6412
5690	6413	private MenuItem particleItem;
5691	6414	private MenuItem ragdollItem;