~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", !Grafreed.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, !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", "", 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();
	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,14 @@
60	415	this.copy = this.group = group;
61	416	//selectees = this.group.selectees;
62	417
	418	+ if (copy.versionlist == null)
	419	+ {
	420	+ copy.versionlist = new Object3D[100];
	421	+ copy.versionindex = -1;
	422	+
	423	+ Save(true);
	424	+ }
	425	+
63	426	if(ui)
64	427	SetupUI(objEditor);
65	428	}
..	..	@@ -80,14 +443,22 @@
80	443	SetupViews(objEditor);
81	444
82	445	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	446	+
	447	+ if (copy.versionlist == null)
	448	+ {
	449	+ copy.versionlist = new Object3D[100];
	450	+ copy.versionindex = -1;
	451	+
	452	+ Save(true);
	453	+ }
83	454	}
84	455
85	456	void CloneSelection(boolean supports)
86	457	{
87		- if (Globals.SAVEONMAKE)
	458	+ if (Globals.REPLACEONMAKE)
88	459	Save();
89		- boolean keep = Globals.SAVEONMAKE;
90		- Globals.SAVEONMAKE = false;
	460	+ boolean keep = Globals.REPLACEONMAKE;
	461	+ Globals.REPLACEONMAKE = false;
91	462	// Object3D keep = GrafreeD.clipboard;
92	463	//Object3D obj;
93	464	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -98,7 +469,7 @@
98	469
99	470	makeSomething(clone, i==group.selection.size()-1);
100	471	}
101		- Globals.SAVEONMAKE = keep;
	472	+ Globals.REPLACEONMAKE = keep;
102	473	}
103	474
104	475	void CloneClipboard(boolean supports)
..	..	@@ -194,8 +565,8 @@
194	565	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
195	566	// pasteExpandItem.addActionListener(this);
196	567	menu.add("-");
197		- clearItem = menu.add(new MenuItem("Clear"));
198		- clearItem.addActionListener(this);
	568	+ deleteItem = menu.add(new MenuItem("Delete"));
	569	+ deleteItem.addActionListener(this);
199	570
200	571	if (Globals.ADVANCED)
201	572	{
..	..	@@ -281,11 +652,9 @@
281	652	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
282	653	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
283	654	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
284		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
285	655	oe.cameraMenu.add("-");
286	656	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
287	657	openWindowItem.addActionListener(this);
288		- editLeafItem.addActionListener(this);
289	658	lookAtItem.addActionListener(this);
290	659	//lookFromItem.addActinoListener(this);
291	660	//switchViewItem.addActionListener(this);
..	..	@@ -421,7 +790,7 @@
421	790	genNormalsMESHItem.addActionListener(this);
422	791	if (Globals.ADVANCED)
423	792	{
424		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	793	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
425	794	genNormalsMINEItem.addActionListener(this);
426	795	}
427	796	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -514,10 +883,15 @@
514	883	attachBumpItem.addActionListener(this);
515	884	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
516	885	pigmentBumpItem.addActionListener(this);
	886	+ //embedTexturesItem
517	887	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
518	888	detachPigmentItem.addActionListener(this);
519	889	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
520	890	detachBumpItem.addActionListener(this);
	891	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	892	+ embedTexturesItem.addActionListener(this);
	893	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	894	+ deEmbedTexturesItem.addActionListener(this);
521	895	menu.add("-");
522	896	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
523	897	sortbysizeItem.addActionListener(this);
..	..	@@ -528,6 +902,9 @@
528	902	shareGeometriesItem.addActionListener(this);
529	903	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
530	904	mergeGeometriesItem.addActionListener(this);
	905	+ menu.add("-");
	906	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	907	+ editLeafItem.addActionListener(this);
531	908	if (Globals.ADVANCED)
532	909	{
533	910	// Pretty much the same as duplicate and clone.
..	..	@@ -544,6 +921,74 @@
544	921	buildToolsMenu(menu);
545	922	}
546	923
	924	+ JTabbedPane resourcecontainer;
	925	+ cGridBag currenttab;
	926	+ boolean added; // patch for jar
	927	+
	928	+ int tabcount = 0;
	929	+ int colcount = 0;
	930	+ int rowcount = 0;
	931	+ int texturecount = 0;
	932	+
	933	+ int columns = 5;
	934	+ int rows = 7;
	935	+
	936	+ public void ResourceCallBack(String[] path)
	937	+ {
	938	+// for (int i = 0; i < path.length; i++)
	939	+// System.out.print(path[i] + "/");
	940	+// System.out.println();
	941	+
	942	+ if (//rowcount == 0 \|\|
	943	+ path.length == 1)
	944	+ {
	945	+ currenttab = new cGridBag();
	946	+ added = false;
	947	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	948	+ currenttab.setName(tabname);
	949	+ rowcount = 1;
	950	+ colcount = 0;
	951	+ texturecount = 0;
	952	+ }
	953	+
	954	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	955	+ {
	956	+ if (!added)
	957	+ {
	958	+ added = true;
	959	+ resourcecontainer.add(currenttab);
	960	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	961	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	962	+ }
	963	+
	964	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	965	+
	966	+ if (++colcount >= columns)
	967	+ {
	968	+ colcount = 0;
	969	+ currenttab.Return();
	970	+
	971	+ if (rowcount++ >= rows)
	972	+ {
	973	+ rowcount = 0;
	974	+ }
	975	+ }
	976	+ }
	977	+ else
	978	+ {
	979	+// if (!path[path.length-1].equals("icons"))
	980	+// resourcecontainer.Return();
	981	+ }
	982	+ }
	983	+
	984	+ void CreateTexturePanel(cGridBag container)
	985	+ {
	986	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	987	+ container.add(resourcecontainer);
	988	+
	989	+ Grafreed.ParseResources("textures", this);
	990	+ }
	991	+
547	992	void SetupUI2(ObjEditor oe)
548	993	{
549	994	// June 2019
..	..	@@ -561,11 +1006,6 @@
561	1006	//new Exception().printStackTrace();
562	1007
563	1008	oe.radioPanel = new JPanel(new GridBagLayout());
564		- oe.aConstraints.weightx = 1;
565		- oe.aConstraints.weighty = 0;
566		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
567		- oe.aConstraints.gridwidth = 100;
568		- oe.aConstraints.gridheight = 1;
569	1009	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
570	1010
571	1011	oe.buttonGroup = new ButtonGroup();
..	..	@@ -588,7 +1028,7 @@
588	1028	*/
589	1029	cGridBag copyOptionsPanel = new cGridBag();
590	1030
591		- copyOptionsPanel.preferredHeight = 1;
	1031	+ copyOptionsPanel.preferredHeight = 2;
592	1032
593	1033	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
594	1034
..	..	@@ -598,10 +1038,49 @@
598	1038
599	1039	if (Globals.ADVANCED)
600	1040	{
601		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602		- maxButton.setToolTipText("Maximize window");
603		- maxButton.addActionListener(this);
	1041	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1042	+// maxButton.setToolTipText("Maximize window");
	1043	+// maxButton.addActionListener(this);
604	1044	}
	1045	+
	1046	+// cButton gcButton;
	1047	+//
	1048	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1049	+// gcButton.setToolTipText("Garbage collect");
	1050	+// gcButton.addActionListener(new ActionListener()
	1051	+// {
	1052	+// public void actionPerformed(ActionEvent e)
	1053	+// {
	1054	+// System.gc();
	1055	+// }
	1056	+// });
	1057	+
	1058	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1059	+ collapseButton.setToolTipText("Collapse toolbar");
	1060	+ collapseButton.addActionListener(this);
	1061	+
	1062	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1064	+ maximize3DButton.addActionListener(this);
	1065	+
	1066	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1067	+ twoButton.setToolTipText("Show 3D view only");
	1068	+ twoButton.addActionListener(this);
	1069	+ this.fullscreenLayout = twoButton;
	1070	+
	1071	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ threeButton.setToolTipText("Show controls and 3D view");
	1073	+ threeButton.addActionListener(this);
	1074	+ if (Globals.ADVANCED)
	1075	+ {
	1076	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ sixButton.setToolTipText("Show 3D view and controls");
	1078	+ sixButton.addActionListener(this);
	1079	+ }
	1080	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1081	+// sevenButton.setToolTipText("3-column layout");
	1082	+// sevenButton.addActionListener(this);
	1083	+ //
605	1084
606	1085	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
607	1086	fullButton.setToolTipText("Full-screen window");
..	..	@@ -615,29 +1094,46 @@
615	1094	restoreCameraButton.setToolTipText("Restore viewpoint");
616	1095	restoreCameraButton.addActionListener(this);
617	1096
618		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
619		- undoButton.setToolTipText("Undo changes");
620		- undoButton.addActionListener(this);
621		- undoButton.setEnabled(false);
	1097	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ saveVersionButton.setToolTipText("Duplicate current version");
	1099	+ saveVersionButton.addActionListener(this);
	1100	+
	1101	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1102	+ deleteVersionButton.setToolTipText("Delete current version");
	1103	+ deleteVersionButton.addActionListener(this);
	1104	+
	1105	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1106	+ previousVersionButton.setToolTipText("Previous version");
	1107	+ previousVersionButton.addActionListener(this);
	1108	+ previousVersionButton.setEnabled(false);
622	1109
623		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624		- redoButton.setToolTipText("Redo changes");
625		- redoButton.addActionListener(this);
626		- redoButton.setEnabled(false);
	1110	+ cGridBag updown = new cGridBag().setVertical(true);
	1111	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ restoreButton.setToolTipText("Undo (restore current version)");
	1113	+ restoreButton.addActionListener(this);
	1114	+ //restoreButton.setEnabled(false);
627	1115
628		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629		- saveButton.setToolTipText("Save changes");
630		- saveButton.addActionListener(this);
	1116	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1117	+ replaceButton.setToolTipText("Save (replace current version)");
	1118	+ replaceButton.addActionListener(this);
	1119	+ //replaceButton.setEnabled(false);
631	1120
632		- copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
633		- liveCB.setToolTipText("Enable animation");
634		- liveCB.addItemListener(this);
635		-
636		- copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1121	+ copyOptionsPanel.add(updown);
	1122	+
	1123	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ nextVersionButton.setToolTipText("Next version");
	1125	+ nextVersionButton.addActionListener(this);
	1126	+ nextVersionButton.setEnabled(false);
	1127	+
	1128	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
637	1129	oneStepButton.setToolTipText("Animate one step forward");
638	1130	oneStepButton.addActionListener(this);
639	1131
640		- copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1132	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1133	+ liveCB.setToolTipText("Enable animation");
	1134	+ liveCB.addItemListener(this);
	1135	+
	1136	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
641	1137	fastCB.setToolTipText("Fast mode");
642	1138	fastCB.addItemListener(this);
643	1139
..	..	@@ -655,31 +1151,17 @@
655	1151	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
656	1152	snapobjectButton.addActionListener(this);
657	1153	snapobjectButton.setToolTipText("Snap Object");
	1154	+
	1155	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1156	+ fourButton.addActionListener(this);
	1157	+ fourButton.setToolTipText("Show control panel only");
658	1158	}
659	1159
660	1160	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
661	1161
662		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
663		- twoButton.setToolTipText("Show center view only");
664		- twoButton.addActionListener(this);
665		- this.fullscreenLayout = twoButton;
666		-
667		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
668		- fourButton.addActionListener(this);
669		- fourButton.setToolTipText("Show left panel only");
670		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671		- sixButton.setToolTipText("2-column layout left");
672		- sixButton.addActionListener(this);
673		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
674		- threeButton.setToolTipText("2-column layout right");
675		- threeButton.addActionListener(this);
676		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
677		- sevenButton.setToolTipText("3-column layout");
678		- sevenButton.addActionListener(this);
679		- //
680	1162
681		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682		- rootButton.setToolTipText("Edit selection in new tab");
	1163	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1164	+ rootButton.setToolTipText("Open selection in new tab");
683	1165	rootButton.addActionListener(this);
684	1166
685	1167	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -688,28 +1170,30 @@
688	1170	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
689	1171	//clearButton.addActionListener(this);
690	1172
	1173	+ cGridBag row1 = new cGridBag();
	1174	+
691	1175	// INSERT
692		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
693		- gridButton.setToolTipText("Create grid");
	1176	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1177	+ gridButton.setToolTipText("Create ground");
694	1178	gridButton.addActionListener(this);
695	1179
696		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
697	1181	boxButton.setToolTipText("Create box");
698	1182	boxButton.addActionListener(this);
699	1183
700		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1184	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
701	1185	sphereButton.setToolTipText("Create sphere");
702	1186	sphereButton.addActionListener(this);
703	1187
704		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1188	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
705	1189	coneButton.setToolTipText("Create cone");
706	1190	coneButton.addActionListener(this);
707	1191
708		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1192	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
709	1193	torusButton.setToolTipText("Create torus");
710	1194	torusButton.addActionListener(this);
711	1195
712		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1196	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
713	1197	superButton.setToolTipText("Create superellipsoid");
714	1198	superButton.addActionListener(this);
715	1199
..	..	@@ -720,51 +1204,53 @@
720	1204	kleinButton.addActionListener(this);
721	1205	}
722	1206
723		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
724	1208	particlesButton.setToolTipText("Create particle system");
725	1209	particlesButton.addActionListener(this);
726	1210
727		- oe.toolboxPanel.Return();
	1211	+ oe.toolboxPanel.add(row1);
728	1212
729		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1213	+ cGridBag row2 = new cGridBag();
	1214	+
	1215	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
730	1216	groupButton.setToolTipText("Create group");
731	1217	groupButton.addActionListener(this);
732	1218
733		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1219	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
734	1220	compositeButton.setToolTipText("Create composite");
735	1221	compositeButton.addActionListener(this);
736	1222
737		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1223	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
738	1224	switchButton.setToolTipText("Create item switcher");
739	1225	switchButton.addActionListener(this);
740	1226
741		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1227	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
742	1228	loopButton.setToolTipText("Create loop");
743	1229	loopButton.addActionListener(this);
744	1230
745		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1231	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
746	1232	textureButton.setToolTipText("Create texture");
747	1233	textureButton.addActionListener(this);
748	1234
749		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1235	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
750	1236	overlayButton.setToolTipText("Create overlay");
751	1237	overlayButton.addActionListener(this);
752	1238
753		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1239	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
754	1240	lightButton.setToolTipText("Create light");
755	1241	lightButton.addActionListener(this);
756	1242
757		- for (int i=6; --i>=0;)
758		- {
759		- oe.toolboxPanel.Return();
760		- oe.toolboxPanel.add(new cGridBag());
761		- oe.toolboxPanel.add(new cGridBag());
762		- oe.toolboxPanel.add(new cGridBag());
763		- oe.toolboxPanel.add(new cGridBag());
764		- oe.toolboxPanel.add(new cGridBag());
765		- oe.toolboxPanel.add(new cGridBag());
766		- oe.toolboxPanel.add(new cGridBag());
767		- }
	1243	+ oe.toolboxPanel.add(row2);
	1244	+
	1245	+ cGridBag textures = new cGridBag();
	1246	+
	1247	+ CreateTexturePanel(textures);
	1248	+
	1249	+ oe.toolboxPanel.add(textures);
	1250	+
	1251	+ textures.preferredHeight = 100;
	1252	+
	1253	+ CreateSkyboxPanel(oe.skyboxPanel);
768	1254
769	1255	// EDIT panel
770	1256	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -772,20 +1258,20 @@
772	1258	editButton.addActionListener(this);
773	1259
774	1260	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
775		- uneditButton.setToolTipText("Remove selection controls");
	1261	+ uneditButton.setToolTipText("Unpin and remove selection controls");
776	1262	uneditButton.addActionListener(this);
777	1263
778	1264	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
779		- allParamsButton.setToolTipText("Show all controle");
	1265	+ allParamsButton.setToolTipText("Show all controls");
780	1266	allParamsButton.addActionListener(this);
781	1267
782		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
783		- clearPanelButton.setToolTipText("Clear edit panel");
	1268	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1269	+ clearPanelButton.setToolTipText("Clear all controls");
784	1270	clearPanelButton.addActionListener(this);
785	1271
786		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
787		- unselectButton.setToolTipText("Unselect");
788		- unselectButton.addActionListener(this);
	1272	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1273	+ //unselectButton.setToolTipText("Unselect");
	1274	+ //unselectButton.addActionListener(this);
789	1275
790	1276	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
791	1277	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -820,9 +1306,12 @@
820	1306
821	1307	oe.treePanel.add(copyOptionsPanel);
822	1308	oe.treePanel.Return();
	1309	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1310	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1311	+ sliderPane.preferredHeight = 1;
823	1312
824		-// mainPanel.setDividerLocation(0.5); //1.0);
825		-// mainPanel.setResizeWeight(0.5);
	1313	+// mainPanel.setDividerLocation(0.1); //1.0);
	1314	+ mainPanel.setResizeWeight(0.4);
826	1315
827	1316	//jList.addListSelectionListener(this);
828	1317	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -830,7 +1319,7 @@
830	1319	//jTree.setEditable(true);
831	1320	oe.jTree.setDragEnabled(true);
832	1321	//jTree.setPreferredSize(new Dimension(10,10));
833		- jSP.setPreferredSize(new Dimension(100,200));
	1322	+ //jSP.setPreferredSize(new Dimension(100,200));
834	1323
835	1324	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
836	1325
..	..	@@ -842,7 +1331,7 @@
842	1331	dgr.addDragGestureListener(this);
843	1332	}catch(Exception e) {}
844	1333	*/
845		- radio.layout = sevenButton;
	1334	+ radio.layout = threeButton; // sixButton;
846	1335	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
847	1336	}
848	1337
..	..	@@ -893,9 +1382,12 @@
893	1382	smoothCB.setToolTipText("Snapping delay");
894	1383	smoothCB.addItemListener(this);
895	1384
896		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
897		- slowCB.setToolTipText("Smooth interpolation");
898		- slowCB.addItemListener(this);
	1385	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1386	+// slowCB.setToolTipText("Smooth interpolation");
	1387	+// slowCB.addItemListener(this);
	1388	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1389	+ minshaderCB.setToolTipText("Minimal fast shader");
	1390	+ minshaderCB.addItemListener(this);
899	1391
900	1392	// constraints.gridy += 1;
901	1393	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -945,9 +1437,9 @@
945	1437	toggleSwitchCB.setToolTipText("Choose a single item");
946	1438	toggleSwitchCB.addItemListener(this);
947	1439
948		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
949		- autosaveCB.setToolTipText("On structure change");
950		- autosaveCB.addItemListener(this);
	1440	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1441	+ autokeepCB.setToolTipText("On structure change");
	1442	+ autokeepCB.addItemListener(this);
951	1443
952	1444	panel.Return();
953	1445	if (Globals.ADVANCED)
..	..	@@ -974,6 +1466,14 @@
974	1466
975	1467	void EditObject(Object3D obj)
976	1468	{
	1469	+ assert(obj instanceof Composite);
	1470	+
	1471	+// if (obj.versionlist == null)
	1472	+// {
	1473	+// obj.versionlist = new Object3D[100];
	1474	+// obj.versionindex = -1;
	1475	+// }
	1476	+
977	1477	cRadio radioButton = new cRadio(obj.name);
978	1478
979	1479	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -984,7 +1484,7 @@
984	1484	}
985	1485
986	1486	radioButton.SetObject(obj);
987		- radioButton.layout = sevenButton;
	1487	+ radioButton.layout = threeButton; // sixButton;
988	1488	radioButton.SetCamera(cameraView.renderCamera, false);
989	1489	radioButton.addActionListener(this);
990	1490	radioPanel.add(radioButton);
..	..	@@ -1009,6 +1509,8 @@
1009	1509	cCheckBox localCB;
1010	1510	cCheckBox crowdCB;
1011	1511	cCheckBox smoothCB;
	1512	+ cCheckBox minshaderCB;
	1513	+
1012	1514	cToggleButton fastCB;
1013	1515	cCheckBox slowCB;
1014	1516	cCheckBox boxCB;
..	..	@@ -1024,7 +1526,7 @@
1024	1526
1025	1527	cCheckBox oeilCB;
1026	1528	cCheckBox shadowCB;
1027		- cCheckBox autosaveCB;
	1529	+ cCheckBox autokeepCB;
1028	1530	cCheckBox lookAtCB;
1029	1531
1030	1532	// static int COLOR = 1;
..	..	@@ -1079,6 +1581,12 @@
1079	1581	{
1080	1582	cameraView.ToggleInertia();
1081	1583	cameraView.repaint();
	1584	+ }
	1585	+ else if(e.getSource() == minshaderCB)
	1586	+ {
	1587	+ Globals.MINSHADER ^= true;
	1588	+ cameraView.programInitialized = false;
	1589	+ cameraView.repaint();
1082	1590	}
1083	1591	else if(e.getSource() == localCB)
1084	1592	{
..	..	@@ -1136,9 +1644,9 @@
1136	1644	{
1137	1645	Globals.FREEZEONMOVE ^= true;
1138	1646	}
1139		- else if(e.getSource() == autosaveCB)
	1647	+ else if(e.getSource() == autokeepCB)
1140	1648	{
1141		- Globals.SAVEONMAKE ^= true;
	1649	+ Globals.REPLACEONMAKE ^= true;
1142	1650	}
1143	1651	else if(e.getSource() == lookAtCB)
1144	1652	{
..	..	@@ -1356,7 +1864,12 @@
1356	1864	TreePath path;
1357	1865
1358	1866	public TransferableTreePath(TreePath tp) {
1359		- path = tp;
	1867	+ Object[] objs = new Object[tp.getPathCount()];
	1868	+ for (int i=0; i<objs.length; i++)
	1869	+ {
	1870	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1871	+ }
	1872	+ path = new TreePath(objs);
1360	1873	}
1361	1874
1362	1875	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1663,6 +2176,16 @@
1663	2176	listUI.remove(i);
1664	2177	}
1665	2178	}
	2179	+ }
	2180	+
	2181	+ private void EditElement(Object3D elem, boolean newWindow)
	2182	+ {
	2183	+ // if (!(elem instanceof Composite))
	2184	+ // newWindow = false;
	2185	+ listUI.add(elem);
	2186	+ elem.openEditWindow(this, newWindow); //, false);
	2187	+ System.out.println("edit : " + elem);
	2188	+ elem.editWindow.refreshContents(true); // ? new
1666	2189	}
1667	2190
1668	2191	/**
..	..	@@ -2092,6 +2615,23 @@
2092	2615	{
2093	2616	makeSomething(new Light());
2094	2617	} else
	2618	+// if (source == skybox1Button \|\|
	2619	+// source == skybox2Button \|\|
	2620	+// source == skybox3Button \|\|
	2621	+// source == skybox4Button \|\|
	2622	+// source == skybox5Button \|\|
	2623	+// source == skybox6Button \|\|
	2624	+// source == skybox7Button \|\|
	2625	+// source == skybox11Button \|\|
	2626	+// source == skybox12Button \|\|
	2627	+// source == skybox13Button \|\|
	2628	+// source == skybox14Button \|\|
	2629	+// source == skybox15Button \|\|
	2630	+// source == skybox16Button \|\|
	2631	+// source == skybox17Button)
	2632	+// {
	2633	+// ChangeSkybox(source);
	2634	+// } else
2095	2635	if (source == csgItem)
2096	2636	{
2097	2637	group(new CSG());
..	..	@@ -2177,7 +2717,7 @@
2177	2717	if (source == computeAOItem)
2178	2718	{
2179	2719	Globals.drawMode = CameraPane.OCCLUSION;
2180		- Globals.theRenderer.repaint();
	2720	+ cameraView.repaint();
2181	2721	} else
2182	2722	if (source == recompileItem)
2183	2723	{
..	..	@@ -2192,7 +2732,7 @@
2192	2732	if (source == invariantsItem)
2193	2733	{
2194	2734	System.out.println("Invariants:");
2195		- Grafreed.grafreeD.universe.invariants();
	2735	+ Grafreed.grafreed.universe.invariants();
2196	2736	} else
2197	2737	if (source == memoryItem)
2198	2738	{
..	..	@@ -2223,19 +2763,52 @@
2223	2763	{
2224	2764	ToggleFullScreen();
2225	2765	} else
2226		- if (source == undoButton)
	2766	+ if (source == collapseButton)
2227	2767	{
2228		- if (!Undo())
2229		- java.awt.Toolkit.getDefaultToolkit().beep();
	2768	+ this.expandedLayout = radio.layout;
	2769	+ CollapseToolbar();
2230	2770	} else
2231		- if (source == redoButton)
	2771	+ if (source == maximize3DButton)
2232	2772	{
2233		- Redo();
	2773	+ this.expandedLayout = radio.layout;
	2774	+ radio.layout = twoButton;
	2775	+ Show3DView();
	2776	+ CollapseToolbar();
2234	2777	} else
2235		- if (source == saveButton)
	2778	+ if (source == previousVersionButton)
2236	2779	{
	2780	+ // Go to previous version
	2781	+ //if (!Undo())
	2782	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2783	+ PreviousVersion();
	2784	+ } else
	2785	+ if (source == restoreButton)
	2786	+ {
	2787	+ // Restore current version
	2788	+ Restore();
	2789	+ //restoreButton.setEnabled(false);
	2790	+ } else
	2791	+ if (source == replaceButton)
	2792	+ {
	2793	+ // Overwrite current version
	2794	+ Replace();
	2795	+ //replaceButton.setEnabled(false);
	2796	+ } else
	2797	+ if (source == nextVersionButton)
	2798	+ {
	2799	+ // Go to next version
	2800	+ NextVersion();
	2801	+ } else
	2802	+ if (source == saveVersionButton)
	2803	+ {
	2804	+ // Save a new version
2237	2805	if (!Save(true))
2238	2806	java.awt.Toolkit.getDefaultToolkit().beep();
	2807	+ } else
	2808	+ if (source == deleteVersionButton)
	2809	+ {
	2810	+ // Delete a new version
	2811	+ DeleteVersion();
2239	2812	} else
2240	2813	if (source == oneStepButton)
2241	2814	{
..	..	@@ -2290,11 +2863,11 @@
2290	2863	} else
2291	2864	if (source == undoItem)
2292	2865	{
2293		- Undo();
	2866	+ PreviousVersion();
2294	2867	} else
2295	2868	if (source == redoItem)
2296	2869	{
2297		- Redo();
	2870	+ NextVersion();
2298	2871	} else
2299	2872	if (source == duplicateItem)
2300	2873	{
..	..	@@ -2615,7 +3188,7 @@
2615	3188	{
2616	3189	StepAll();
2617	3190	} else
2618		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3191	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2619	3192	{
2620	3193	//int indices[] = jList.getSelectedIndices();
2621	3194	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -3097,7 +3670,7 @@
3097	3670	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3098	3671	{
3099	3672	obj = (Object3D)e.nextElement();
3100		- obj.SetBumpTexture(null);
	3673	+ obj.ResetBumpTexture();
3101	3674	}
3102	3675
3103	3676	refreshContents();
..	..	@@ -3111,6 +3684,31 @@
3111	3684	obj.SetBumpTexture(obj.GetPigmentTexture());
3112	3685	}
3113	3686
	3687	+ refreshContents();
	3688	+ } else
	3689	+ if (source == embedTexturesItem)
	3690	+ {
	3691	+ Object3D obj;
	3692	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3693	+ {
	3694	+ obj = (Object3D)e.nextElement();
	3695	+ obj.EmbedTextures(true);
	3696	+ }
	3697	+
	3698	+ refreshContents();
	3699	+ } else
	3700	+ if (source == deEmbedTexturesItem)
	3701	+ {
	3702	+ Object3D obj;
	3703	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3704	+ {
	3705	+ obj = (Object3D)e.nextElement();
	3706	+ obj.EmbedTextures(false);
	3707	+ }
	3708	+
	3709	+ CameraPane.texturepigment.clear();
	3710	+ CameraPane.texturebump.clear();
	3711	+
3114	3712	refreshContents();
3115	3713	} else
3116	3714	if (source == flashSelectionButton)
..	..	@@ -3128,38 +3726,7 @@
3128	3726	if (CameraPane.FULLSCREEN)
3129	3727	fullscreenLayout = radio.layout;
3130	3728
3131		- // bug
3132		- //gridPanel.setDividerLocation(1.0);
3133		- //bigPanel.setDividerLocation(0.0);
3134		-// bigThree.remove(scenePanel);
3135		-// bigThree.remove(centralPanel);
3136		-// bigThree.remove(XYZPanel);
3137		-// aWindowConstraints.gridx = 0;
3138		-// aWindowConstraints.gridy = 0;
3139		-// aWindowConstraints.gridwidth = 1;
3140		-// // aConstraints.gridheight = 3;
3141		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3142		-// aWindowConstraints.weightx = 0;
3143		-// aWindowConstraints.weighty = 1;
3144		-// //bigThree.add(jtp, aWindowConstraints);
3145		-// aWindowConstraints.weightx = 1;
3146		-// aWindowConstraints.gridwidth = 3;
3147		-// // aConstraints.gridheight = 3;
3148		-// aWindowConstraints.gridx = 1;
3149		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3150		-// bigThree.add(centralPanel, aWindowConstraints);
3151		-// aWindowConstraints.weightx = 0;
3152		-// aWindowConstraints.gridx = 4;
3153		-// aWindowConstraints.gridwidth = 1;
3154		-// // aConstraints.gridheight = 3;
3155		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3156		-// //bigThree.add(XYZPanel, aWindowConstraints);
3157		-// scenePanel.setVisible(false);
3158		-// centralPanel.setVisible(true);
3159		-// XYZPanel.setVisible(false);
3160		- bigThree.ClearUI();
3161		- bigThree.add(centralPanel);
3162		- bigThree.FlushUI();
	3729	+ Show3DView();
3163	3730
3164	3731	cameraView.requestFocusInWindow();
3165	3732
..	..	@@ -3214,8 +3781,8 @@
3214	3781	// centralPanel.setVisible(true);
3215	3782	// XYZPanel.setVisible(true);
3216	3783	bigThree.ClearUI();
	3784	+ bigThree.add(scenePanel);
3217	3785	bigThree.add(centralPanel);
3218		- bigThree.add(XYZPanel);
3219	3786	bigThree.FlushUI();
3220	3787
3221	3788	cameraView.requestFocusInWindow();
..	..	@@ -3295,8 +3862,8 @@
3295	3862	// centralPanel.setVisible(true);
3296	3863	// XYZPanel.setVisible(false);
3297	3864	bigThree.ClearUI();
3298		- bigThree.add(scenePanel);
3299	3865	bigThree.add(centralPanel);
	3866	+ bigThree.add(scenePanel);
3300	3867	bigThree.FlushUI();
3301	3868
3302	3869	cameraView.requestFocusInWindow();
..	..	@@ -3345,6 +3912,7 @@
3345	3912	} else
3346	3913	if (source == rootButton)
3347	3914	{
	3915	+ Replace();
3348	3916	Object3D obj;
3349	3917	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3350	3918	{
..	..	@@ -3402,10 +3970,10 @@
3402	3970	{
3403	3971	Object3D child = (Object3D)e.nextElement();
3404	3972	if(child.editWindow != null)
3405		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3406	3973	child.pinned = false;
3407	3974	child.CloseUI();
3408	3975	listUI.remove(child);
	3976	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3409	3977
3410	3978	//child.editWindow = null; // ???????????
3411	3979	}
..	..	@@ -3424,6 +3992,7 @@
3424	3992	obj.CloseUI();
3425	3993	}
3426	3994	listUI.clear();
	3995	+ SetPinStates(group.selection.size() > 0);
3427	3996	refreshContents(true);
3428	3997	} else
3429	3998	if (source == allParamsButton)
..	..	@@ -3479,6 +4048,7 @@
3479	4048	}
3480	4049
3481	4050	copy = group;
	4051	+
3482	4052	//Globals.theRenderer.object = group;
3483	4053	if(!useclient)
3484	4054	{
..	..	@@ -3506,9 +4076,24 @@
3506	4076	*/
3507	4077	radio.layout.doClick();
3508	4078
	4079	+ assert(copy instanceof Composite);
	4080	+
	4081	+ if (copy.versionlist == null)
	4082	+ {
	4083	+ copy.versionlist = new Object3D[100];
	4084	+ copy.versionindex = -1;
	4085	+
	4086	+ Save(true);
	4087	+ }
	4088	+
	4089	+ SetVersionStates();
	4090	+
3509	4091	ClearUnpinned();
3510		- SetPinStates(group.selection.size() > 0);
3511		- if (group.selection.size() == 1)
	4092	+
	4093	+ //Grafreed.Assert(group != null);
	4094	+ //Grafreed.Assert(group.selection != null);
	4095	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4096	+ if (group.selection == null \|\| group.selection.size() == 1)
3512	4097	EditSelection(false);
3513	4098	keepparent = group.parent;
3514	4099	// PARENT = NULL or not???
..	..	@@ -3521,11 +4106,13 @@
3521	4106	} else if (event.getSource() == editCameraItem)
3522	4107	{
3523	4108	cameraView.ProtectCamera();
	4109	+ cameraView.requestFocusInWindow();
3524	4110	cameraView.repaint();
3525	4111	return;
3526	4112	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3527	4113	{
3528	4114	cameraView.RevertCamera();
	4115	+ cameraView.requestFocusInWindow();
3529	4116	cameraView.repaint();
3530	4117	return;
3531	4118	// } else if (event.getSource() == textureButton)
..	..	@@ -4102,7 +4689,7 @@
4102	4689
4103	4690	try
4104	4691	{
4105		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4692	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4106	4693	}
4107	4694	catch (Exception e)
4108	4695	{
..	..	@@ -4579,6 +5166,12 @@
4579	5166
4580	5167	void EditSelection(boolean newWindow)
4581	5168	{
	5169	+ if (group.selection == null)
	5170	+ {
	5171	+ EditElement(group, newWindow); // ? new
	5172	+ return;
	5173	+ }
	5174	+
4582	5175	// aConstraints.gridy = 0;
4583	5176	for (int i=0; i<group.selection.size(); i++)
4584	5177	{
..	..	@@ -4589,12 +5182,7 @@
4589	5182	Object3D elem = (Object3D)group.selection.elementAt(i);
4590	5183	if(elem != group \|\| !newWindow)
4591	5184	{
4592		- // if (!(elem instanceof Composite))
4593		- // newWindow = false;
4594		- listUI.add(elem);
4595		- elem.openEditWindow(this, newWindow); //, false);
4596		- System.out.println("edit : " + elem);
4597		- elem.editWindow.refreshContents(true); // ? new
	5185	+ EditElement(elem, newWindow); // ? new
4598	5186	}
4599	5187	}
4600	5188	}
..	..	@@ -4657,9 +5245,7 @@
4657	5245
4658	5246	freezemodel = false;
4659	5247	}
4660		-
4661		- boolean flashIt = true;
4662		-
	5248	+
4663	5249	public void valueChanged(TreeSelectionEvent e)
4664	5250	//public boolean handleEvent(Event event)
4665	5251	{
..	..	@@ -4732,13 +5318,28 @@
4732	5318	{
4733	5319	editButton.setEnabled(enabled);
4734	5320	uneditButton.setEnabled(enabled);
4735		- unselectButton.setEnabled(enabled);
	5321	+ //unselectButton.setEnabled(enabled);
4736	5322	flashSelectionButton.setEnabled(enabled);
	5323	+
	5324	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5325	+
	5326	+ boolean allComposites = true;
	5327	+
	5328	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5329	+ {
	5330	+ if (!(e.nextElement() instanceof Composite))
	5331	+ {
	5332	+ allComposites = false;
	5333	+ break;
	5334	+ }
	5335	+ }
	5336	+
	5337	+ rootButton.setEnabled(allComposites);
4737	5338	}
4738	5339
4739	5340	void refreshContents(boolean cp)
4740	5341	{
4741		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	5342	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4742	5343	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4743	5344	{
4744	5345	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -4748,7 +5349,7 @@
4748	5349	Object3D child = (Object3D) group.selection.get(i);
4749	5350
4750	5351	objEditor.AddInfo(child, this, true);
4751		- System.err.println("info : " + child.GetPath());
	5352	+// System.err.println("info : " + child.GetPath());
4752	5353	}
4753	5354
4754	5355	objEditor.SetText(); // jan 2014
..	..	@@ -4942,10 +5543,10 @@
4942	5543
4943	5544	void paste(boolean expand)
4944	5545	{
4945		- if (Globals.SAVEONMAKE)
	5546	+ if (Globals.REPLACEONMAKE)
4946	5547	Save();
4947		- boolean keep = Globals.SAVEONMAKE;
4948		- Globals.SAVEONMAKE = false;
	5548	+ boolean keep = Globals.REPLACEONMAKE;
	5549	+ Globals.REPLACEONMAKE = false;
4949	5550	// if (GrafreeD.clipboard == null)
4950	5551	// return;
4951	5552	boolean first = true;
..	..	@@ -5005,7 +5606,7 @@
5005	5606	Grafreed.clipboard.get(0).parent = keepparent;
5006	5607	}
5007	5608
5008		- Globals.SAVEONMAKE = keep;
	5609	+ Globals.REPLACEONMAKE = keep;
5009	5610	ResetModel();
5010	5611	refreshContents();
5011	5612	}
..	..	@@ -5141,10 +5742,10 @@
5141	5742
5142	5743	void group(Object3D csg, boolean grab)
5143	5744	{
5144		- if (Globals.SAVEONMAKE)
	5745	+ if (Globals.REPLACEONMAKE)
5145	5746	Save();
5146		- boolean keep = Globals.SAVEONMAKE;
5147		- Globals.SAVEONMAKE = false;
	5747	+ boolean keep = Globals.REPLACEONMAKE;
	5748	+ Globals.REPLACEONMAKE = false;
5148	5749	if (//false) // why??
5149	5750	!group.selection.isEmpty())
5150	5751	{
..	..	@@ -5258,15 +5859,15 @@
5258	5859	//node.add(csg);
5259	5860	//makeSomething(node);
5260	5861	makeSomething(csg);
5261		- Globals.SAVEONMAKE = keep;
	5862	+ Globals.REPLACEONMAKE = keep;
5262	5863	}
5263	5864
5264	5865	void Ungroup(Object3D g)
5265	5866	{
5266		- if (Globals.SAVEONMAKE)
	5867	+ if (Globals.REPLACEONMAKE)
5267	5868	Save();
5268		- boolean keep = Globals.SAVEONMAKE;
5269		- Globals.SAVEONMAKE = false;
	5869	+ boolean keep = Globals.REPLACEONMAKE;
	5870	+ Globals.REPLACEONMAKE = false;
5270	5871	if (g instanceof HiddenObject)
5271	5872	{
5272	5873	HiddenObject h = (HiddenObject) g;
..	..	@@ -5283,7 +5884,7 @@
5283	5884	objEditor.makeSomething(g.get(i), false);
5284	5885	}
5285	5886	}
5286		- Globals.SAVEONMAKE = keep;
	5887	+ Globals.REPLACEONMAKE = keep;
5287	5888	}
5288	5889
5289	5890	void ungroup()
..	..	@@ -5574,7 +6175,6 @@
5574	6175
5575	6176	cButton restoreCameraButton;
5576	6177
5577		- cButton saveButton;
5578	6178	cButton oneStepButton;
5579	6179
5580	6180	cButton groupButton;
..	..	@@ -5583,6 +6183,22 @@
5583	6183	cButton switchButton;
5584	6184	cButton loopButton;
5585	6185	cButton textureButton;
	6186	+
	6187	+ cButton skybox1Button;
	6188	+ cButton skybox2Button;
	6189	+ cButton skybox3Button;
	6190	+ cButton skybox4Button;
	6191	+ cButton skybox5Button;
	6192	+ cButton skybox6Button;
	6193	+ cButton skybox7Button;
	6194	+
	6195	+ cButton skybox11Button;
	6196	+ cButton skybox12Button;
	6197	+ cButton skybox13Button;
	6198	+ cButton skybox14Button;
	6199	+ cButton skybox15Button;
	6200	+ cButton skybox16Button;
	6201	+ cButton skybox17Button;
5586	6202
5587	6203	cButton gridButton;
5588	6204	cButton boxButton;
..	..	@@ -5647,7 +6263,7 @@
5647	6263	private MenuItem pasteLinkItem;
5648	6264	private MenuItem pasteCloneItem;
5649	6265	private MenuItem pasteExpandItem;
5650		- private MenuItem clearItem;
	6266	+ private MenuItem deleteItem;
5651	6267	private MenuItem clearAllItem;
5652	6268	private MenuItem genUVItem;
5653	6269	private MenuItem genNormalsMESHItem;
..	..	@@ -5731,6 +6347,8 @@
5731	6347	private MenuItem attachBumpItem;
5732	6348	private MenuItem detachBumpItem;
5733	6349	private MenuItem pigmentBumpItem;
	6350	+ private MenuItem embedTexturesItem;
	6351	+ private MenuItem deEmbedTexturesItem;
5734	6352
5735	6353	private MenuItem particleItem;
5736	6354	private MenuItem ragdollItem;