~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,351 @@
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", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(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, !Grafreed.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", "rgb", 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	+ //cameraView.envyoff = false;
	334	+ group.skyboxname = skybox;
	335	+ group.skyboxext = "jpg";
	336	+ cameraView.repaint();
	337	+ }
	338	+
	339	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	340	+ {
	341	+ JTabbedPane skyboxpane = new JTabbedPane();
	342	+
	343	+ AddSkyboxTab0(skyboxpane);
	344	+ AddSkyboxTab1(skyboxpane);
	345	+ AddSkyboxTab2(skyboxpane);
	346	+ AddSkyboxTab3(skyboxpane);
	347	+
	348	+ skyboxPanel.add(skyboxpane);
	349	+ }
	350	+
	351	+ public void ChangeTexture(String texture)
	352	+ {
	353	+ for (int i=0; i<group.selection.size(); i++)
	354	+ {
	355	+ Object3D obj = group.selection.get(i);
	356	+ obj.SetPigmentTexture("@" + texture);
	357	+ }
	358	+
	359	+ refreshContents();
	360	+ }
	361	+
	362	+ public void Show3DView()
	363	+ {
	364	+ // bug
	365	+ //gridPanel.setDividerLocation(1.0);
	366	+ //bigPanel.setDividerLocation(0.0);
	367	+ bigThree.ClearUI();
	368	+ bigThree.add(centralPanel);
	369	+ bigThree.FlushUI();
	370	+ }
	371	+
26	372	//ObjEditor objEditor;
27	373	public void closeUI2()
28	374	{
..	..	@@ -60,6 +406,12 @@
60	406	this.copy = this.group = group;
61	407	//selectees = this.group.selectees;
62	408
	409	+ if (copy.versionlist == null)
	410	+ {
	411	+ copy.versionlist = new Object3D[100];
	412	+ copy.versionindex = -1;
	413	+ }
	414	+
63	415	if(ui)
64	416	SetupUI(objEditor);
65	417	}
..	..	@@ -80,10 +432,22 @@
80	432	SetupViews(objEditor);
81	433
82	434	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	435	+
	436	+ if (copy.versionlist == null)
	437	+ {
	438	+ copy.versionlist = new Object3D[100];
	439	+ copy.versionindex = -1;
	440	+
	441	+ Save(true);
	442	+ }
83	443	}
84	444
85	445	void CloneSelection(boolean supports)
86	446	{
	447	+ if (Globals.REPLACEONMAKE)
	448	+ Save();
	449	+ boolean keep = Globals.REPLACEONMAKE;
	450	+ Globals.REPLACEONMAKE = false;
87	451	// Object3D keep = GrafreeD.clipboard;
88	452	//Object3D obj;
89	453	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +458,7 @@
94	458
95	459	makeSomething(clone, i==group.selection.size()-1);
96	460	}
	461	+ Globals.REPLACEONMAKE = keep;
97	462	}
98	463
99	464	void CloneClipboard(boolean supports)
..	..	@@ -189,8 +554,8 @@
189	554	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
190	555	// pasteExpandItem.addActionListener(this);
191	556	menu.add("-");
192		- clearItem = menu.add(new MenuItem("Clear"));
193		- clearItem.addActionListener(this);
	557	+ deleteItem = menu.add(new MenuItem("Delete"));
	558	+ deleteItem.addActionListener(this);
194	559
195	560	if (Globals.ADVANCED)
196	561	{
..	..	@@ -380,14 +745,14 @@
380	745	shadowYItem.addActionListener(this);
381	746	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
382	747	shadowZItem.addActionListener(this);
	748	+ attributeItem = menu.add(new MenuItem("Attribute"));
	749	+ attributeItem.addActionListener(this);
383	750
384	751	if (Globals.ADVANCED)
385	752	{
386	753	menu.add("-");
387	754	linkerItem = menu.add(new MenuItem("Linker"));
388	755	linkerItem.addActionListener(this);
389		- attributeItem = menu.add(new MenuItem("Attribute"));
390		- attributeItem.addActionListener(this);
391	756	templateItem = menu.add(new MenuItem("Template"));
392	757	templateItem.addActionListener(this);
393	758	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -416,7 +781,7 @@
416	781	genNormalsMESHItem.addActionListener(this);
417	782	if (Globals.ADVANCED)
418	783	{
419		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	784	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
420	785	genNormalsMINEItem.addActionListener(this);
421	786	}
422	787	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -509,10 +874,15 @@
509	874	attachBumpItem.addActionListener(this);
510	875	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
511	876	pigmentBumpItem.addActionListener(this);
	877	+ //embedTexturesItem
512	878	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
513	879	detachPigmentItem.addActionListener(this);
514	880	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
515	881	detachBumpItem.addActionListener(this);
	882	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	883	+ embedTexturesItem.addActionListener(this);
	884	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	885	+ deEmbedTexturesItem.addActionListener(this);
516	886	menu.add("-");
517	887	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
518	888	sortbysizeItem.addActionListener(this);
..	..	@@ -539,6 +909,74 @@
539	909	buildToolsMenu(menu);
540	910	}
541	911
	912	+ JTabbedPane resourcecontainer;
	913	+ cGridBag currenttab;
	914	+ boolean added; // patch for jar
	915	+
	916	+ int tabcount = 0;
	917	+ int colcount = 0;
	918	+ int rowcount = 0;
	919	+ int texturecount = 0;
	920	+
	921	+ int columns = 5;
	922	+ int rows = 7;
	923	+
	924	+ public void ResourceCallBack(String[] path)
	925	+ {
	926	+// for (int i = 0; i < path.length; i++)
	927	+// System.out.print(path[i] + "/");
	928	+// System.out.println();
	929	+
	930	+ if (//rowcount == 0 \|\|
	931	+ path.length == 1)
	932	+ {
	933	+ currenttab = new cGridBag();
	934	+ added = false;
	935	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	936	+ currenttab.setName(tabname);
	937	+ rowcount = 1;
	938	+ colcount = 0;
	939	+ texturecount = 0;
	940	+ }
	941	+
	942	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	943	+ {
	944	+ if (!added)
	945	+ {
	946	+ added = true;
	947	+ resourcecontainer.add(currenttab);
	948	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	949	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	950	+ }
	951	+
	952	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	953	+
	954	+ if (++colcount >= columns)
	955	+ {
	956	+ colcount = 0;
	957	+ currenttab.Return();
	958	+
	959	+ if (rowcount++ >= rows)
	960	+ {
	961	+ rowcount = 0;
	962	+ }
	963	+ }
	964	+ }
	965	+ else
	966	+ {
	967	+// if (!path[path.length-1].equals("icons"))
	968	+// resourcecontainer.Return();
	969	+ }
	970	+ }
	971	+
	972	+ void CreateTexturePanel(cGridBag container)
	973	+ {
	974	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	975	+ container.add(resourcecontainer);
	976	+
	977	+ Grafreed.ParseResources("textures", this);
	978	+ }
	979	+
542	980	void SetupUI2(ObjEditor oe)
543	981	{
544	982	// June 2019
..	..	@@ -556,11 +994,6 @@
556	994	//new Exception().printStackTrace();
557	995
558	996	oe.radioPanel = new JPanel(new GridBagLayout());
559		- oe.aConstraints.weightx = 1;
560		- oe.aConstraints.weighty = 0;
561		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
562		- oe.aConstraints.gridwidth = 100;
563		- oe.aConstraints.gridheight = 1;
564	997	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
565	998
566	999	oe.buttonGroup = new ButtonGroup();
..	..	@@ -583,7 +1016,7 @@
583	1016	*/
584	1017	cGridBag copyOptionsPanel = new cGridBag();
585	1018
586		- copyOptionsPanel.preferredHeight = 1;
	1019	+ copyOptionsPanel.preferredHeight = 2;
587	1020
588	1021	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
589	1022
..	..	@@ -598,6 +1031,45 @@
598	1031	maxButton.addActionListener(this);
599	1032	}
600	1033
	1034	+ cButton gcButton;
	1035	+
	1036	+ oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1037	+ gcButton.setToolTipText("Garbage collect");
	1038	+ gcButton.addActionListener(new ActionListener()
	1039	+ {
	1040	+ public void actionPerformed(ActionEvent e)
	1041	+ {
	1042	+ System.gc();
	1043	+ }
	1044	+ });
	1045	+
	1046	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1047	+ collapseButton.setToolTipText("Collapse toolbar");
	1048	+ collapseButton.addActionListener(this);
	1049	+
	1050	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1051	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1052	+ maximize3DButton.addActionListener(this);
	1053	+
	1054	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1055	+ twoButton.setToolTipText("Show 3D view only");
	1056	+ twoButton.addActionListener(this);
	1057	+ this.fullscreenLayout = twoButton;
	1058	+
	1059	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1060	+ threeButton.setToolTipText("Show controls and 3D view");
	1061	+ threeButton.addActionListener(this);
	1062	+ if (Globals.ADVANCED)
	1063	+ {
	1064	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1065	+ sixButton.setToolTipText("Show 3D view and controls");
	1066	+ sixButton.addActionListener(this);
	1067	+ }
	1068	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1069	+// sevenButton.setToolTipText("3-column layout");
	1070	+// sevenButton.addActionListener(this);
	1071	+ //
	1072	+
601	1073	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602	1074	fullButton.setToolTipText("Full-screen window");
603	1075	fullButton.addActionListener(this);
..	..	@@ -610,29 +1082,46 @@
610	1082	restoreCameraButton.setToolTipText("Restore viewpoint");
611	1083	restoreCameraButton.addActionListener(this);
612	1084
613		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
614		- undoButton.setToolTipText("Undo changes");
615		- undoButton.addActionListener(this);
616		- undoButton.setEnabled(false);
	1085	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1086	+ saveVersionButton.setToolTipText("Duplicate current version");
	1087	+ saveVersionButton.addActionListener(this);
	1088	+
	1089	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1090	+ deleteVersionButton.setToolTipText("Delete current version");
	1091	+ deleteVersionButton.addActionListener(this);
	1092	+
	1093	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1094	+ previousVersionButton.setToolTipText("Previous version");
	1095	+ previousVersionButton.addActionListener(this);
	1096	+ previousVersionButton.setEnabled(false);
617	1097
618		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
619		- redoButton.setToolTipText("Redo changes");
620		- redoButton.addActionListener(this);
621		- redoButton.setEnabled(false);
	1098	+ cGridBag updown = new cGridBag().setVertical(true);
	1099	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1100	+ restoreButton.setToolTipText("Undo (restore current version)");
	1101	+ restoreButton.addActionListener(this);
	1102	+ //restoreButton.setEnabled(false);
622	1103
623		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624		- saveButton.setToolTipText("Save changes");
625		- saveButton.addActionListener(this);
	1104	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1105	+ replaceButton.setToolTipText("Save (replace current version)");
	1106	+ replaceButton.addActionListener(this);
	1107	+ //replaceButton.setEnabled(false);
626	1108
627		- copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
628		- liveCB.setToolTipText("Enable animation");
629		- liveCB.addItemListener(this);
630		-
631		- copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1109	+ copyOptionsPanel.add(updown);
	1110	+
	1111	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ nextVersionButton.setToolTipText("Next version");
	1113	+ nextVersionButton.addActionListener(this);
	1114	+ nextVersionButton.setEnabled(false);
	1115	+
	1116	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632	1117	oneStepButton.setToolTipText("Animate one step forward");
633	1118	oneStepButton.addActionListener(this);
634	1119
635		- copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1120	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1121	+ liveCB.setToolTipText("Enable animation");
	1122	+ liveCB.addItemListener(this);
	1123	+
	1124	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
636	1125	fastCB.setToolTipText("Fast mode");
637	1126	fastCB.addItemListener(this);
638	1127
..	..	@@ -650,31 +1139,17 @@
650	1139	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
651	1140	snapobjectButton.addActionListener(this);
652	1141	snapobjectButton.setToolTipText("Snap Object");
	1142	+
	1143	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1144	+ fourButton.addActionListener(this);
	1145	+ fourButton.setToolTipText("Show control panel only");
653	1146	}
654	1147
655	1148	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
656	1149
657		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658		- twoButton.setToolTipText("Show center view only");
659		- twoButton.addActionListener(this);
660		- this.fullscreenLayout = twoButton;
661		-
662		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
663		- fourButton.addActionListener(this);
664		- fourButton.setToolTipText("Show left panel only");
665		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
666		- sixButton.setToolTipText("2-column layout left");
667		- sixButton.addActionListener(this);
668		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
669		- threeButton.setToolTipText("2-column layout right");
670		- threeButton.addActionListener(this);
671		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
672		- sevenButton.setToolTipText("3-column layout");
673		- sevenButton.addActionListener(this);
674		- //
675	1150
676		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
677		- rootButton.setToolTipText("Edit selection in new tab");
	1151	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1152	+ rootButton.setToolTipText("Open selection in new tab");
678	1153	rootButton.addActionListener(this);
679	1154
680	1155	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -683,28 +1158,30 @@
683	1158	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
684	1159	//clearButton.addActionListener(this);
685	1160
	1161	+ cGridBag row1 = new cGridBag();
	1162	+
686	1163	// INSERT
687		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1164	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
688	1165	gridButton.setToolTipText("Create grid");
689	1166	gridButton.addActionListener(this);
690	1167
691		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1168	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
692	1169	boxButton.setToolTipText("Create box");
693	1170	boxButton.addActionListener(this);
694	1171
695		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1172	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
696	1173	sphereButton.setToolTipText("Create sphere");
697	1174	sphereButton.addActionListener(this);
698	1175
699		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1176	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
700	1177	coneButton.setToolTipText("Create cone");
701	1178	coneButton.addActionListener(this);
702	1179
703		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
704	1181	torusButton.setToolTipText("Create torus");
705	1182	torusButton.addActionListener(this);
706	1183
707		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1184	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
708	1185	superButton.setToolTipText("Create superellipsoid");
709	1186	superButton.addActionListener(this);
710	1187
..	..	@@ -715,51 +1192,53 @@
715	1192	kleinButton.addActionListener(this);
716	1193	}
717	1194
718		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
719	1196	particlesButton.setToolTipText("Create particle system");
720	1197	particlesButton.addActionListener(this);
721	1198
722		- oe.toolboxPanel.Return();
	1199	+ oe.toolboxPanel.add(row1);
723	1200
724		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1201	+ cGridBag row2 = new cGridBag();
	1202	+
	1203	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
725	1204	groupButton.setToolTipText("Create group");
726	1205	groupButton.addActionListener(this);
727	1206
728		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
729	1208	compositeButton.setToolTipText("Create composite");
730	1209	compositeButton.addActionListener(this);
731	1210
732		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1211	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
733	1212	switchButton.setToolTipText("Create item switcher");
734	1213	switchButton.addActionListener(this);
735	1214
736		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1215	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
737	1216	loopButton.setToolTipText("Create loop");
738	1217	loopButton.addActionListener(this);
739	1218
740		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1219	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
741	1220	textureButton.setToolTipText("Create texture");
742	1221	textureButton.addActionListener(this);
743	1222
744		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1223	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
745	1224	overlayButton.setToolTipText("Create overlay");
746	1225	overlayButton.addActionListener(this);
747	1226
748		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1227	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
749	1228	lightButton.setToolTipText("Create light");
750	1229	lightButton.addActionListener(this);
751	1230
752		- for (int i=6; --i>=0;)
753		- {
754		- oe.toolboxPanel.Return();
755		- oe.toolboxPanel.add(new cGridBag());
756		- oe.toolboxPanel.add(new cGridBag());
757		- oe.toolboxPanel.add(new cGridBag());
758		- oe.toolboxPanel.add(new cGridBag());
759		- oe.toolboxPanel.add(new cGridBag());
760		- oe.toolboxPanel.add(new cGridBag());
761		- oe.toolboxPanel.add(new cGridBag());
762		- }
	1231	+ oe.toolboxPanel.add(row2);
	1232	+
	1233	+ cGridBag textures = new cGridBag();
	1234	+
	1235	+ CreateTexturePanel(textures);
	1236	+
	1237	+ oe.toolboxPanel.add(textures);
	1238	+
	1239	+ textures.preferredHeight = 100;
	1240	+
	1241	+ CreateSkyboxPanel(oe.skyboxPanel);
763	1242
764	1243	// EDIT panel
765	1244	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -767,20 +1246,20 @@
767	1246	editButton.addActionListener(this);
768	1247
769	1248	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
770		- uneditButton.setToolTipText("Remove selection controls");
	1249	+ uneditButton.setToolTipText("Unpin and remove selection controls");
771	1250	uneditButton.addActionListener(this);
772	1251
773	1252	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
774		- allParamsButton.setToolTipText("Show all controle");
	1253	+ allParamsButton.setToolTipText("Show all controls");
775	1254	allParamsButton.addActionListener(this);
776	1255
777		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
778		- clearPanelButton.setToolTipText("Clear edit panel");
	1256	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1257	+ clearPanelButton.setToolTipText("Clear all controls");
779	1258	clearPanelButton.addActionListener(this);
780	1259
781		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
782		- unselectButton.setToolTipText("Unselect");
783		- unselectButton.addActionListener(this);
	1260	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1261	+ //unselectButton.setToolTipText("Unselect");
	1262	+ //unselectButton.addActionListener(this);
784	1263
785	1264	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
786	1265	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -815,9 +1294,12 @@
815	1294
816	1295	oe.treePanel.add(copyOptionsPanel);
817	1296	oe.treePanel.Return();
	1297	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1298	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1299	+ sliderPane.preferredHeight = 1;
818	1300
819		-// mainPanel.setDividerLocation(0.5); //1.0);
820		-// mainPanel.setResizeWeight(0.5);
	1301	+// mainPanel.setDividerLocation(0.1); //1.0);
	1302	+ mainPanel.setResizeWeight(0.4);
821	1303
822	1304	//jList.addListSelectionListener(this);
823	1305	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -825,7 +1307,7 @@
825	1307	//jTree.setEditable(true);
826	1308	oe.jTree.setDragEnabled(true);
827	1309	//jTree.setPreferredSize(new Dimension(10,10));
828		- jSP.setPreferredSize(new Dimension(100,200));
	1310	+ //jSP.setPreferredSize(new Dimension(100,200));
829	1311
830	1312	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
831	1313
..	..	@@ -837,7 +1319,7 @@
837	1319	dgr.addDragGestureListener(this);
838	1320	}catch(Exception e) {}
839	1321	*/
840		- radio.layout = sevenButton;
	1322	+ radio.layout = threeButton; // sixButton;
841	1323	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
842	1324	}
843	1325
..	..	@@ -888,9 +1370,12 @@
888	1370	smoothCB.setToolTipText("Snapping delay");
889	1371	smoothCB.addItemListener(this);
890	1372
891		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
892		- slowCB.setToolTipText("Smooth interpolation");
893		- slowCB.addItemListener(this);
	1373	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1374	+// slowCB.setToolTipText("Smooth interpolation");
	1375	+// slowCB.addItemListener(this);
	1376	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1377	+ minshaderCB.setToolTipText("Minimal fast shader");
	1378	+ minshaderCB.addItemListener(this);
894	1379
895	1380	// constraints.gridy += 1;
896	1381	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -940,9 +1425,9 @@
940	1425	toggleSwitchCB.setToolTipText("Choose a single item");
941	1426	toggleSwitchCB.addItemListener(this);
942	1427
943		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
944		- autosaveCB.setToolTipText("On structure change");
945		- autosaveCB.addItemListener(this);
	1428	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1429	+ autokeepCB.setToolTipText("On structure change");
	1430	+ autokeepCB.addItemListener(this);
946	1431
947	1432	panel.Return();
948	1433	if (Globals.ADVANCED)
..	..	@@ -971,7 +1456,7 @@
971	1456	{
972	1457	cRadio radioButton = new cRadio(obj.name);
973	1458
974		- // Patch to avoid bug with transparency.
	1459	+ // June 2019. Patch to avoid bug with transparency.
975	1460	radioButton.hadMaterial = obj.material != null;
976	1461	if (!radioButton.hadMaterial)
977	1462	{
..	..	@@ -979,7 +1464,7 @@
979	1464	}
980	1465
981	1466	radioButton.SetObject(obj);
982		- radioButton.layout = sevenButton;
	1467	+ radioButton.layout = threeButton; // sixButton;
983	1468	radioButton.SetCamera(cameraView.renderCamera, false);
984	1469	radioButton.addActionListener(this);
985	1470	radioPanel.add(radioButton);
..	..	@@ -1004,6 +1489,8 @@
1004	1489	cCheckBox localCB;
1005	1490	cCheckBox crowdCB;
1006	1491	cCheckBox smoothCB;
	1492	+ cCheckBox minshaderCB;
	1493	+
1007	1494	cToggleButton fastCB;
1008	1495	cCheckBox slowCB;
1009	1496	cCheckBox boxCB;
..	..	@@ -1019,7 +1506,7 @@
1019	1506
1020	1507	cCheckBox oeilCB;
1021	1508	cCheckBox shadowCB;
1022		- cCheckBox autosaveCB;
	1509	+ cCheckBox autokeepCB;
1023	1510	cCheckBox lookAtCB;
1024	1511
1025	1512	// static int COLOR = 1;
..	..	@@ -1074,6 +1561,12 @@
1074	1561	{
1075	1562	cameraView.ToggleInertia();
1076	1563	cameraView.repaint();
	1564	+ }
	1565	+ else if(e.getSource() == minshaderCB)
	1566	+ {
	1567	+ Globals.MINSHADER ^= true;
	1568	+ cameraView.programInitialized = false;
	1569	+ cameraView.repaint();
1077	1570	}
1078	1571	else if(e.getSource() == localCB)
1079	1572	{
..	..	@@ -1131,9 +1624,9 @@
1131	1624	{
1132	1625	Globals.FREEZEONMOVE ^= true;
1133	1626	}
1134		- else if(e.getSource() == autosaveCB)
	1627	+ else if(e.getSource() == autokeepCB)
1135	1628	{
1136		- Globals.SAVEONMAKE ^= true;
	1629	+ Globals.REPLACEONMAKE ^= true;
1137	1630	}
1138	1631	else if(e.getSource() == lookAtCB)
1139	1632	{
..	..	@@ -1223,7 +1716,7 @@
1223	1716	// return;
1224	1717	// }
1225	1718
1226		- String string = (String) object;
	1719	+ String string = object.toString();
1227	1720
1228	1721	// File path for Mac and Windows
1229	1722	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1351,7 +1844,12 @@
1351	1844	TreePath path;
1352	1845
1353	1846	public TransferableTreePath(TreePath tp) {
1354		- path = tp;
	1847	+ Object[] objs = new Object[tp.getPathCount()];
	1848	+ for (int i=0; i<objs.length; i++)
	1849	+ {
	1850	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1851	+ }
	1852	+ path = new TreePath(objs);
1355	1853	}
1356	1854
1357	1855	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1488,6 +1986,8 @@
1488	1986	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1489	1987	reduce34MorphItem.addActionListener(this);
1490	1988	menu.add("-");
	1989	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1990	+ memoryItem.addActionListener(this);
1491	1991	menu.add(computeAOItem = new MenuItem("Compute AO"));
1492	1992	computeAOItem.addActionListener(this);
1493	1993
..	..	@@ -1496,8 +1996,6 @@
1496	1996	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1497	1997	mirrorItem.addActionListener(this);
1498	1998	menu.add("-");
1499		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1500		- memoryItem.addActionListener(this);
1501	1999	menu.add(analyzeItem = new MenuItem("Analyze"));
1502	2000	analyzeItem.addActionListener(this);
1503	2001	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1658,6 +2156,16 @@
1658	2156	listUI.remove(i);
1659	2157	}
1660	2158	}
	2159	+ }
	2160	+
	2161	+ private void EditElement(Object3D elem, boolean newWindow)
	2162	+ {
	2163	+ // if (!(elem instanceof Composite))
	2164	+ // newWindow = false;
	2165	+ listUI.add(elem);
	2166	+ elem.openEditWindow(this, newWindow); //, false);
	2167	+ System.out.println("edit : " + elem);
	2168	+ elem.editWindow.refreshContents(true); // ? new
1661	2169	}
1662	2170
1663	2171	/**
..	..	@@ -2087,6 +2595,23 @@
2087	2595	{
2088	2596	makeSomething(new Light());
2089	2597	} else
	2598	+// if (source == skybox1Button \|\|
	2599	+// source == skybox2Button \|\|
	2600	+// source == skybox3Button \|\|
	2601	+// source == skybox4Button \|\|
	2602	+// source == skybox5Button \|\|
	2603	+// source == skybox6Button \|\|
	2604	+// source == skybox7Button \|\|
	2605	+// source == skybox11Button \|\|
	2606	+// source == skybox12Button \|\|
	2607	+// source == skybox13Button \|\|
	2608	+// source == skybox14Button \|\|
	2609	+// source == skybox15Button \|\|
	2610	+// source == skybox16Button \|\|
	2611	+// source == skybox17Button)
	2612	+// {
	2613	+// ChangeSkybox(source);
	2614	+// } else
2090	2615	if (source == csgItem)
2091	2616	{
2092	2617	group(new CSG());
..	..	@@ -2172,7 +2697,7 @@
2172	2697	if (source == computeAOItem)
2173	2698	{
2174	2699	Globals.drawMode = CameraPane.OCCLUSION;
2175		- Globals.theRenderer.repaint();
	2700	+ cameraView.repaint();
2176	2701	} else
2177	2702	if (source == recompileItem)
2178	2703	{
..	..	@@ -2187,7 +2712,7 @@
2187	2712	if (source == invariantsItem)
2188	2713	{
2189	2714	System.out.println("Invariants:");
2190		- Grafreed.grafreeD.universe.invariants();
	2715	+ Grafreed.grafreed.universe.invariants();
2191	2716	} else
2192	2717	if (source == memoryItem)
2193	2718	{
..	..	@@ -2218,19 +2743,52 @@
2218	2743	{
2219	2744	ToggleFullScreen();
2220	2745	} else
2221		- if (source == undoButton)
	2746	+ if (source == collapseButton)
2222	2747	{
2223		- if (!Undo())
2224		- java.awt.Toolkit.getDefaultToolkit().beep();
	2748	+ this.expandedLayout = radio.layout;
	2749	+ CollapseToolbar();
2225	2750	} else
2226		- if (source == redoButton)
	2751	+ if (source == maximize3DButton)
2227	2752	{
2228		- Redo();
	2753	+ this.expandedLayout = radio.layout;
	2754	+ radio.layout = twoButton;
	2755	+ Show3DView();
	2756	+ CollapseToolbar();
2229	2757	} else
2230		- if (source == saveButton)
	2758	+ if (source == previousVersionButton)
2231	2759	{
	2760	+ // Go to previous version
	2761	+ //if (!Undo())
	2762	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2763	+ PreviousVersion();
	2764	+ } else
	2765	+ if (source == restoreButton)
	2766	+ {
	2767	+ // Restore current version
	2768	+ Restore();
	2769	+ //restoreButton.setEnabled(false);
	2770	+ } else
	2771	+ if (source == replaceButton)
	2772	+ {
	2773	+ // Overwrite current version
	2774	+ Replace();
	2775	+ //replaceButton.setEnabled(false);
	2776	+ } else
	2777	+ if (source == nextVersionButton)
	2778	+ {
	2779	+ // Go to next version
	2780	+ NextVersion();
	2781	+ } else
	2782	+ if (source == saveVersionButton)
	2783	+ {
	2784	+ // Save a new version
2232	2785	if (!Save(true))
2233	2786	java.awt.Toolkit.getDefaultToolkit().beep();
	2787	+ } else
	2788	+ if (source == deleteVersionButton)
	2789	+ {
	2790	+ // Delete a new version
	2791	+ DeleteVersion();
2234	2792	} else
2235	2793	if (source == oneStepButton)
2236	2794	{
..	..	@@ -2285,11 +2843,11 @@
2285	2843	} else
2286	2844	if (source == undoItem)
2287	2845	{
2288		- Undo();
	2846	+ PreviousVersion();
2289	2847	} else
2290	2848	if (source == redoItem)
2291	2849	{
2292		- Redo();
	2850	+ NextVersion();
2293	2851	} else
2294	2852	if (source == duplicateItem)
2295	2853	{
..	..	@@ -2610,7 +3168,7 @@
2610	3168	{
2611	3169	StepAll();
2612	3170	} else
2613		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3171	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2614	3172	{
2615	3173	//int indices[] = jList.getSelectedIndices();
2616	3174	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -3092,7 +3650,7 @@
3092	3650	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3093	3651	{
3094	3652	obj = (Object3D)e.nextElement();
3095		- obj.SetBumpTexture(null);
	3653	+ obj.ResetBumpTexture();
3096	3654	}
3097	3655
3098	3656	refreshContents();
..	..	@@ -3106,6 +3664,31 @@
3106	3664	obj.SetBumpTexture(obj.GetPigmentTexture());
3107	3665	}
3108	3666
	3667	+ refreshContents();
	3668	+ } else
	3669	+ if (source == embedTexturesItem)
	3670	+ {
	3671	+ Object3D obj;
	3672	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3673	+ {
	3674	+ obj = (Object3D)e.nextElement();
	3675	+ obj.EmbedTextures(true);
	3676	+ }
	3677	+
	3678	+ refreshContents();
	3679	+ } else
	3680	+ if (source == deEmbedTexturesItem)
	3681	+ {
	3682	+ Object3D obj;
	3683	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3684	+ {
	3685	+ obj = (Object3D)e.nextElement();
	3686	+ obj.EmbedTextures(false);
	3687	+ }
	3688	+
	3689	+ CameraPane.texturepigment.clear();
	3690	+ CameraPane.texturebump.clear();
	3691	+
3109	3692	refreshContents();
3110	3693	} else
3111	3694	if (source == flashSelectionButton)
..	..	@@ -3123,38 +3706,7 @@
3123	3706	if (CameraPane.FULLSCREEN)
3124	3707	fullscreenLayout = radio.layout;
3125	3708
3126		- // bug
3127		- //gridPanel.setDividerLocation(1.0);
3128		- //bigPanel.setDividerLocation(0.0);
3129		-// bigThree.remove(scenePanel);
3130		-// bigThree.remove(centralPanel);
3131		-// bigThree.remove(XYZPanel);
3132		-// aWindowConstraints.gridx = 0;
3133		-// aWindowConstraints.gridy = 0;
3134		-// aWindowConstraints.gridwidth = 1;
3135		-// // aConstraints.gridheight = 3;
3136		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3137		-// aWindowConstraints.weightx = 0;
3138		-// aWindowConstraints.weighty = 1;
3139		-// //bigThree.add(jtp, aWindowConstraints);
3140		-// aWindowConstraints.weightx = 1;
3141		-// aWindowConstraints.gridwidth = 3;
3142		-// // aConstraints.gridheight = 3;
3143		-// aWindowConstraints.gridx = 1;
3144		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3145		-// bigThree.add(centralPanel, aWindowConstraints);
3146		-// aWindowConstraints.weightx = 0;
3147		-// aWindowConstraints.gridx = 4;
3148		-// aWindowConstraints.gridwidth = 1;
3149		-// // aConstraints.gridheight = 3;
3150		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3151		-// //bigThree.add(XYZPanel, aWindowConstraints);
3152		-// scenePanel.setVisible(false);
3153		-// centralPanel.setVisible(true);
3154		-// XYZPanel.setVisible(false);
3155		- bigThree.ClearUI();
3156		- bigThree.add(centralPanel);
3157		- bigThree.FlushUI();
	3709	+ Show3DView();
3158	3710
3159	3711	cameraView.requestFocusInWindow();
3160	3712
..	..	@@ -3209,8 +3761,8 @@
3209	3761	// centralPanel.setVisible(true);
3210	3762	// XYZPanel.setVisible(true);
3211	3763	bigThree.ClearUI();
	3764	+ bigThree.add(scenePanel);
3212	3765	bigThree.add(centralPanel);
3213		- bigThree.add(XYZPanel);
3214	3766	bigThree.FlushUI();
3215	3767
3216	3768	cameraView.requestFocusInWindow();
..	..	@@ -3290,8 +3842,8 @@
3290	3842	// centralPanel.setVisible(true);
3291	3843	// XYZPanel.setVisible(false);
3292	3844	bigThree.ClearUI();
3293		- bigThree.add(scenePanel);
3294	3845	bigThree.add(centralPanel);
	3846	+ bigThree.add(scenePanel);
3295	3847	bigThree.FlushUI();
3296	3848
3297	3849	cameraView.requestFocusInWindow();
..	..	@@ -3397,10 +3949,10 @@
3397	3949	{
3398	3950	Object3D child = (Object3D)e.nextElement();
3399	3951	if(child.editWindow != null)
3400		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3401	3952	child.pinned = false;
3402	3953	child.CloseUI();
3403	3954	listUI.remove(child);
	3955	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3404	3956
3405	3957	//child.editWindow = null; // ???????????
3406	3958	}
..	..	@@ -3419,6 +3971,7 @@
3419	3971	obj.CloseUI();
3420	3972	}
3421	3973	listUI.clear();
	3974	+ SetPinStates(group.selection.size() > 0);
3422	3975	refreshContents(true);
3423	3976	} else
3424	3977	if (source == allParamsButton)
..	..	@@ -3474,6 +4027,9 @@
3474	4027	}
3475	4028
3476	4029	copy = group;
	4030	+
	4031	+ SetUndoStates();
	4032	+
3477	4033	//Globals.theRenderer.object = group;
3478	4034	if(!useclient)
3479	4035	{
..	..	@@ -3502,8 +4058,11 @@
3502	4058	radio.layout.doClick();
3503	4059
3504	4060	ClearUnpinned();
3505		- SetPinStates(group.selection.size() > 0);
3506		- if (group.selection.size() == 1)
	4061	+
	4062	+ //Grafreed.Assert(group != null);
	4063	+ //Grafreed.Assert(group.selection != null);
	4064	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4065	+ if (group.selection == null \|\| group.selection.size() == 1)
3507	4066	EditSelection(false);
3508	4067	keepparent = group.parent;
3509	4068	// PARENT = NULL or not???
..	..	@@ -3516,11 +4075,13 @@
3516	4075	} else if (event.getSource() == editCameraItem)
3517	4076	{
3518	4077	cameraView.ProtectCamera();
	4078	+ cameraView.requestFocusInWindow();
3519	4079	cameraView.repaint();
3520	4080	return;
3521	4081	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3522	4082	{
3523	4083	cameraView.RevertCamera();
	4084	+ cameraView.requestFocusInWindow();
3524	4085	cameraView.repaint();
3525	4086	return;
3526	4087	// } else if (event.getSource() == textureButton)
..	..	@@ -4097,7 +4658,7 @@
4097	4658
4098	4659	try
4099	4660	{
4100		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4661	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4101	4662	}
4102	4663	catch (Exception e)
4103	4664	{
..	..	@@ -4574,6 +5135,12 @@
4574	5135
4575	5136	void EditSelection(boolean newWindow)
4576	5137	{
	5138	+ if (group.selection == null)
	5139	+ {
	5140	+ EditElement(group, newWindow); // ? new
	5141	+ return;
	5142	+ }
	5143	+
4577	5144	// aConstraints.gridy = 0;
4578	5145	for (int i=0; i<group.selection.size(); i++)
4579	5146	{
..	..	@@ -4584,12 +5151,7 @@
4584	5151	Object3D elem = (Object3D)group.selection.elementAt(i);
4585	5152	if(elem != group \|\| !newWindow)
4586	5153	{
4587		- // if (!(elem instanceof Composite))
4588		- // newWindow = false;
4589		- listUI.add(elem);
4590		- elem.openEditWindow(this, newWindow); //, false);
4591		- System.out.println("edit : " + elem);
4592		- elem.editWindow.refreshContents(true); // ? new
	5154	+ EditElement(elem, newWindow); // ? new
4593	5155	}
4594	5156	}
4595	5157	}
..	..	@@ -4652,9 +5214,7 @@
4652	5214
4653	5215	freezemodel = false;
4654	5216	}
4655		-
4656		- boolean flashIt = true;
4657		-
	5217	+
4658	5218	public void valueChanged(TreeSelectionEvent e)
4659	5219	//public boolean handleEvent(Event event)
4660	5220	{
..	..	@@ -4727,13 +5287,15 @@
4727	5287	{
4728	5288	editButton.setEnabled(enabled);
4729	5289	uneditButton.setEnabled(enabled);
4730		- unselectButton.setEnabled(enabled);
	5290	+ //unselectButton.setEnabled(enabled);
4731	5291	flashSelectionButton.setEnabled(enabled);
	5292	+
	5293	+ clearPanelButton.setEnabled(!listUI.isEmpty());
4732	5294	}
4733	5295
4734	5296	void refreshContents(boolean cp)
4735	5297	{
4736		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	5298	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4737	5299	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4738	5300	{
4739	5301	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -4743,7 +5305,7 @@
4743	5305	Object3D child = (Object3D) group.selection.get(i);
4744	5306
4745	5307	objEditor.AddInfo(child, this, true);
4746		- System.err.println("info : " + child.GetPath());
	5308	+// System.err.println("info : " + child.GetPath());
4747	5309	}
4748	5310
4749	5311	objEditor.SetText(); // jan 2014
..	..	@@ -4833,8 +5395,8 @@
4833	5395
4834	5396	if (cut)
4835	5397	{
4836		- if (Globals.SAVEONMAKE)
4837		- Save();
	5398	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5399	+// Save();
4838	5400	//int indices[] = jList.getSelectedIndices();
4839	5401	//for (int i = indices.length - 1; i >= 0; i--)
4840	5402	//jList.remove(indices[i]);
..	..	@@ -4937,6 +5499,10 @@
4937	5499
4938	5500	void paste(boolean expand)
4939	5501	{
	5502	+ if (Globals.REPLACEONMAKE)
	5503	+ Save();
	5504	+ boolean keep = Globals.REPLACEONMAKE;
	5505	+ Globals.REPLACEONMAKE = false;
4940	5506	// if (GrafreeD.clipboard == null)
4941	5507	// return;
4942	5508	boolean first = true;
..	..	@@ -4996,6 +5562,7 @@
4996	5562	Grafreed.clipboard.get(0).parent = keepparent;
4997	5563	}
4998	5564
	5565	+ Globals.REPLACEONMAKE = keep;
4999	5566	ResetModel();
5000	5567	refreshContents();
5001	5568	}
..	..	@@ -5131,6 +5698,10 @@
5131	5698
5132	5699	void group(Object3D csg, boolean grab)
5133	5700	{
	5701	+ if (Globals.REPLACEONMAKE)
	5702	+ Save();
	5703	+ boolean keep = Globals.REPLACEONMAKE;
	5704	+ Globals.REPLACEONMAKE = false;
5134	5705	if (//false) // why??
5135	5706	!group.selection.isEmpty())
5136	5707	{
..	..	@@ -5244,10 +5815,15 @@
5244	5815	//node.add(csg);
5245	5816	//makeSomething(node);
5246	5817	makeSomething(csg);
	5818	+ Globals.REPLACEONMAKE = keep;
5247	5819	}
5248	5820
5249	5821	void Ungroup(Object3D g)
5250	5822	{
	5823	+ if (Globals.REPLACEONMAKE)
	5824	+ Save();
	5825	+ boolean keep = Globals.REPLACEONMAKE;
	5826	+ Globals.REPLACEONMAKE = false;
5251	5827	if (g instanceof HiddenObject)
5252	5828	{
5253	5829	HiddenObject h = (HiddenObject) g;
..	..	@@ -5264,6 +5840,7 @@
5264	5840	objEditor.makeSomething(g.get(i), false);
5265	5841	}
5266	5842	}
	5843	+ Globals.REPLACEONMAKE = keep;
5267	5844	}
5268	5845
5269	5846	void ungroup()
..	..	@@ -5554,7 +6131,6 @@
5554	6131
5555	6132	cButton restoreCameraButton;
5556	6133
5557		- cButton saveButton;
5558	6134	cButton oneStepButton;
5559	6135
5560	6136	cButton groupButton;
..	..	@@ -5563,6 +6139,22 @@
5563	6139	cButton switchButton;
5564	6140	cButton loopButton;
5565	6141	cButton textureButton;
	6142	+
	6143	+ cButton skybox1Button;
	6144	+ cButton skybox2Button;
	6145	+ cButton skybox3Button;
	6146	+ cButton skybox4Button;
	6147	+ cButton skybox5Button;
	6148	+ cButton skybox6Button;
	6149	+ cButton skybox7Button;
	6150	+
	6151	+ cButton skybox11Button;
	6152	+ cButton skybox12Button;
	6153	+ cButton skybox13Button;
	6154	+ cButton skybox14Button;
	6155	+ cButton skybox15Button;
	6156	+ cButton skybox16Button;
	6157	+ cButton skybox17Button;
5566	6158
5567	6159	cButton gridButton;
5568	6160	cButton boxButton;
..	..	@@ -5627,7 +6219,7 @@
5627	6219	private MenuItem pasteLinkItem;
5628	6220	private MenuItem pasteCloneItem;
5629	6221	private MenuItem pasteExpandItem;
5630		- private MenuItem clearItem;
	6222	+ private MenuItem deleteItem;
5631	6223	private MenuItem clearAllItem;
5632	6224	private MenuItem genUVItem;
5633	6225	private MenuItem genNormalsMESHItem;
..	..	@@ -5711,6 +6303,8 @@
5711	6303	private MenuItem attachBumpItem;
5712	6304	private MenuItem detachBumpItem;
5713	6305	private MenuItem pigmentBumpItem;
	6306	+ private MenuItem embedTexturesItem;
	6307	+ private MenuItem deEmbedTexturesItem;
5714	6308
5715	6309	private MenuItem particleItem;
5716	6310	private MenuItem ragdollItem;