~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,341 @@
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	+
26	362	//ObjEditor objEditor;
27	363	public void closeUI2()
28	364	{
..	..	@@ -60,6 +396,12 @@
60	396	this.copy = this.group = group;
61	397	//selectees = this.group.selectees;
62	398
	399	+ if (copy.versionlist == null)
	400	+ {
	401	+ copy.versionlist = new Object3D[100];
	402	+ copy.versionindex = -1;
	403	+ }
	404	+
63	405	if(ui)
64	406	SetupUI(objEditor);
65	407	}
..	..	@@ -80,10 +422,22 @@
80	422	SetupViews(objEditor);
81	423
82	424	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	425	+
	426	+ if (copy.versionlist == null)
	427	+ {
	428	+ copy.versionlist = new Object3D[100];
	429	+ copy.versionindex = -1;
	430	+
	431	+ Save(true);
	432	+ }
83	433	}
84	434
85	435	void CloneSelection(boolean supports)
86	436	{
	437	+ if (Globals.REPLACEONMAKE)
	438	+ Save();
	439	+ boolean keep = Globals.REPLACEONMAKE;
	440	+ Globals.REPLACEONMAKE = false;
87	441	// Object3D keep = GrafreeD.clipboard;
88	442	//Object3D obj;
89	443	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +448,7 @@
94	448
95	449	makeSomething(clone, i==group.selection.size()-1);
96	450	}
	451	+ Globals.REPLACEONMAKE = keep;
97	452	}
98	453
99	454	void CloneClipboard(boolean supports)
..	..	@@ -189,8 +544,8 @@
189	544	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
190	545	// pasteExpandItem.addActionListener(this);
191	546	menu.add("-");
192		- clearItem = menu.add(new MenuItem("Clear"));
193		- clearItem.addActionListener(this);
	547	+ deleteItem = menu.add(new MenuItem("Delete"));
	548	+ deleteItem.addActionListener(this);
194	549
195	550	if (Globals.ADVANCED)
196	551	{
..	..	@@ -220,7 +575,7 @@
220	575	// toggleSwitchItem.addItemListener(this);
221	576	// toggleSwitchItem.setState(CameraPane.SWITCH);
222	577
223		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	578	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
224	579	toggleHandleItem.addItemListener(this);
225	580	toggleHandleItem.setState(CameraPane.HANDLES);
226	581
..	..	@@ -380,13 +735,14 @@
380	735	shadowYItem.addActionListener(this);
381	736	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
382	737	shadowZItem.addActionListener(this);
	738	+ attributeItem = menu.add(new MenuItem("Attribute"));
	739	+ attributeItem.addActionListener(this);
	740	+
383	741	if (Globals.ADVANCED)
384	742	{
385	743	menu.add("-");
386	744	linkerItem = menu.add(new MenuItem("Linker"));
387	745	linkerItem.addActionListener(this);
388		- attributeItem = menu.add(new MenuItem("Attribute"));
389		- attributeItem.addActionListener(this);
390	746	templateItem = menu.add(new MenuItem("Template"));
391	747	templateItem.addActionListener(this);
392	748	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -415,7 +771,7 @@
415	771	genNormalsMESHItem.addActionListener(this);
416	772	if (Globals.ADVANCED)
417	773	{
418		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	774	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
419	775	genNormalsMINEItem.addActionListener(this);
420	776	}
421	777	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -508,10 +864,15 @@
508	864	attachBumpItem.addActionListener(this);
509	865	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
510	866	pigmentBumpItem.addActionListener(this);
	867	+ //embedTexturesItem
511	868	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
512	869	detachPigmentItem.addActionListener(this);
513	870	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
514	871	detachBumpItem.addActionListener(this);
	872	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	873	+ embedTexturesItem.addActionListener(this);
	874	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	875	+ deEmbedTexturesItem.addActionListener(this);
515	876	menu.add("-");
516	877	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
517	878	sortbysizeItem.addActionListener(this);
..	..	@@ -538,6 +899,74 @@
538	899	buildToolsMenu(menu);
539	900	}
540	901
	902	+ JTabbedPane resourcecontainer;
	903	+ cGridBag currenttab;
	904	+ boolean added; // patch for jar
	905	+
	906	+ int tabcount = 0;
	907	+ int colcount = 0;
	908	+ int rowcount = 0;
	909	+ int texturecount = 0;
	910	+
	911	+ int columns = 5;
	912	+ int rows = 7;
	913	+
	914	+ public void ResourceCallBack(String[] path)
	915	+ {
	916	+// for (int i = 0; i < path.length; i++)
	917	+// System.out.print(path[i] + "/");
	918	+// System.out.println();
	919	+
	920	+ if (//rowcount == 0 \|\|
	921	+ path.length == 1)
	922	+ {
	923	+ currenttab = new cGridBag();
	924	+ added = false;
	925	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	926	+ currenttab.setName(tabname);
	927	+ rowcount = 1;
	928	+ colcount = 0;
	929	+ texturecount = 0;
	930	+ }
	931	+
	932	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	933	+ {
	934	+ if (!added)
	935	+ {
	936	+ added = true;
	937	+ resourcecontainer.add(currenttab);
	938	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	939	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	940	+ }
	941	+
	942	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	943	+
	944	+ if (++colcount >= columns)
	945	+ {
	946	+ colcount = 0;
	947	+ currenttab.Return();
	948	+
	949	+ if (rowcount++ >= rows)
	950	+ {
	951	+ rowcount = 0;
	952	+ }
	953	+ }
	954	+ }
	955	+ else
	956	+ {
	957	+// if (!path[path.length-1].equals("icons"))
	958	+// resourcecontainer.Return();
	959	+ }
	960	+ }
	961	+
	962	+ void CreateTexturePanel(cGridBag container)
	963	+ {
	964	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	965	+ container.add(resourcecontainer);
	966	+
	967	+ Grafreed.ParseResources("textures", this);
	968	+ }
	969	+
541	970	void SetupUI2(ObjEditor oe)
542	971	{
543	972	// June 2019
..	..	@@ -590,48 +1019,70 @@
590	1019	//minButton.setToolTipText("Minimize window");
591	1020	//minButton.addActionListener(this);
592	1021
593		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594		- maxButton.setToolTipText("Maximize window");
595		- maxButton.addActionListener(this);
	1022	+ if (Globals.ADVANCED)
	1023	+ {
	1024	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1025	+ maxButton.setToolTipText("Maximize window");
	1026	+ maxButton.addActionListener(this);
	1027	+ }
596	1028
597	1029	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
598	1030	fullButton.setToolTipText("Full-screen window");
599	1031	fullButton.addActionListener(this);
600	1032
	1033	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1034	+ screenfitButton.setToolTipText("Screen fit");
	1035	+ screenfitButton.addActionListener(this);
	1036	+
601	1037	oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602	1038	restoreCameraButton.setToolTipText("Restore viewpoint");
603	1039	restoreCameraButton.addActionListener(this);
604	1040
605		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
606		- undoButton.setToolTipText("Undo changes");
607		- undoButton.addActionListener(this);
	1041	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1042	+ saveVersionButton.setToolTipText("Duplicate current version");
	1043	+ saveVersionButton.addActionListener(this);
	1044	+
	1045	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1046	+ deleteVersionButton.setToolTipText("Delete current version");
	1047	+ deleteVersionButton.addActionListener(this);
	1048	+
	1049	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1050	+ previousVersionButton.setToolTipText("Previous version");
	1051	+ previousVersionButton.addActionListener(this);
	1052	+ previousVersionButton.setEnabled(false);
608	1053
609		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
610		- redoButton.setToolTipText("Redo changes");
611		- redoButton.addActionListener(this);
	1054	+ cGridBag updown = new cGridBag().setVertical(true);
	1055	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1056	+ restoreButton.setToolTipText("Undo (restore current version)");
	1057	+ restoreButton.addActionListener(this);
	1058	+ //restoreButton.setEnabled(false);
612	1059
613		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
614		- saveButton.setToolTipText("Save changes");
615		- saveButton.addActionListener(this);
	1060	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+ replaceButton.setToolTipText("Save (replace current version)");
	1062	+ replaceButton.addActionListener(this);
	1063	+ //replaceButton.setEnabled(false);
616	1064
617		- copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1065	+ copyOptionsPanel.add(updown);
	1066	+
	1067	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ nextVersionButton.setToolTipText("Next version");
	1069	+ nextVersionButton.addActionListener(this);
	1070	+ nextVersionButton.setEnabled(false);
	1071	+
	1072	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
618	1073	liveCB.setToolTipText("Enable animation");
619	1074	liveCB.addItemListener(this);
620	1075
621		- copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1076	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
622	1077	oneStepButton.setToolTipText("Animate one step forward");
623	1078	oneStepButton.addActionListener(this);
624	1079
625		- copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1080	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
626	1081	fastCB.setToolTipText("Fast mode");
627	1082	fastCB.addItemListener(this);
628	1083
629	1084	//oe.toolboxPanel.Return();
630	1085
631		- copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632		- screenfitButton.setToolTipText("Screen fit");
633		- screenfitButton.addActionListener(this);
634		-
635	1086	// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
636	1087	// trackCB.setToolTipText("Enable tracking");
637	1088	// trackCB.addItemListener(this);
..	..	@@ -644,31 +1095,32 @@
644	1095	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
645	1096	snapobjectButton.addActionListener(this);
646	1097	snapobjectButton.setToolTipText("Snap Object");
	1098	+
	1099	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1100	+ fourButton.addActionListener(this);
	1101	+ fourButton.setToolTipText("Show control panel only");
647	1102	}
648	1103
649	1104	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
650	1105
651		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
652		- twoButton.setToolTipText("Show center view only");
	1106	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1107	+ twoButton.setToolTipText("Show 3D view only");
653	1108	twoButton.addActionListener(this);
654	1109	this.fullscreenLayout = twoButton;
655	1110
656		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
657		- fourButton.addActionListener(this);
658		- fourButton.setToolTipText("Show left panel only");
659		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
660		- sixButton.setToolTipText("2-column layout left");
661		- sixButton.addActionListener(this);
662		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
663		- threeButton.setToolTipText("2-column layout right");
	1111	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ threeButton.setToolTipText("Show controls and 3D view");
664	1113	threeButton.addActionListener(this);
665		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
666		- sevenButton.setToolTipText("3-column layout");
667		- sevenButton.addActionListener(this);
	1114	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1115	+ sixButton.setToolTipText("Show 3D view and controls");
	1116	+ sixButton.addActionListener(this);
	1117	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1118	+// sevenButton.setToolTipText("3-column layout");
	1119	+// sevenButton.addActionListener(this);
668	1120	//
669	1121
670		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671		- rootButton.setToolTipText("Edit selection in new tab");
	1122	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1123	+ rootButton.setToolTipText("Open selection in new tab");
672	1124	rootButton.addActionListener(this);
673	1125
674	1126	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -677,28 +1129,30 @@
677	1129	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
678	1130	//clearButton.addActionListener(this);
679	1131
	1132	+ cGridBag row1 = new cGridBag();
	1133	+
680	1134	// INSERT
681		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1135	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682	1136	gridButton.setToolTipText("Create grid");
683	1137	gridButton.addActionListener(this);
684	1138
685		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1139	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
686	1140	boxButton.setToolTipText("Create box");
687	1141	boxButton.addActionListener(this);
688	1142
689		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1143	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
690	1144	sphereButton.setToolTipText("Create sphere");
691	1145	sphereButton.addActionListener(this);
692	1146
693		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1147	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
694	1148	coneButton.setToolTipText("Create cone");
695	1149	coneButton.addActionListener(this);
696	1150
697		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1151	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
698	1152	torusButton.setToolTipText("Create torus");
699	1153	torusButton.addActionListener(this);
700	1154
701		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1155	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
702	1156	superButton.setToolTipText("Create superellipsoid");
703	1157	superButton.addActionListener(this);
704	1158
..	..	@@ -709,60 +1163,74 @@
709	1163	kleinButton.addActionListener(this);
710	1164	}
711	1165
712		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1166	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
713	1167	particlesButton.setToolTipText("Create particle system");
714	1168	particlesButton.addActionListener(this);
715	1169
716		- oe.toolboxPanel.Return();
	1170	+ oe.toolboxPanel.add(row1);
717	1171
718		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1172	+ cGridBag row2 = new cGridBag();
	1173	+
	1174	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
719	1175	groupButton.setToolTipText("Create group");
720	1176	groupButton.addActionListener(this);
721	1177
722		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1178	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
723	1179	compositeButton.setToolTipText("Create composite");
724	1180	compositeButton.addActionListener(this);
725	1181
726		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
727		- switchButton.setToolTipText("Create switch");
	1182	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1183	+ switchButton.setToolTipText("Create item switcher");
728	1184	switchButton.addActionListener(this);
729	1185
730		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1186	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
731	1187	loopButton.setToolTipText("Create loop");
732	1188	loopButton.addActionListener(this);
733	1189
734		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
735	1191	textureButton.setToolTipText("Create texture");
736	1192	textureButton.addActionListener(this);
737	1193
738		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
739	1195	overlayButton.setToolTipText("Create overlay");
740	1196	overlayButton.addActionListener(this);
741	1197
742		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
743	1199	lightButton.setToolTipText("Create light");
744	1200	lightButton.addActionListener(this);
745	1201
	1202	+ oe.toolboxPanel.add(row2);
	1203	+
	1204	+ cGridBag textures = new cGridBag();
	1205	+
	1206	+ CreateTexturePanel(textures);
	1207	+
	1208	+ oe.toolboxPanel.add(textures);
	1209	+
	1210	+ textures.preferredHeight = 100;
	1211	+
	1212	+ CreateSkyboxPanel(oe.skyboxPanel);
	1213	+
746	1214	// EDIT panel
747		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
748		- editButton.setToolTipText("Edit selection");
	1215	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ editButton.setToolTipText("Pin selection controls");
749	1217	editButton.addActionListener(this);
750	1218
751		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
752		- uneditButton.setToolTipText("Unedit selection");
	1219	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ uneditButton.setToolTipText("Unpin and remove selection controls");
753	1221	uneditButton.addActionListener(this);
754	1222
755	1223	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
756		- allParamsButton.setToolTipText("Edit all params");
	1224	+ allParamsButton.setToolTipText("Show all controls");
757	1225	allParamsButton.addActionListener(this);
758	1226
759		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
760		- clearPanelButton.setToolTipText("Clear edit panel");
	1227	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1228	+ clearPanelButton.setToolTipText("Clear all controls");
761	1229	clearPanelButton.addActionListener(this);
762	1230
763		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
764		- unselectButton.setToolTipText("Unselect");
765		- unselectButton.addActionListener(this);
	1231	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1232	+ //unselectButton.setToolTipText("Unselect");
	1233	+ //unselectButton.addActionListener(this);
766	1234
767	1235	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
768	1236	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -770,6 +1238,7 @@
770	1238
771	1239	editCommandsPanel.preferredHeight = 1;
772	1240
	1241	+ SetPinStates(false);
773	1242	// oe.treePanel.add(commandsPanel);
774	1243	// oe.treePanel.Return();
775	1244
..	..	@@ -796,9 +1265,12 @@
796	1265
797	1266	oe.treePanel.add(copyOptionsPanel);
798	1267	oe.treePanel.Return();
	1268	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1269	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1270	+ sliderPane.preferredHeight = 1;
799	1271
800		-// mainPanel.setDividerLocation(0.5); //1.0);
801		-// mainPanel.setResizeWeight(0.5);
	1272	+// mainPanel.setDividerLocation(0.1); //1.0);
	1273	+ mainPanel.setResizeWeight(0.4);
802	1274
803	1275	//jList.addListSelectionListener(this);
804	1276	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -806,7 +1278,7 @@
806	1278	//jTree.setEditable(true);
807	1279	oe.jTree.setDragEnabled(true);
808	1280	//jTree.setPreferredSize(new Dimension(10,10));
809		- jSP.setPreferredSize(new Dimension(100,200));
	1281	+ //jSP.setPreferredSize(new Dimension(100,200));
810	1282
811	1283	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
812	1284
..	..	@@ -818,7 +1290,7 @@
818	1290	dgr.addDragGestureListener(this);
819	1291	}catch(Exception e) {}
820	1292	*/
821		- radio.layout = sevenButton;
	1293	+ radio.layout = threeButton; // sixButton;
822	1294	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
823	1295	}
824	1296
..	..	@@ -843,14 +1315,18 @@
843	1315	boxCB.addItemListener(this);
844	1316
845	1317	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
846		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1318	+ zoomBoxCB.setToolTipText("Display only for wheel");
847	1319	zoomBoxCB.addItemListener(this);
848	1320
849	1321	if (true) // Globals.ADVANCED)
850	1322	{
851		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
852		- supportCB.setToolTipText("Enable rigging");
853		- supportCB.addItemListener(this);
	1323	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1324	+// supportCB.setToolTipText("Enable rigging");
	1325	+// supportCB.addItemListener(this);
	1326	+
	1327	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1328	+ freezeCB.setToolTipText("Fast moving camera");
	1329	+ freezeCB.addItemListener(this);
854	1330
855	1331	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
856	1332	// localCB.addItemListener(this);
..	..	@@ -865,9 +1341,12 @@
865	1341	smoothCB.setToolTipText("Snapping delay");
866	1342	smoothCB.addItemListener(this);
867	1343
868		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
869		- slowCB.setToolTipText("Smooth interpolation");
870		- slowCB.addItemListener(this);
	1344	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1345	+// slowCB.setToolTipText("Smooth interpolation");
	1346	+// slowCB.addItemListener(this);
	1347	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1348	+ minshaderCB.setToolTipText("Minimal fast shader");
	1349	+ minshaderCB.addItemListener(this);
871	1350
872	1351	// constraints.gridy += 1;
873	1352	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -905,7 +1384,7 @@
905	1384	oeilCB.addItemListener(this);
906	1385
907	1386	panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
908		- shadowCB.setToolTipText("Compute shadows when live");
	1387	+ shadowCB.setToolTipText("When live compute shadows");
909	1388	shadowCB.addItemListener(this);
910	1389
911	1390	panel.Return();
..	..	@@ -914,12 +1393,12 @@
914	1393	toggleTextureCB.addItemListener(this);
915	1394
916	1395	panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
917		- toggleSwitchCB.setToolTipText("Use switch");
	1396	+ toggleSwitchCB.setToolTipText("Choose a single item");
918	1397	toggleSwitchCB.addItemListener(this);
919	1398
920		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
921		- autosaveCB.setToolTipText("Auto-save on structure change");
922		- autosaveCB.addItemListener(this);
	1399	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1400	+ autokeepCB.setToolTipText("On structure change");
	1401	+ autokeepCB.addItemListener(this);
923	1402
924	1403	panel.Return();
925	1404	if (Globals.ADVANCED)
..	..	@@ -948,7 +1427,7 @@
948	1427	{
949	1428	cRadio radioButton = new cRadio(obj.name);
950	1429
951		- // Patch to avoid bug with transparency.
	1430	+ // June 2019. Patch to avoid bug with transparency.
952	1431	radioButton.hadMaterial = obj.material != null;
953	1432	if (!radioButton.hadMaterial)
954	1433	{
..	..	@@ -956,7 +1435,7 @@
956	1435	}
957	1436
958	1437	radioButton.SetObject(obj);
959		- radioButton.layout = sevenButton;
	1438	+ radioButton.layout = threeButton; // sixButton;
960	1439	radioButton.SetCamera(cameraView.renderCamera, false);
961	1440	radioButton.addActionListener(this);
962	1441	radioPanel.add(radioButton);
..	..	@@ -981,10 +1460,13 @@
981	1460	cCheckBox localCB;
982	1461	cCheckBox crowdCB;
983	1462	cCheckBox smoothCB;
	1463	+ cCheckBox minshaderCB;
	1464	+
984	1465	cToggleButton fastCB;
985	1466	cCheckBox slowCB;
986	1467	cCheckBox boxCB;
987	1468	cCheckBox zoomBoxCB;
	1469	+ cCheckBox freezeCB;
988	1470	//cToggleButton trackCB;
989	1471	cCheckBox trackCB;
990	1472	cCheckBox smoothfocusCB;
..	..	@@ -995,7 +1477,7 @@
995	1477
996	1478	cCheckBox oeilCB;
997	1479	cCheckBox shadowCB;
998		- cCheckBox autosaveCB;
	1480	+ cCheckBox autokeepCB;
999	1481	cCheckBox lookAtCB;
1000	1482
1001	1483	// static int COLOR = 1;
..	..	@@ -1051,6 +1533,12 @@
1051	1533	cameraView.ToggleInertia();
1052	1534	cameraView.repaint();
1053	1535	}
	1536	+ else if(e.getSource() == minshaderCB)
	1537	+ {
	1538	+ Globals.MINSHADER ^= true;
	1539	+ cameraView.programInitialized = false;
	1540	+ cameraView.repaint();
	1541	+ }
1054	1542	else if(e.getSource() == localCB)
1055	1543	{
1056	1544	cameraView.ToggleLocal();
..	..	@@ -1103,9 +1591,13 @@
1103	1591	{
1104	1592	Globals.COMPUTESHADOWWHENLIVE ^= true;
1105	1593	}
1106		- else if(e.getSource() == autosaveCB)
	1594	+ else if(e.getSource() == freezeCB)
1107	1595	{
1108		- Globals.SAVEONMAKE ^= true;
	1596	+ Globals.FREEZEONMOVE ^= true;
	1597	+ }
	1598	+ else if(e.getSource() == autokeepCB)
	1599	+ {
	1600	+ Globals.REPLACEONMAKE ^= true;
1109	1601	}
1110	1602	else if(e.getSource() == lookAtCB)
1111	1603	{
..	..	@@ -1187,8 +1679,6 @@
1187	1679	}
1188	1680	}
1189	1681
1190		- String string = (String) object;
1191		-
1192	1682	System.out.println("Transfer = " + object + "; drop : " + target);
1193	1683	// if( object instanceof java.io.File[])
1194	1684	// {
..	..	@@ -1196,6 +1686,8 @@
1196	1686	// objEditor.DropFile((java.io.File[]) object, true);
1197	1687	// return;
1198	1688	// }
	1689	+
	1690	+ String string = object.toString();
1199	1691
1200	1692	// File path for Mac and Windows
1201	1693	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1445,6 +1937,9 @@
1445	1937	animationItem.addItemListener(this);
1446	1938	animationItem.setState(Globals.ANIMATION);
1447	1939
	1940	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1941	+ archiveItem.addActionListener(this);
	1942	+
1448	1943	menu.add("-");
1449	1944	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1450	1945	parseverticesItem.addActionListener(this);
..	..	@@ -1457,6 +1952,8 @@
1457	1952	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1458	1953	reduce34MorphItem.addActionListener(this);
1459	1954	menu.add("-");
	1955	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1956	+ memoryItem.addActionListener(this);
1460	1957	menu.add(computeAOItem = new MenuItem("Compute AO"));
1461	1958	computeAOItem.addActionListener(this);
1462	1959
..	..	@@ -1465,8 +1962,6 @@
1465	1962	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1466	1963	mirrorItem.addActionListener(this);
1467	1964	menu.add("-");
1468		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1469		- memoryItem.addActionListener(this);
1470	1965	menu.add(analyzeItem = new MenuItem("Analyze"));
1471	1966	analyzeItem.addActionListener(this);
1472	1967	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1614,6 +2109,30 @@
1614	2109
1615	2110	makeSomething(shadow);
1616	2111	}
	2112	+
	2113	+ private void ClearUnpinned()
	2114	+ {
	2115	+ //for (Object3D obj : listUI)
	2116	+ for (int i=listUI.size(); --i>=0;)
	2117	+ {
	2118	+ Object3D obj = listUI.elementAt(i);
	2119	+ if (!obj.pinned)
	2120	+ {
	2121	+ obj.CloseUI();
	2122	+ listUI.remove(i);
	2123	+ }
	2124	+ }
	2125	+ }
	2126	+
	2127	+ private void EditElement(Object3D elem, boolean newWindow)
	2128	+ {
	2129	+ // if (!(elem instanceof Composite))
	2130	+ // newWindow = false;
	2131	+ listUI.add(elem);
	2132	+ elem.openEditWindow(this, newWindow); //, false);
	2133	+ System.out.println("edit : " + elem);
	2134	+ elem.editWindow.refreshContents(true); // ? new
	2135	+ }
1617	2136
1618	2137	/**
1619	2138	* applyExample
..	..	@@ -2042,6 +2561,23 @@
2042	2561	{
2043	2562	makeSomething(new Light());
2044	2563	} else
	2564	+// if (source == skybox1Button \|\|
	2565	+// source == skybox2Button \|\|
	2566	+// source == skybox3Button \|\|
	2567	+// source == skybox4Button \|\|
	2568	+// source == skybox5Button \|\|
	2569	+// source == skybox6Button \|\|
	2570	+// source == skybox7Button \|\|
	2571	+// source == skybox11Button \|\|
	2572	+// source == skybox12Button \|\|
	2573	+// source == skybox13Button \|\|
	2574	+// source == skybox14Button \|\|
	2575	+// source == skybox15Button \|\|
	2576	+// source == skybox16Button \|\|
	2577	+// source == skybox17Button)
	2578	+// {
	2579	+// ChangeSkybox(source);
	2580	+// } else
2045	2581	if (source == csgItem)
2046	2582	{
2047	2583	group(new CSG());
..	..	@@ -2093,25 +2629,25 @@
2093	2629	Composite csg = new GroupLeaf();
2094	2630	csg.count = 5;
2095	2631	group(csg);
2096		- Composite child = new cGroup();
	2632	+ Composite child = new cGroup("Branch");
2097	2633	csg.addChild(child);
2098	2634	child.addChild(csg);
2099	2635	} else
2100	2636	if (source == doubleItem)
2101	2637	{
2102		- Composite csg = new GroupLeaf();
	2638	+ Composite csg = new GroupLeaf("Fork");
2103	2639	csg.count = 5;
2104	2640	group(csg);
2105		- Composite child = new cGroup();
	2641	+ Composite child = new cGroup("Branch A");
2106	2642	csg.addChild(child);
2107	2643	child.addChild(csg);
2108		- child = new cGroup();
	2644	+ child = new cGroup("Branch B");
2109	2645	csg.addChild(child);
2110	2646	child.addChild(csg);
2111	2647	} else
2112	2648	if (source == tripleItem)
2113	2649	{
2114		- Composite csg = new GroupLeaf();
	2650	+ Composite csg = new GroupLeaf("Trident");
2115	2651	csg.count = 4;
2116	2652	group(csg);
2117	2653	Composite child = new cGroup();
..	..	@@ -2127,7 +2663,7 @@
2127	2663	if (source == computeAOItem)
2128	2664	{
2129	2665	Globals.drawMode = CameraPane.OCCLUSION;
2130		- Globals.theRenderer.repaint();
	2666	+ cameraView.repaint();
2131	2667	} else
2132	2668	if (source == recompileItem)
2133	2669	{
..	..	@@ -2142,7 +2678,7 @@
2142	2678	if (source == invariantsItem)
2143	2679	{
2144	2680	System.out.println("Invariants:");
2145		- Grafreed.grafreeD.universe.invariants();
	2681	+ Grafreed.grafreed.universe.invariants();
2146	2682	} else
2147	2683	if (source == memoryItem)
2148	2684	{
..	..	@@ -2173,17 +2709,40 @@
2173	2709	{
2174	2710	ToggleFullScreen();
2175	2711	} else
2176		- if (source == undoButton)
	2712	+ if (source == previousVersionButton)
2177	2713	{
2178		- Undo();
	2714	+ // Go to previous version
	2715	+ //if (!Undo())
	2716	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2717	+ PreviousVersion();
2179	2718	} else
2180		- if (source == redoButton)
	2719	+ if (source == restoreButton)
2181	2720	{
2182		- Redo();
	2721	+ // Restore current version
	2722	+ Restore();
	2723	+ //restoreButton.setEnabled(false);
2183	2724	} else
2184		- if (source == saveButton)
	2725	+ if (source == replaceButton)
2185	2726	{
2186		- Save();
	2727	+ // Overwrite current version
	2728	+ Replace();
	2729	+ //replaceButton.setEnabled(false);
	2730	+ } else
	2731	+ if (source == nextVersionButton)
	2732	+ {
	2733	+ // Go to next version
	2734	+ NextVersion();
	2735	+ } else
	2736	+ if (source == saveVersionButton)
	2737	+ {
	2738	+ // Save a new version
	2739	+ if (!Save(true))
	2740	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2741	+ } else
	2742	+ if (source == deleteVersionButton)
	2743	+ {
	2744	+ // Delete a new version
	2745	+ DeleteVersion();
2187	2746	} else
2188	2747	if (source == oneStepButton)
2189	2748	{
..	..	@@ -2192,17 +2751,14 @@
2192	2751	} else
2193	2752	if (source == screenfitButton)
2194	2753	{
2195		- //Reload(lastConverter, lastFilename, true);
2196	2754	ScreenFit();
2197	2755	} else
2198	2756	if (source == screenfitpointButton)
2199	2757	{
2200		- //Reload(lastConverter, lastFilename, true);
2201	2758	ScreenFitPoint();
2202	2759	} else
2203	2760	if (source == snapobjectButton)
2204	2761	{
2205		- //Reload(lastConverter, lastFilename, true);
2206	2762	SnapObject();
2207	2763	} else
2208	2764	// if (event.getSource() == recompileButton)
..	..	@@ -2241,11 +2797,11 @@
2241	2797	} else
2242	2798	if (source == undoItem)
2243	2799	{
2244		- Undo();
	2800	+ PreviousVersion();
2245	2801	} else
2246	2802	if (source == redoItem)
2247	2803	{
2248		- Redo();
	2804	+ NextVersion();
2249	2805	} else
2250	2806	if (source == duplicateItem)
2251	2807	{
..	..	@@ -2566,7 +3122,7 @@
2566	3122	{
2567	3123	StepAll();
2568	3124	} else
2569		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3125	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2570	3126	{
2571	3127	//int indices[] = jList.getSelectedIndices();
2572	3128	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2726,15 +3282,28 @@
2726	3282	} else
2727	3283	if (source == ungroupItem \|\| source == ungroupButton)
2728	3284	{
2729		- //ungroup();
	3285	+ boolean hasRoot = false;
	3286	+
2730	3287	for (int i=0; i<group.selection.size(); i++)
2731	3288	{
2732		- Ungroup(group.selection.get(i));
	3289	+ if (group.selection.get(i) == group)
	3290	+ {
	3291	+ hasRoot = true;
	3292	+ break;
	3293	+ }
2733	3294	}
2734	3295
2735		- ClearSelection(false);
2736		-
2737		- refreshContents();
	3296	+ if (!hasRoot)
	3297	+ {
	3298	+ for (int i=0; i<group.selection.size(); i++)
	3299	+ {
	3300	+ Ungroup(group.selection.get(i));
	3301	+ }
	3302	+
	3303	+ ClearSelection(false);
	3304	+
	3305	+ refreshContents();
	3306	+ }
2738	3307	} else
2739	3308	if (source == genUVItem)
2740	3309	{
..	..	@@ -3035,7 +3604,7 @@
3035	3604	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3036	3605	{
3037	3606	obj = (Object3D)e.nextElement();
3038		- obj.SetBumpTexture(null);
	3607	+ obj.ResetBumpTexture();
3039	3608	}
3040	3609
3041	3610	refreshContents();
..	..	@@ -3049,6 +3618,31 @@
3049	3618	obj.SetBumpTexture(obj.GetPigmentTexture());
3050	3619	}
3051	3620
	3621	+ refreshContents();
	3622	+ } else
	3623	+ if (source == embedTexturesItem)
	3624	+ {
	3625	+ Object3D obj;
	3626	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3627	+ {
	3628	+ obj = (Object3D)e.nextElement();
	3629	+ obj.EmbedTextures(true);
	3630	+ }
	3631	+
	3632	+ refreshContents();
	3633	+ } else
	3634	+ if (source == deEmbedTexturesItem)
	3635	+ {
	3636	+ Object3D obj;
	3637	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3638	+ {
	3639	+ obj = (Object3D)e.nextElement();
	3640	+ obj.EmbedTextures(false);
	3641	+ }
	3642	+
	3643	+ CameraPane.texturepigment.clear();
	3644	+ CameraPane.texturebump.clear();
	3645	+
3052	3646	refreshContents();
3053	3647	} else
3054	3648	if (source == flashSelectionButton)
..	..	@@ -3152,8 +3746,8 @@
3152	3746	// centralPanel.setVisible(true);
3153	3747	// XYZPanel.setVisible(true);
3154	3748	bigThree.ClearUI();
	3749	+ bigThree.add(scenePanel);
3155	3750	bigThree.add(centralPanel);
3156		- bigThree.add(XYZPanel);
3157	3751	bigThree.FlushUI();
3158	3752
3159	3753	cameraView.requestFocusInWindow();
..	..	@@ -3233,8 +3827,8 @@
3233	3827	// centralPanel.setVisible(true);
3234	3828	// XYZPanel.setVisible(false);
3235	3829	bigThree.ClearUI();
3236		- bigThree.add(scenePanel);
3237	3830	bigThree.add(centralPanel);
	3831	+ bigThree.add(scenePanel);
3238	3832	bigThree.FlushUI();
3239	3833
3240	3834	cameraView.requestFocusInWindow();
..	..	@@ -3326,6 +3920,12 @@
3326	3920	} else
3327	3921	if (source == editItem \|\| source == editButton)
3328	3922	{
	3923	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3924	+ {
	3925	+ Object3D child = (Object3D)e.nextElement();
	3926	+ child.pinned = true;
	3927	+ }
	3928	+
3329	3929	EditSelection(false);
3330	3930	} else
3331	3931	if (source == uneditButton)
..	..	@@ -3334,9 +3934,10 @@
3334	3934	{
3335	3935	Object3D child = (Object3D)e.nextElement();
3336	3936	if(child.editWindow != null)
3337		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3937	+ child.pinned = false;
3338	3938	child.CloseUI();
3339	3939	listUI.remove(child);
	3940	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3340	3941
3341	3942	//child.editWindow = null; // ???????????
3342	3943	}
..	..	@@ -3351,16 +3952,18 @@
3351	3952	//copy.ClearUI();
3352	3953	for (Object3D obj : listUI)
3353	3954	{
	3955	+ obj.pinned = false;
3354	3956	obj.CloseUI();
3355	3957	}
3356	3958	listUI.clear();
	3959	+ SetPinStates(group.selection.size() > 0);
3357	3960	refreshContents(true);
3358	3961	} else
3359	3962	if (source == allParamsButton)
3360	3963	{
3361	3964	assert(copy == group);
3362	3965
3363		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3966	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3364	3967
3365	3968	for (Object3D obj : listUI)
3366	3969	{
..	..	@@ -3409,6 +4012,9 @@
3409	4012	}
3410	4013
3411	4014	copy = group;
	4015	+
	4016	+ SetUndoStates();
	4017	+
3412	4018	//Globals.theRenderer.object = group;
3413	4019	if(!useclient)
3414	4020	{
..	..	@@ -3435,6 +4041,14 @@
3435	4041	currentLayout = sevenButton;
3436	4042	*/
3437	4043	radio.layout.doClick();
	4044	+
	4045	+ ClearUnpinned();
	4046	+
	4047	+ //Grafreed.Assert(group != null);
	4048	+ //Grafreed.Assert(group.selection != null);
	4049	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4050	+ if (group.selection == null \|\| group.selection.size() == 1)
	4051	+ EditSelection(false);
3438	4052	keepparent = group.parent;
3439	4053	// PARENT = NULL or not???
3440	4054	//group.parent = null; // ROOT
..	..	@@ -3446,11 +4060,13 @@
3446	4060	} else if (event.getSource() == editCameraItem)
3447	4061	{
3448	4062	cameraView.ProtectCamera();
	4063	+ cameraView.requestFocusInWindow();
3449	4064	cameraView.repaint();
3450	4065	return;
3451	4066	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3452	4067	{
3453	4068	cameraView.RevertCamera();
	4069	+ cameraView.requestFocusInWindow();
3454	4070	cameraView.repaint();
3455	4071	return;
3456	4072	// } else if (event.getSource() == textureButton)
..	..	@@ -4027,7 +4643,7 @@
4027	4643
4028	4644	try
4029	4645	{
4030		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4646	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4031	4647	}
4032	4648	catch (Exception e)
4033	4649	{
..	..	@@ -4502,12 +5118,14 @@
4502	5118	// }
4503	5119	// }
4504	5120
4505		- static boolean allparams = true;
4506		-
4507		- static Vector<Object3D> listUI = new Vector<Object3D>();
4508		-
4509	5121	void EditSelection(boolean newWindow)
4510	5122	{
	5123	+ if (group.selection == null)
	5124	+ {
	5125	+ EditElement(group, newWindow); // ? new
	5126	+ return;
	5127	+ }
	5128	+
4511	5129	// aConstraints.gridy = 0;
4512	5130	for (int i=0; i<group.selection.size(); i++)
4513	5131	{
..	..	@@ -4518,12 +5136,7 @@
4518	5136	Object3D elem = (Object3D)group.selection.elementAt(i);
4519	5137	if(elem != group \|\| !newWindow)
4520	5138	{
4521		- // if (!(elem instanceof Composite))
4522		- // newWindow = false;
4523		- listUI.add(elem);
4524		- elem.openEditWindow(this, newWindow); //, false);
4525		- System.out.println("edit : " + elem);
4526		- elem.editWindow.refreshContents(true); // ? new
	5139	+ EditElement(elem, newWindow); // ? new
4527	5140	}
4528	5141	}
4529	5142	}
..	..	@@ -4586,9 +5199,7 @@
4586	5199
4587	5200	freezemodel = false;
4588	5201	}
4589		-
4590		- boolean flashIt = true;
4591		-
	5202	+
4592	5203	public void valueChanged(TreeSelectionEvent e)
4593	5204	//public boolean handleEvent(Event event)
4594	5205	{
..	..	@@ -4598,7 +5209,8 @@
4598	5209	//new Exception().printStackTrace();
4599	5210
4600	5211	freezemodel = true;
4601		-
	5212	+ ClearUnpinned();
	5213	+
4602	5214	/**/
4603	5215	//switch (event.id)
4604	5216	{
..	..	@@ -4631,7 +5243,7 @@
4631	5243	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4632	5244	// a camera
4633	5245	{
4634		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5246	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4635	5247	{
4636	5248	CameraPane.camerachangeframe = 0; // don't refuse it
4637	5249	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4640,6 +5252,13 @@
4640	5252	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4641	5253	}
4642	5254
	5255	+ if (tps != null && tps.length == 1)
	5256	+ {
	5257	+ EditSelection(false);
	5258	+ }
	5259	+
	5260	+ SetPinStates(tps != null && tps.length > 0);
	5261	+
4643	5262	refreshContents();
4644	5263	//return true;
4645	5264	}
..	..	@@ -4649,10 +5268,20 @@
4649	5268	freezemodel = false;
4650	5269	}
4651	5270
	5271	+ void SetPinStates(boolean enabled)
	5272	+ {
	5273	+ editButton.setEnabled(enabled);
	5274	+ uneditButton.setEnabled(enabled);
	5275	+ //unselectButton.setEnabled(enabled);
	5276	+ flashSelectionButton.setEnabled(enabled);
	5277	+
	5278	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5279	+ }
	5280	+
4652	5281	void refreshContents(boolean cp)
4653	5282	{
4654		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4655		- if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	5283	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5284	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4656	5285	{
4657	5286	objEditor.ClearInfo(); // .GetMaterial());
4658	5287
..	..	@@ -4751,8 +5380,8 @@
4751	5380
4752	5381	if (cut)
4753	5382	{
4754		- if (Globals.SAVEONMAKE)
4755		- Save();
	5383	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5384	+// Save();
4756	5385	//int indices[] = jList.getSelectedIndices();
4757	5386	//for (int i = indices.length - 1; i >= 0; i--)
4758	5387	//jList.remove(indices[i]);
..	..	@@ -4855,6 +5484,10 @@
4855	5484
4856	5485	void paste(boolean expand)
4857	5486	{
	5487	+ if (Globals.REPLACEONMAKE)
	5488	+ Save();
	5489	+ boolean keep = Globals.REPLACEONMAKE;
	5490	+ Globals.REPLACEONMAKE = false;
4858	5491	// if (GrafreeD.clipboard == null)
4859	5492	// return;
4860	5493	boolean first = true;
..	..	@@ -4914,6 +5547,7 @@
4914	5547	Grafreed.clipboard.get(0).parent = keepparent;
4915	5548	}
4916	5549
	5550	+ Globals.REPLACEONMAKE = keep;
4917	5551	ResetModel();
4918	5552	refreshContents();
4919	5553	}
..	..	@@ -5049,6 +5683,10 @@
5049	5683
5050	5684	void group(Object3D csg, boolean grab)
5051	5685	{
	5686	+ if (Globals.REPLACEONMAKE)
	5687	+ Save();
	5688	+ boolean keep = Globals.REPLACEONMAKE;
	5689	+ Globals.REPLACEONMAKE = false;
5052	5690	if (//false) // why??
5053	5691	!group.selection.isEmpty())
5054	5692	{
..	..	@@ -5162,10 +5800,15 @@
5162	5800	//node.add(csg);
5163	5801	//makeSomething(node);
5164	5802	makeSomething(csg);
	5803	+ Globals.REPLACEONMAKE = keep;
5165	5804	}
5166	5805
5167	5806	void Ungroup(Object3D g)
5168	5807	{
	5808	+ if (Globals.REPLACEONMAKE)
	5809	+ Save();
	5810	+ boolean keep = Globals.REPLACEONMAKE;
	5811	+ Globals.REPLACEONMAKE = false;
5169	5812	if (g instanceof HiddenObject)
5170	5813	{
5171	5814	HiddenObject h = (HiddenObject) g;
..	..	@@ -5182,6 +5825,7 @@
5182	5825	objEditor.makeSomething(g.get(i), false);
5183	5826	}
5184	5827	}
	5828	+ Globals.REPLACEONMAKE = keep;
5185	5829	}
5186	5830
5187	5831	void ungroup()
..	..	@@ -5472,12 +6116,6 @@
5472	6116
5473	6117	cButton restoreCameraButton;
5474	6118
5475		- cButton minButton;
5476		- cButton maxButton;
5477		- cButton fullButton;
5478		- cButton undoButton;
5479		- cButton redoButton;
5480		- cButton saveButton;
5481	6119	cButton oneStepButton;
5482	6120
5483	6121	cButton groupButton;
..	..	@@ -5486,6 +6124,22 @@
5486	6124	cButton switchButton;
5487	6125	cButton loopButton;
5488	6126	cButton textureButton;
	6127	+
	6128	+ cButton skybox1Button;
	6129	+ cButton skybox2Button;
	6130	+ cButton skybox3Button;
	6131	+ cButton skybox4Button;
	6132	+ cButton skybox5Button;
	6133	+ cButton skybox6Button;
	6134	+ cButton skybox7Button;
	6135	+
	6136	+ cButton skybox11Button;
	6137	+ cButton skybox12Button;
	6138	+ cButton skybox13Button;
	6139	+ cButton skybox14Button;
	6140	+ cButton skybox15Button;
	6141	+ cButton skybox16Button;
	6142	+ cButton skybox17Button;
5489	6143
5490	6144	cButton gridButton;
5491	6145	cButton boxButton;
..	..	@@ -5550,7 +6204,7 @@
5550	6204	private MenuItem pasteLinkItem;
5551	6205	private MenuItem pasteCloneItem;
5552	6206	private MenuItem pasteExpandItem;
5553		- private MenuItem clearItem;
	6207	+ private MenuItem deleteItem;
5554	6208	private MenuItem clearAllItem;
5555	6209	private MenuItem genUVItem;
5556	6210	private MenuItem genNormalsMESHItem;
..	..	@@ -5634,6 +6288,8 @@
5634	6288	private MenuItem attachBumpItem;
5635	6289	private MenuItem detachBumpItem;
5636	6290	private MenuItem pigmentBumpItem;
	6291	+ private MenuItem embedTexturesItem;
	6292	+ private MenuItem deEmbedTexturesItem;
5637	6293
5638	6294	private MenuItem particleItem;
5639	6295	private MenuItem ragdollItem;