~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,14 @@
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	+ Save(true);
	415	+ }
	416	+
63	417	if(ui)
64	418	SetupUI(objEditor);
65	419	}
..	..	@@ -80,14 +434,22 @@
80	434	SetupViews(objEditor);
81	435
82	436	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	437	+
	438	+ if (copy.versionlist == null)
	439	+ {
	440	+ copy.versionlist = new Object3D[100];
	441	+ copy.versionindex = -1;
	442	+
	443	+ Save(true);
	444	+ }
83	445	}
84	446
85	447	void CloneSelection(boolean supports)
86	448	{
87		- if (Globals.SAVEONMAKE)
	449	+ if (Globals.REPLACEONMAKE)
88	450	Save();
89		- boolean keep = Globals.SAVEONMAKE;
90		- Globals.SAVEONMAKE = false;
	451	+ boolean keep = Globals.REPLACEONMAKE;
	452	+ Globals.REPLACEONMAKE = false;
91	453	// Object3D keep = GrafreeD.clipboard;
92	454	//Object3D obj;
93	455	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -98,7 +460,7 @@
98	460
99	461	makeSomething(clone, i==group.selection.size()-1);
100	462	}
101		- Globals.SAVEONMAKE = keep;
	463	+ Globals.REPLACEONMAKE = keep;
102	464	}
103	465
104	466	void CloneClipboard(boolean supports)
..	..	@@ -194,8 +556,8 @@
194	556	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
195	557	// pasteExpandItem.addActionListener(this);
196	558	menu.add("-");
197		- clearItem = menu.add(new MenuItem("Clear"));
198		- clearItem.addActionListener(this);
	559	+ deleteItem = menu.add(new MenuItem("Delete"));
	560	+ deleteItem.addActionListener(this);
199	561
200	562	if (Globals.ADVANCED)
201	563	{
..	..	@@ -281,11 +643,9 @@
281	643	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
282	644	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
283	645	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
284		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
285	646	oe.cameraMenu.add("-");
286	647	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
287	648	openWindowItem.addActionListener(this);
288		- editLeafItem.addActionListener(this);
289	649	lookAtItem.addActionListener(this);
290	650	//lookFromItem.addActinoListener(this);
291	651	//switchViewItem.addActionListener(this);
..	..	@@ -421,7 +781,7 @@
421	781	genNormalsMESHItem.addActionListener(this);
422	782	if (Globals.ADVANCED)
423	783	{
424		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	784	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
425	785	genNormalsMINEItem.addActionListener(this);
426	786	}
427	787	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -514,10 +874,15 @@
514	874	attachBumpItem.addActionListener(this);
515	875	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
516	876	pigmentBumpItem.addActionListener(this);
	877	+ //embedTexturesItem
517	878	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
518	879	detachPigmentItem.addActionListener(this);
519	880	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
520	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);
521	886	menu.add("-");
522	887	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
523	888	sortbysizeItem.addActionListener(this);
..	..	@@ -528,6 +893,9 @@
528	893	shareGeometriesItem.addActionListener(this);
529	894	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
530	895	mergeGeometriesItem.addActionListener(this);
	896	+ menu.add("-");
	897	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	898	+ editLeafItem.addActionListener(this);
531	899	if (Globals.ADVANCED)
532	900	{
533	901	// Pretty much the same as duplicate and clone.
..	..	@@ -544,6 +912,74 @@
544	912	buildToolsMenu(menu);
545	913	}
546	914
	915	+ JTabbedPane resourcecontainer;
	916	+ cGridBag currenttab;
	917	+ boolean added; // patch for jar
	918	+
	919	+ int tabcount = 0;
	920	+ int colcount = 0;
	921	+ int rowcount = 0;
	922	+ int texturecount = 0;
	923	+
	924	+ int columns = 5;
	925	+ int rows = 7;
	926	+
	927	+ public void ResourceCallBack(String[] path)
	928	+ {
	929	+// for (int i = 0; i < path.length; i++)
	930	+// System.out.print(path[i] + "/");
	931	+// System.out.println();
	932	+
	933	+ if (//rowcount == 0 \|\|
	934	+ path.length == 1)
	935	+ {
	936	+ currenttab = new cGridBag();
	937	+ added = false;
	938	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	939	+ currenttab.setName(tabname);
	940	+ rowcount = 1;
	941	+ colcount = 0;
	942	+ texturecount = 0;
	943	+ }
	944	+
	945	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	946	+ {
	947	+ if (!added)
	948	+ {
	949	+ added = true;
	950	+ resourcecontainer.add(currenttab);
	951	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	952	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	953	+ }
	954	+
	955	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	956	+
	957	+ if (++colcount >= columns)
	958	+ {
	959	+ colcount = 0;
	960	+ currenttab.Return();
	961	+
	962	+ if (rowcount++ >= rows)
	963	+ {
	964	+ rowcount = 0;
	965	+ }
	966	+ }
	967	+ }
	968	+ else
	969	+ {
	970	+// if (!path[path.length-1].equals("icons"))
	971	+// resourcecontainer.Return();
	972	+ }
	973	+ }
	974	+
	975	+ void CreateTexturePanel(cGridBag container)
	976	+ {
	977	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	978	+ container.add(resourcecontainer);
	979	+
	980	+ Grafreed.ParseResources("textures", this);
	981	+ }
	982	+
547	983	void SetupUI2(ObjEditor oe)
548	984	{
549	985	// June 2019
..	..	@@ -561,11 +997,6 @@
561	997	//new Exception().printStackTrace();
562	998
563	999	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	1000	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
570	1001
571	1002	oe.buttonGroup = new ButtonGroup();
..	..	@@ -588,7 +1019,7 @@
588	1019	*/
589	1020	cGridBag copyOptionsPanel = new cGridBag();
590	1021
591		- copyOptionsPanel.preferredHeight = 1;
	1022	+ copyOptionsPanel.preferredHeight = 2;
592	1023
593	1024	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
594	1025
..	..	@@ -598,10 +1029,49 @@
598	1029
599	1030	if (Globals.ADVANCED)
600	1031	{
601		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602		- maxButton.setToolTipText("Maximize window");
603		- maxButton.addActionListener(this);
	1032	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1033	+// maxButton.setToolTipText("Maximize window");
	1034	+// maxButton.addActionListener(this);
604	1035	}
	1036	+
	1037	+// cButton gcButton;
	1038	+//
	1039	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1040	+// gcButton.setToolTipText("Garbage collect");
	1041	+// gcButton.addActionListener(new ActionListener()
	1042	+// {
	1043	+// public void actionPerformed(ActionEvent e)
	1044	+// {
	1045	+// System.gc();
	1046	+// }
	1047	+// });
	1048	+
	1049	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1050	+ collapseButton.setToolTipText("Collapse toolbar");
	1051	+ collapseButton.addActionListener(this);
	1052	+
	1053	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1055	+ maximize3DButton.addActionListener(this);
	1056	+
	1057	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+ twoButton.setToolTipText("Show 3D view only");
	1059	+ twoButton.addActionListener(this);
	1060	+ this.fullscreenLayout = twoButton;
	1061	+
	1062	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ threeButton.setToolTipText("Show controls and 3D view");
	1064	+ threeButton.addActionListener(this);
	1065	+ if (Globals.ADVANCED)
	1066	+ {
	1067	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ sixButton.setToolTipText("Show 3D view and controls");
	1069	+ sixButton.addActionListener(this);
	1070	+ }
	1071	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+// sevenButton.setToolTipText("3-column layout");
	1073	+// sevenButton.addActionListener(this);
	1074	+ //
605	1075
606	1076	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
607	1077	fullButton.setToolTipText("Full-screen window");
..	..	@@ -615,29 +1085,46 @@
615	1085	restoreCameraButton.setToolTipText("Restore viewpoint");
616	1086	restoreCameraButton.addActionListener(this);
617	1087
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);
	1088	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ saveVersionButton.setToolTipText("Duplicate current version");
	1090	+ saveVersionButton.addActionListener(this);
	1091	+
	1092	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ deleteVersionButton.setToolTipText("Delete current version");
	1094	+ deleteVersionButton.addActionListener(this);
	1095	+
	1096	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1097	+ previousVersionButton.setToolTipText("Previous version");
	1098	+ previousVersionButton.addActionListener(this);
	1099	+ previousVersionButton.setEnabled(false);
622	1100
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);
	1101	+ cGridBag updown = new cGridBag().setVertical(true);
	1102	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ restoreButton.setToolTipText("Undo (restore current version)");
	1104	+ restoreButton.addActionListener(this);
	1105	+ //restoreButton.setEnabled(false);
627	1106
628		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629		- saveButton.setToolTipText("Save changes");
630		- saveButton.addActionListener(this);
	1107	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1108	+ replaceButton.setToolTipText("Save (replace current version)");
	1109	+ replaceButton.addActionListener(this);
	1110	+ //replaceButton.setEnabled(false);
631	1111
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);
	1112	+ copyOptionsPanel.add(updown);
	1113	+
	1114	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1115	+ nextVersionButton.setToolTipText("Next version");
	1116	+ nextVersionButton.addActionListener(this);
	1117	+ nextVersionButton.setEnabled(false);
	1118	+
	1119	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
637	1120	oneStepButton.setToolTipText("Animate one step forward");
638	1121	oneStepButton.addActionListener(this);
639	1122
640		- copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1123	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1124	+ liveCB.setToolTipText("Enable animation");
	1125	+ liveCB.addItemListener(this);
	1126	+
	1127	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
641	1128	fastCB.setToolTipText("Fast mode");
642	1129	fastCB.addItemListener(this);
643	1130
..	..	@@ -655,31 +1142,17 @@
655	1142	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
656	1143	snapobjectButton.addActionListener(this);
657	1144	snapobjectButton.setToolTipText("Snap Object");
	1145	+
	1146	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1147	+ fourButton.addActionListener(this);
	1148	+ fourButton.setToolTipText("Show control panel only");
658	1149	}
659	1150
660	1151	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
661	1152
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	1153
681		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682		- rootButton.setToolTipText("Edit selection in new tab");
	1154	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1155	+ rootButton.setToolTipText("Open selection in new tab");
683	1156	rootButton.addActionListener(this);
684	1157
685	1158	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -688,28 +1161,30 @@
688	1161	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
689	1162	//clearButton.addActionListener(this);
690	1163
	1164	+ cGridBag row1 = new cGridBag();
	1165	+
691	1166	// INSERT
692		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
693		- gridButton.setToolTipText("Create grid");
	1167	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1168	+ gridButton.setToolTipText("Create ground");
694	1169	gridButton.addActionListener(this);
695	1170
696		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1171	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
697	1172	boxButton.setToolTipText("Create box");
698	1173	boxButton.addActionListener(this);
699	1174
700		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1175	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
701	1176	sphereButton.setToolTipText("Create sphere");
702	1177	sphereButton.addActionListener(this);
703	1178
704		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1179	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
705	1180	coneButton.setToolTipText("Create cone");
706	1181	coneButton.addActionListener(this);
707	1182
708		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1183	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
709	1184	torusButton.setToolTipText("Create torus");
710	1185	torusButton.addActionListener(this);
711	1186
712		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1187	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
713	1188	superButton.setToolTipText("Create superellipsoid");
714	1189	superButton.addActionListener(this);
715	1190
..	..	@@ -720,51 +1195,53 @@
720	1195	kleinButton.addActionListener(this);
721	1196	}
722	1197
723		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
724	1199	particlesButton.setToolTipText("Create particle system");
725	1200	particlesButton.addActionListener(this);
726	1201
727		- oe.toolboxPanel.Return();
	1202	+ oe.toolboxPanel.add(row1);
728	1203
729		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1204	+ cGridBag row2 = new cGridBag();
	1205	+
	1206	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
730	1207	groupButton.setToolTipText("Create group");
731	1208	groupButton.addActionListener(this);
732	1209
733		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
734	1211	compositeButton.setToolTipText("Create composite");
735	1212	compositeButton.addActionListener(this);
736	1213
737		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1214	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
738	1215	switchButton.setToolTipText("Create item switcher");
739	1216	switchButton.addActionListener(this);
740	1217
741		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1218	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
742	1219	loopButton.setToolTipText("Create loop");
743	1220	loopButton.addActionListener(this);
744	1221
745		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1222	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
746	1223	textureButton.setToolTipText("Create texture");
747	1224	textureButton.addActionListener(this);
748	1225
749		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1226	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
750	1227	overlayButton.setToolTipText("Create overlay");
751	1228	overlayButton.addActionListener(this);
752	1229
753		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1230	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
754	1231	lightButton.setToolTipText("Create light");
755	1232	lightButton.addActionListener(this);
756	1233
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		- }
	1234	+ oe.toolboxPanel.add(row2);
	1235	+
	1236	+ cGridBag textures = new cGridBag();
	1237	+
	1238	+ CreateTexturePanel(textures);
	1239	+
	1240	+ oe.toolboxPanel.add(textures);
	1241	+
	1242	+ textures.preferredHeight = 100;
	1243	+
	1244	+ CreateSkyboxPanel(oe.skyboxPanel);
768	1245
769	1246	// EDIT panel
770	1247	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -772,20 +1249,20 @@
772	1249	editButton.addActionListener(this);
773	1250
774	1251	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
775		- uneditButton.setToolTipText("Remove selection controls");
	1252	+ uneditButton.setToolTipText("Unpin and remove selection controls");
776	1253	uneditButton.addActionListener(this);
777	1254
778	1255	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
779		- allParamsButton.setToolTipText("Show all controle");
	1256	+ allParamsButton.setToolTipText("Show all controls");
780	1257	allParamsButton.addActionListener(this);
781	1258
782		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
783		- clearPanelButton.setToolTipText("Clear edit panel");
	1259	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1260	+ clearPanelButton.setToolTipText("Clear all controls");
784	1261	clearPanelButton.addActionListener(this);
785	1262
786		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
787		- unselectButton.setToolTipText("Unselect");
788		- unselectButton.addActionListener(this);
	1263	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1264	+ //unselectButton.setToolTipText("Unselect");
	1265	+ //unselectButton.addActionListener(this);
789	1266
790	1267	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
791	1268	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -820,9 +1297,12 @@
820	1297
821	1298	oe.treePanel.add(copyOptionsPanel);
822	1299	oe.treePanel.Return();
	1300	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1301	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1302	+ sliderPane.preferredHeight = 1;
823	1303
824		-// mainPanel.setDividerLocation(0.5); //1.0);
825		-// mainPanel.setResizeWeight(0.5);
	1304	+// mainPanel.setDividerLocation(0.1); //1.0);
	1305	+ mainPanel.setResizeWeight(0.4);
826	1306
827	1307	//jList.addListSelectionListener(this);
828	1308	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -830,7 +1310,7 @@
830	1310	//jTree.setEditable(true);
831	1311	oe.jTree.setDragEnabled(true);
832	1312	//jTree.setPreferredSize(new Dimension(10,10));
833		- jSP.setPreferredSize(new Dimension(100,200));
	1313	+ //jSP.setPreferredSize(new Dimension(100,200));
834	1314
835	1315	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
836	1316
..	..	@@ -842,7 +1322,7 @@
842	1322	dgr.addDragGestureListener(this);
843	1323	}catch(Exception e) {}
844	1324	*/
845		- radio.layout = sevenButton;
	1325	+ radio.layout = threeButton; // sixButton;
846	1326	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
847	1327	}
848	1328
..	..	@@ -893,9 +1373,12 @@
893	1373	smoothCB.setToolTipText("Snapping delay");
894	1374	smoothCB.addItemListener(this);
895	1375
896		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
897		- slowCB.setToolTipText("Smooth interpolation");
898		- slowCB.addItemListener(this);
	1376	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1377	+// slowCB.setToolTipText("Smooth interpolation");
	1378	+// slowCB.addItemListener(this);
	1379	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1380	+ minshaderCB.setToolTipText("Minimal fast shader");
	1381	+ minshaderCB.addItemListener(this);
899	1382
900	1383	// constraints.gridy += 1;
901	1384	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -945,9 +1428,9 @@
945	1428	toggleSwitchCB.setToolTipText("Choose a single item");
946	1429	toggleSwitchCB.addItemListener(this);
947	1430
948		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
949		- autosaveCB.setToolTipText("On structure change");
950		- autosaveCB.addItemListener(this);
	1431	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1432	+ autokeepCB.setToolTipText("On structure change");
	1433	+ autokeepCB.addItemListener(this);
951	1434
952	1435	panel.Return();
953	1436	if (Globals.ADVANCED)
..	..	@@ -974,6 +1457,14 @@
974	1457
975	1458	void EditObject(Object3D obj)
976	1459	{
	1460	+ assert(obj instanceof Composite);
	1461	+
	1462	+ if (obj.versionlist == null)
	1463	+ {
	1464	+ obj.versionlist = new Object3D[100];
	1465	+ obj.versionindex = -1;
	1466	+ }
	1467	+
977	1468	cRadio radioButton = new cRadio(obj.name);
978	1469
979	1470	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -984,7 +1475,7 @@
984	1475	}
985	1476
986	1477	radioButton.SetObject(obj);
987		- radioButton.layout = sevenButton;
	1478	+ radioButton.layout = threeButton; // sixButton;
988	1479	radioButton.SetCamera(cameraView.renderCamera, false);
989	1480	radioButton.addActionListener(this);
990	1481	radioPanel.add(radioButton);
..	..	@@ -1009,6 +1500,8 @@
1009	1500	cCheckBox localCB;
1010	1501	cCheckBox crowdCB;
1011	1502	cCheckBox smoothCB;
	1503	+ cCheckBox minshaderCB;
	1504	+
1012	1505	cToggleButton fastCB;
1013	1506	cCheckBox slowCB;
1014	1507	cCheckBox boxCB;
..	..	@@ -1024,7 +1517,7 @@
1024	1517
1025	1518	cCheckBox oeilCB;
1026	1519	cCheckBox shadowCB;
1027		- cCheckBox autosaveCB;
	1520	+ cCheckBox autokeepCB;
1028	1521	cCheckBox lookAtCB;
1029	1522
1030	1523	// static int COLOR = 1;
..	..	@@ -1079,6 +1572,12 @@
1079	1572	{
1080	1573	cameraView.ToggleInertia();
1081	1574	cameraView.repaint();
	1575	+ }
	1576	+ else if(e.getSource() == minshaderCB)
	1577	+ {
	1578	+ Globals.MINSHADER ^= true;
	1579	+ cameraView.programInitialized = false;
	1580	+ cameraView.repaint();
1082	1581	}
1083	1582	else if(e.getSource() == localCB)
1084	1583	{
..	..	@@ -1136,9 +1635,9 @@
1136	1635	{
1137	1636	Globals.FREEZEONMOVE ^= true;
1138	1637	}
1139		- else if(e.getSource() == autosaveCB)
	1638	+ else if(e.getSource() == autokeepCB)
1140	1639	{
1141		- Globals.SAVEONMAKE ^= true;
	1640	+ Globals.REPLACEONMAKE ^= true;
1142	1641	}
1143	1642	else if(e.getSource() == lookAtCB)
1144	1643	{
..	..	@@ -1356,7 +1855,12 @@
1356	1855	TreePath path;
1357	1856
1358	1857	public TransferableTreePath(TreePath tp) {
1359		- path = tp;
	1858	+ Object[] objs = new Object[tp.getPathCount()];
	1859	+ for (int i=0; i<objs.length; i++)
	1860	+ {
	1861	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1862	+ }
	1863	+ path = new TreePath(objs);
1360	1864	}
1361	1865
1362	1866	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1663,6 +2167,16 @@
1663	2167	listUI.remove(i);
1664	2168	}
1665	2169	}
	2170	+ }
	2171	+
	2172	+ private void EditElement(Object3D elem, boolean newWindow)
	2173	+ {
	2174	+ // if (!(elem instanceof Composite))
	2175	+ // newWindow = false;
	2176	+ listUI.add(elem);
	2177	+ elem.openEditWindow(this, newWindow); //, false);
	2178	+ System.out.println("edit : " + elem);
	2179	+ elem.editWindow.refreshContents(true); // ? new
1666	2180	}
1667	2181
1668	2182	/**
..	..	@@ -2092,6 +2606,23 @@
2092	2606	{
2093	2607	makeSomething(new Light());
2094	2608	} else
	2609	+// if (source == skybox1Button \|\|
	2610	+// source == skybox2Button \|\|
	2611	+// source == skybox3Button \|\|
	2612	+// source == skybox4Button \|\|
	2613	+// source == skybox5Button \|\|
	2614	+// source == skybox6Button \|\|
	2615	+// source == skybox7Button \|\|
	2616	+// source == skybox11Button \|\|
	2617	+// source == skybox12Button \|\|
	2618	+// source == skybox13Button \|\|
	2619	+// source == skybox14Button \|\|
	2620	+// source == skybox15Button \|\|
	2621	+// source == skybox16Button \|\|
	2622	+// source == skybox17Button)
	2623	+// {
	2624	+// ChangeSkybox(source);
	2625	+// } else
2095	2626	if (source == csgItem)
2096	2627	{
2097	2628	group(new CSG());
..	..	@@ -2177,7 +2708,7 @@
2177	2708	if (source == computeAOItem)
2178	2709	{
2179	2710	Globals.drawMode = CameraPane.OCCLUSION;
2180		- Globals.theRenderer.repaint();
	2711	+ cameraView.repaint();
2181	2712	} else
2182	2713	if (source == recompileItem)
2183	2714	{
..	..	@@ -2192,7 +2723,7 @@
2192	2723	if (source == invariantsItem)
2193	2724	{
2194	2725	System.out.println("Invariants:");
2195		- Grafreed.grafreeD.universe.invariants();
	2726	+ Grafreed.grafreed.universe.invariants();
2196	2727	} else
2197	2728	if (source == memoryItem)
2198	2729	{
..	..	@@ -2223,19 +2754,52 @@
2223	2754	{
2224	2755	ToggleFullScreen();
2225	2756	} else
2226		- if (source == undoButton)
	2757	+ if (source == collapseButton)
2227	2758	{
2228		- if (!Undo())
2229		- java.awt.Toolkit.getDefaultToolkit().beep();
	2759	+ this.expandedLayout = radio.layout;
	2760	+ CollapseToolbar();
2230	2761	} else
2231		- if (source == redoButton)
	2762	+ if (source == maximize3DButton)
2232	2763	{
2233		- Redo();
	2764	+ this.expandedLayout = radio.layout;
	2765	+ radio.layout = twoButton;
	2766	+ Show3DView();
	2767	+ CollapseToolbar();
2234	2768	} else
2235		- if (source == saveButton)
	2769	+ if (source == previousVersionButton)
2236	2770	{
	2771	+ // Go to previous version
	2772	+ //if (!Undo())
	2773	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2774	+ PreviousVersion();
	2775	+ } else
	2776	+ if (source == restoreButton)
	2777	+ {
	2778	+ // Restore current version
	2779	+ Restore();
	2780	+ //restoreButton.setEnabled(false);
	2781	+ } else
	2782	+ if (source == replaceButton)
	2783	+ {
	2784	+ // Overwrite current version
	2785	+ Replace();
	2786	+ //replaceButton.setEnabled(false);
	2787	+ } else
	2788	+ if (source == nextVersionButton)
	2789	+ {
	2790	+ // Go to next version
	2791	+ NextVersion();
	2792	+ } else
	2793	+ if (source == saveVersionButton)
	2794	+ {
	2795	+ // Save a new version
2237	2796	if (!Save(true))
2238	2797	java.awt.Toolkit.getDefaultToolkit().beep();
	2798	+ } else
	2799	+ if (source == deleteVersionButton)
	2800	+ {
	2801	+ // Delete a new version
	2802	+ DeleteVersion();
2239	2803	} else
2240	2804	if (source == oneStepButton)
2241	2805	{
..	..	@@ -2290,11 +2854,11 @@
2290	2854	} else
2291	2855	if (source == undoItem)
2292	2856	{
2293		- Undo();
	2857	+ PreviousVersion();
2294	2858	} else
2295	2859	if (source == redoItem)
2296	2860	{
2297		- Redo();
	2861	+ NextVersion();
2298	2862	} else
2299	2863	if (source == duplicateItem)
2300	2864	{
..	..	@@ -2615,7 +3179,7 @@
2615	3179	{
2616	3180	StepAll();
2617	3181	} else
2618		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3182	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2619	3183	{
2620	3184	//int indices[] = jList.getSelectedIndices();
2621	3185	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -3097,7 +3661,7 @@
3097	3661	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3098	3662	{
3099	3663	obj = (Object3D)e.nextElement();
3100		- obj.SetBumpTexture(null);
	3664	+ obj.ResetBumpTexture();
3101	3665	}
3102	3666
3103	3667	refreshContents();
..	..	@@ -3111,6 +3675,31 @@
3111	3675	obj.SetBumpTexture(obj.GetPigmentTexture());
3112	3676	}
3113	3677
	3678	+ refreshContents();
	3679	+ } else
	3680	+ if (source == embedTexturesItem)
	3681	+ {
	3682	+ Object3D obj;
	3683	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3684	+ {
	3685	+ obj = (Object3D)e.nextElement();
	3686	+ obj.EmbedTextures(true);
	3687	+ }
	3688	+
	3689	+ refreshContents();
	3690	+ } else
	3691	+ if (source == deEmbedTexturesItem)
	3692	+ {
	3693	+ Object3D obj;
	3694	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3695	+ {
	3696	+ obj = (Object3D)e.nextElement();
	3697	+ obj.EmbedTextures(false);
	3698	+ }
	3699	+
	3700	+ CameraPane.texturepigment.clear();
	3701	+ CameraPane.texturebump.clear();
	3702	+
3114	3703	refreshContents();
3115	3704	} else
3116	3705	if (source == flashSelectionButton)
..	..	@@ -3128,38 +3717,7 @@
3128	3717	if (CameraPane.FULLSCREEN)
3129	3718	fullscreenLayout = radio.layout;
3130	3719
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();
	3720	+ Show3DView();
3163	3721
3164	3722	cameraView.requestFocusInWindow();
3165	3723
..	..	@@ -3214,8 +3772,8 @@
3214	3772	// centralPanel.setVisible(true);
3215	3773	// XYZPanel.setVisible(true);
3216	3774	bigThree.ClearUI();
	3775	+ bigThree.add(scenePanel);
3217	3776	bigThree.add(centralPanel);
3218		- bigThree.add(XYZPanel);
3219	3777	bigThree.FlushUI();
3220	3778
3221	3779	cameraView.requestFocusInWindow();
..	..	@@ -3295,8 +3853,8 @@
3295	3853	// centralPanel.setVisible(true);
3296	3854	// XYZPanel.setVisible(false);
3297	3855	bigThree.ClearUI();
3298		- bigThree.add(scenePanel);
3299	3856	bigThree.add(centralPanel);
	3857	+ bigThree.add(scenePanel);
3300	3858	bigThree.FlushUI();
3301	3859
3302	3860	cameraView.requestFocusInWindow();
..	..	@@ -3345,6 +3903,7 @@
3345	3903	} else
3346	3904	if (source == rootButton)
3347	3905	{
	3906	+ Replace();
3348	3907	Object3D obj;
3349	3908	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3350	3909	{
..	..	@@ -3402,10 +3961,10 @@
3402	3961	{
3403	3962	Object3D child = (Object3D)e.nextElement();
3404	3963	if(child.editWindow != null)
3405		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3406	3964	child.pinned = false;
3407	3965	child.CloseUI();
3408	3966	listUI.remove(child);
	3967	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3409	3968
3410	3969	//child.editWindow = null; // ???????????
3411	3970	}
..	..	@@ -3424,6 +3983,7 @@
3424	3983	obj.CloseUI();
3425	3984	}
3426	3985	listUI.clear();
	3986	+ SetPinStates(group.selection.size() > 0);
3427	3987	refreshContents(true);
3428	3988	} else
3429	3989	if (source == allParamsButton)
..	..	@@ -3479,6 +4039,7 @@
3479	4039	}
3480	4040
3481	4041	copy = group;
	4042	+
3482	4043	//Globals.theRenderer.object = group;
3483	4044	if(!useclient)
3484	4045	{
..	..	@@ -3506,9 +4067,14 @@
3506	4067	*/
3507	4068	radio.layout.doClick();
3508	4069
	4070	+ SetUndoStates();
	4071	+
3509	4072	ClearUnpinned();
3510		- SetPinStates(group.selection.size() > 0);
3511		- if (group.selection.size() == 1)
	4073	+
	4074	+ //Grafreed.Assert(group != null);
	4075	+ //Grafreed.Assert(group.selection != null);
	4076	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4077	+ if (group.selection == null \|\| group.selection.size() == 1)
3512	4078	EditSelection(false);
3513	4079	keepparent = group.parent;
3514	4080	// PARENT = NULL or not???
..	..	@@ -3521,11 +4087,13 @@
3521	4087	} else if (event.getSource() == editCameraItem)
3522	4088	{
3523	4089	cameraView.ProtectCamera();
	4090	+ cameraView.requestFocusInWindow();
3524	4091	cameraView.repaint();
3525	4092	return;
3526	4093	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3527	4094	{
3528	4095	cameraView.RevertCamera();
	4096	+ cameraView.requestFocusInWindow();
3529	4097	cameraView.repaint();
3530	4098	return;
3531	4099	// } else if (event.getSource() == textureButton)
..	..	@@ -4102,7 +4670,7 @@
4102	4670
4103	4671	try
4104	4672	{
4105		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4673	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4106	4674	}
4107	4675	catch (Exception e)
4108	4676	{
..	..	@@ -4579,6 +5147,12 @@
4579	5147
4580	5148	void EditSelection(boolean newWindow)
4581	5149	{
	5150	+ if (group.selection == null)
	5151	+ {
	5152	+ EditElement(group, newWindow); // ? new
	5153	+ return;
	5154	+ }
	5155	+
4582	5156	// aConstraints.gridy = 0;
4583	5157	for (int i=0; i<group.selection.size(); i++)
4584	5158	{
..	..	@@ -4589,12 +5163,7 @@
4589	5163	Object3D elem = (Object3D)group.selection.elementAt(i);
4590	5164	if(elem != group \|\| !newWindow)
4591	5165	{
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
	5166	+ EditElement(elem, newWindow); // ? new
4598	5167	}
4599	5168	}
4600	5169	}
..	..	@@ -4657,9 +5226,7 @@
4657	5226
4658	5227	freezemodel = false;
4659	5228	}
4660		-
4661		- boolean flashIt = true;
4662		-
	5229	+
4663	5230	public void valueChanged(TreeSelectionEvent e)
4664	5231	//public boolean handleEvent(Event event)
4665	5232	{
..	..	@@ -4732,13 +5299,28 @@
4732	5299	{
4733	5300	editButton.setEnabled(enabled);
4734	5301	uneditButton.setEnabled(enabled);
4735		- unselectButton.setEnabled(enabled);
	5302	+ //unselectButton.setEnabled(enabled);
4736	5303	flashSelectionButton.setEnabled(enabled);
	5304	+
	5305	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5306	+
	5307	+ boolean allComposites = true;
	5308	+
	5309	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5310	+ {
	5311	+ if (!(e.nextElement() instanceof Composite))
	5312	+ {
	5313	+ allComposites = false;
	5314	+ break;
	5315	+ }
	5316	+ }
	5317	+
	5318	+ rootButton.setEnabled(allComposites);
4737	5319	}
4738	5320
4739	5321	void refreshContents(boolean cp)
4740	5322	{
4741		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	5323	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4742	5324	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4743	5325	{
4744	5326	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -4748,7 +5330,7 @@
4748	5330	Object3D child = (Object3D) group.selection.get(i);
4749	5331
4750	5332	objEditor.AddInfo(child, this, true);
4751		- System.err.println("info : " + child.GetPath());
	5333	+// System.err.println("info : " + child.GetPath());
4752	5334	}
4753	5335
4754	5336	objEditor.SetText(); // jan 2014
..	..	@@ -4942,10 +5524,10 @@
4942	5524
4943	5525	void paste(boolean expand)
4944	5526	{
4945		- if (Globals.SAVEONMAKE)
	5527	+ if (Globals.REPLACEONMAKE)
4946	5528	Save();
4947		- boolean keep = Globals.SAVEONMAKE;
4948		- Globals.SAVEONMAKE = false;
	5529	+ boolean keep = Globals.REPLACEONMAKE;
	5530	+ Globals.REPLACEONMAKE = false;
4949	5531	// if (GrafreeD.clipboard == null)
4950	5532	// return;
4951	5533	boolean first = true;
..	..	@@ -5005,7 +5587,7 @@
5005	5587	Grafreed.clipboard.get(0).parent = keepparent;
5006	5588	}
5007	5589
5008		- Globals.SAVEONMAKE = keep;
	5590	+ Globals.REPLACEONMAKE = keep;
5009	5591	ResetModel();
5010	5592	refreshContents();
5011	5593	}
..	..	@@ -5141,10 +5723,10 @@
5141	5723
5142	5724	void group(Object3D csg, boolean grab)
5143	5725	{
5144		- if (Globals.SAVEONMAKE)
	5726	+ if (Globals.REPLACEONMAKE)
5145	5727	Save();
5146		- boolean keep = Globals.SAVEONMAKE;
5147		- Globals.SAVEONMAKE = false;
	5728	+ boolean keep = Globals.REPLACEONMAKE;
	5729	+ Globals.REPLACEONMAKE = false;
5148	5730	if (//false) // why??
5149	5731	!group.selection.isEmpty())
5150	5732	{
..	..	@@ -5258,15 +5840,15 @@
5258	5840	//node.add(csg);
5259	5841	//makeSomething(node);
5260	5842	makeSomething(csg);
5261		- Globals.SAVEONMAKE = keep;
	5843	+ Globals.REPLACEONMAKE = keep;
5262	5844	}
5263	5845
5264	5846	void Ungroup(Object3D g)
5265	5847	{
5266		- if (Globals.SAVEONMAKE)
	5848	+ if (Globals.REPLACEONMAKE)
5267	5849	Save();
5268		- boolean keep = Globals.SAVEONMAKE;
5269		- Globals.SAVEONMAKE = false;
	5850	+ boolean keep = Globals.REPLACEONMAKE;
	5851	+ Globals.REPLACEONMAKE = false;
5270	5852	if (g instanceof HiddenObject)
5271	5853	{
5272	5854	HiddenObject h = (HiddenObject) g;
..	..	@@ -5283,7 +5865,7 @@
5283	5865	objEditor.makeSomething(g.get(i), false);
5284	5866	}
5285	5867	}
5286		- Globals.SAVEONMAKE = keep;
	5868	+ Globals.REPLACEONMAKE = keep;
5287	5869	}
5288	5870
5289	5871	void ungroup()
..	..	@@ -5574,7 +6156,6 @@
5574	6156
5575	6157	cButton restoreCameraButton;
5576	6158
5577		- cButton saveButton;
5578	6159	cButton oneStepButton;
5579	6160
5580	6161	cButton groupButton;
..	..	@@ -5583,6 +6164,22 @@
5583	6164	cButton switchButton;
5584	6165	cButton loopButton;
5585	6166	cButton textureButton;
	6167	+
	6168	+ cButton skybox1Button;
	6169	+ cButton skybox2Button;
	6170	+ cButton skybox3Button;
	6171	+ cButton skybox4Button;
	6172	+ cButton skybox5Button;
	6173	+ cButton skybox6Button;
	6174	+ cButton skybox7Button;
	6175	+
	6176	+ cButton skybox11Button;
	6177	+ cButton skybox12Button;
	6178	+ cButton skybox13Button;
	6179	+ cButton skybox14Button;
	6180	+ cButton skybox15Button;
	6181	+ cButton skybox16Button;
	6182	+ cButton skybox17Button;
5586	6183
5587	6184	cButton gridButton;
5588	6185	cButton boxButton;
..	..	@@ -5647,7 +6244,7 @@
5647	6244	private MenuItem pasteLinkItem;
5648	6245	private MenuItem pasteCloneItem;
5649	6246	private MenuItem pasteExpandItem;
5650		- private MenuItem clearItem;
	6247	+ private MenuItem deleteItem;
5651	6248	private MenuItem clearAllItem;
5652	6249	private MenuItem genUVItem;
5653	6250	private MenuItem genNormalsMESHItem;
..	..	@@ -5731,6 +6328,8 @@
5731	6328	private MenuItem attachBumpItem;
5732	6329	private MenuItem detachBumpItem;
5733	6330	private MenuItem pigmentBumpItem;
	6331	+ private MenuItem embedTexturesItem;
	6332	+ private MenuItem deEmbedTexturesItem;
5734	6333
5735	6334	private MenuItem particleItem;
5736	6335	private MenuItem ragdollItem;