~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	{
..	..	@@ -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
..	..	@@ -582,7 +1011,7 @@
582	1011	*/
583	1012	cGridBag copyOptionsPanel = new cGridBag();
584	1013
585		- copyOptionsPanel.preferredHeight = 1;
	1014	+ copyOptionsPanel.preferredHeight = 2;
586	1015
587	1016	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
588	1017
..	..	@@ -601,42 +1030,59 @@
601	1030	fullButton.setToolTipText("Full-screen window");
602	1031	fullButton.addActionListener(this);
603	1032
	1033	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1034	+ screenfitButton.setToolTipText("Screen fit");
	1035	+ screenfitButton.addActionListener(this);
	1036	+
604	1037	oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
605	1038	restoreCameraButton.setToolTipText("Restore viewpoint");
606	1039	restoreCameraButton.addActionListener(this);
607	1040
608		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609		- undoButton.setToolTipText("Undo changes");
610		- undoButton.addActionListener(this);
611		- undoButton.setEnabled(false);
	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);
612	1053
613		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
614		- redoButton.setToolTipText("Redo changes");
615		- redoButton.addActionListener(this);
616		- redoButton.setEnabled(false);
	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);
617	1059
618		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
619		- saveButton.setToolTipText("Save changes");
620		- 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);
621	1064
622		- 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);
623	1073	liveCB.setToolTipText("Enable animation");
624	1074	liveCB.addItemListener(this);
625	1075
626		- copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1076	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
627	1077	oneStepButton.setToolTipText("Animate one step forward");
628	1078	oneStepButton.addActionListener(this);
629	1079
630		- copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1080	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
631	1081	fastCB.setToolTipText("Fast mode");
632	1082	fastCB.addItemListener(this);
633	1083
634	1084	//oe.toolboxPanel.Return();
635	1085
636		- copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
637		- screenfitButton.setToolTipText("Screen fit");
638		- screenfitButton.addActionListener(this);
639		-
640	1086	// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
641	1087	// trackCB.setToolTipText("Enable tracking");
642	1088	// trackCB.addItemListener(this);
..	..	@@ -649,31 +1095,32 @@
649	1095	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650	1096	snapobjectButton.addActionListener(this);
651	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");
652	1102	}
653	1103
654	1104	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
655	1105
656		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
657		- 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");
658	1108	twoButton.addActionListener(this);
659	1109	this.fullscreenLayout = twoButton;
660	1110
661		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662		- fourButton.addActionListener(this);
663		- fourButton.setToolTipText("Show left panel only");
664		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
665		- sixButton.setToolTipText("2-column layout left");
666		- sixButton.addActionListener(this);
667		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
668		- 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");
669	1113	threeButton.addActionListener(this);
670		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671		- sevenButton.setToolTipText("3-column layout");
672		- 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);
673	1120	//
674	1121
675		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
676		- 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");
677	1124	rootButton.addActionListener(this);
678	1125
679	1126	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -682,28 +1129,30 @@
682	1129	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
683	1130	//clearButton.addActionListener(this);
684	1131
	1132	+ cGridBag row1 = new cGridBag();
	1133	+
685	1134	// INSERT
686		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1135	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
687	1136	gridButton.setToolTipText("Create grid");
688	1137	gridButton.addActionListener(this);
689	1138
690		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1139	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
691	1140	boxButton.setToolTipText("Create box");
692	1141	boxButton.addActionListener(this);
693	1142
694		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1143	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
695	1144	sphereButton.setToolTipText("Create sphere");
696	1145	sphereButton.addActionListener(this);
697	1146
698		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1147	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
699	1148	coneButton.setToolTipText("Create cone");
700	1149	coneButton.addActionListener(this);
701	1150
702		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1151	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
703	1152	torusButton.setToolTipText("Create torus");
704	1153	torusButton.addActionListener(this);
705	1154
706		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1155	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
707	1156	superButton.setToolTipText("Create superellipsoid");
708	1157	superButton.addActionListener(this);
709	1158
..	..	@@ -714,51 +1163,53 @@
714	1163	kleinButton.addActionListener(this);
715	1164	}
716	1165
717		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1166	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
718	1167	particlesButton.setToolTipText("Create particle system");
719	1168	particlesButton.addActionListener(this);
720	1169
721		- oe.toolboxPanel.Return();
	1170	+ oe.toolboxPanel.add(row1);
722	1171
723		- 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);
724	1175	groupButton.setToolTipText("Create group");
725	1176	groupButton.addActionListener(this);
726	1177
727		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1178	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
728	1179	compositeButton.setToolTipText("Create composite");
729	1180	compositeButton.addActionListener(this);
730	1181
731		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1182	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
732	1183	switchButton.setToolTipText("Create item switcher");
733	1184	switchButton.addActionListener(this);
734	1185
735		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1186	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
736	1187	loopButton.setToolTipText("Create loop");
737	1188	loopButton.addActionListener(this);
738	1189
739		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
740	1191	textureButton.setToolTipText("Create texture");
741	1192	textureButton.addActionListener(this);
742	1193
743		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
744	1195	overlayButton.setToolTipText("Create overlay");
745	1196	overlayButton.addActionListener(this);
746	1197
747		- 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);
748	1199	lightButton.setToolTipText("Create light");
749	1200	lightButton.addActionListener(this);
750	1201
751		- for (int i=6; --i>=0;)
752		- {
753		- oe.toolboxPanel.Return();
754		- oe.toolboxPanel.add(new cGridBag());
755		- oe.toolboxPanel.add(new cGridBag());
756		- oe.toolboxPanel.add(new cGridBag());
757		- oe.toolboxPanel.add(new cGridBag());
758		- oe.toolboxPanel.add(new cGridBag());
759		- oe.toolboxPanel.add(new cGridBag());
760		- oe.toolboxPanel.add(new cGridBag());
761		- }
	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);
762	1213
763	1214	// EDIT panel
764	1215	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -766,20 +1217,20 @@
766	1217	editButton.addActionListener(this);
767	1218
768	1219	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
769		- uneditButton.setToolTipText("Remove selection controls");
	1220	+ uneditButton.setToolTipText("Unpin and remove selection controls");
770	1221	uneditButton.addActionListener(this);
771	1222
772	1223	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
773		- allParamsButton.setToolTipText("Show all controle");
	1224	+ allParamsButton.setToolTipText("Show all controls");
774	1225	allParamsButton.addActionListener(this);
775	1226
776		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
777		- clearPanelButton.setToolTipText("Clear edit panel");
	1227	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1228	+ clearPanelButton.setToolTipText("Clear all controls");
778	1229	clearPanelButton.addActionListener(this);
779	1230
780		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
781		- unselectButton.setToolTipText("Unselect");
782		- unselectButton.addActionListener(this);
	1231	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1232	+ //unselectButton.setToolTipText("Unselect");
	1233	+ //unselectButton.addActionListener(this);
783	1234
784	1235	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
785	1236	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -814,9 +1265,12 @@
814	1265
815	1266	oe.treePanel.add(copyOptionsPanel);
816	1267	oe.treePanel.Return();
	1268	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1269	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1270	+ sliderPane.preferredHeight = 1;
817	1271
818		-// mainPanel.setDividerLocation(0.5); //1.0);
819		-// mainPanel.setResizeWeight(0.5);
	1272	+// mainPanel.setDividerLocation(0.1); //1.0);
	1273	+ mainPanel.setResizeWeight(0.4);
820	1274
821	1275	//jList.addListSelectionListener(this);
822	1276	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -824,7 +1278,7 @@
824	1278	//jTree.setEditable(true);
825	1279	oe.jTree.setDragEnabled(true);
826	1280	//jTree.setPreferredSize(new Dimension(10,10));
827		- jSP.setPreferredSize(new Dimension(100,200));
	1281	+ //jSP.setPreferredSize(new Dimension(100,200));
828	1282
829	1283	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
830	1284
..	..	@@ -836,7 +1290,7 @@
836	1290	dgr.addDragGestureListener(this);
837	1291	}catch(Exception e) {}
838	1292	*/
839		- radio.layout = sevenButton;
	1293	+ radio.layout = threeButton; // sixButton;
840	1294	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
841	1295	}
842	1296
..	..	@@ -887,9 +1341,12 @@
887	1341	smoothCB.setToolTipText("Snapping delay");
888	1342	smoothCB.addItemListener(this);
889	1343
890		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
891		- slowCB.setToolTipText("Smooth interpolation");
892		- 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);
893	1350
894	1351	// constraints.gridy += 1;
895	1352	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -939,9 +1396,9 @@
939	1396	toggleSwitchCB.setToolTipText("Choose a single item");
940	1397	toggleSwitchCB.addItemListener(this);
941	1398
942		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
943		- autosaveCB.setToolTipText("On structure change");
944		- autosaveCB.addItemListener(this);
	1399	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1400	+ autokeepCB.setToolTipText("On structure change");
	1401	+ autokeepCB.addItemListener(this);
945	1402
946	1403	panel.Return();
947	1404	if (Globals.ADVANCED)
..	..	@@ -970,7 +1427,7 @@
970	1427	{
971	1428	cRadio radioButton = new cRadio(obj.name);
972	1429
973		- // Patch to avoid bug with transparency.
	1430	+ // June 2019. Patch to avoid bug with transparency.
974	1431	radioButton.hadMaterial = obj.material != null;
975	1432	if (!radioButton.hadMaterial)
976	1433	{
..	..	@@ -978,7 +1435,7 @@
978	1435	}
979	1436
980	1437	radioButton.SetObject(obj);
981		- radioButton.layout = sevenButton;
	1438	+ radioButton.layout = threeButton; // sixButton;
982	1439	radioButton.SetCamera(cameraView.renderCamera, false);
983	1440	radioButton.addActionListener(this);
984	1441	radioPanel.add(radioButton);
..	..	@@ -1003,6 +1460,8 @@
1003	1460	cCheckBox localCB;
1004	1461	cCheckBox crowdCB;
1005	1462	cCheckBox smoothCB;
	1463	+ cCheckBox minshaderCB;
	1464	+
1006	1465	cToggleButton fastCB;
1007	1466	cCheckBox slowCB;
1008	1467	cCheckBox boxCB;
..	..	@@ -1018,7 +1477,7 @@
1018	1477
1019	1478	cCheckBox oeilCB;
1020	1479	cCheckBox shadowCB;
1021		- cCheckBox autosaveCB;
	1480	+ cCheckBox autokeepCB;
1022	1481	cCheckBox lookAtCB;
1023	1482
1024	1483	// static int COLOR = 1;
..	..	@@ -1073,6 +1532,12 @@
1073	1532	{
1074	1533	cameraView.ToggleInertia();
1075	1534	cameraView.repaint();
	1535	+ }
	1536	+ else if(e.getSource() == minshaderCB)
	1537	+ {
	1538	+ Globals.MINSHADER ^= true;
	1539	+ cameraView.programInitialized = false;
	1540	+ cameraView.repaint();
1076	1541	}
1077	1542	else if(e.getSource() == localCB)
1078	1543	{
..	..	@@ -1130,9 +1595,9 @@
1130	1595	{
1131	1596	Globals.FREEZEONMOVE ^= true;
1132	1597	}
1133		- else if(e.getSource() == autosaveCB)
	1598	+ else if(e.getSource() == autokeepCB)
1134	1599	{
1135		- Globals.SAVEONMAKE ^= true;
	1600	+ Globals.REPLACEONMAKE ^= true;
1136	1601	}
1137	1602	else if(e.getSource() == lookAtCB)
1138	1603	{
..	..	@@ -1214,8 +1679,6 @@
1214	1679	}
1215	1680	}
1216	1681
1217		- String string = (String) object;
1218		-
1219	1682	System.out.println("Transfer = " + object + "; drop : " + target);
1220	1683	// if( object instanceof java.io.File[])
1221	1684	// {
..	..	@@ -1223,6 +1686,8 @@
1223	1686	// objEditor.DropFile((java.io.File[]) object, true);
1224	1687	// return;
1225	1688	// }
	1689	+
	1690	+ String string = object.toString();
1226	1691
1227	1692	// File path for Mac and Windows
1228	1693	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1487,6 +1952,8 @@
1487	1952	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1488	1953	reduce34MorphItem.addActionListener(this);
1489	1954	menu.add("-");
	1955	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1956	+ memoryItem.addActionListener(this);
1490	1957	menu.add(computeAOItem = new MenuItem("Compute AO"));
1491	1958	computeAOItem.addActionListener(this);
1492	1959
..	..	@@ -1495,8 +1962,6 @@
1495	1962	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1496	1963	mirrorItem.addActionListener(this);
1497	1964	menu.add("-");
1498		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1499		- memoryItem.addActionListener(this);
1500	1965	menu.add(analyzeItem = new MenuItem("Analyze"));
1501	1966	analyzeItem.addActionListener(this);
1502	1967	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1657,6 +2122,16 @@
1657	2122	listUI.remove(i);
1658	2123	}
1659	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
1660	2135	}
1661	2136
1662	2137	/**
..	..	@@ -2086,6 +2561,23 @@
2086	2561	{
2087	2562	makeSomething(new Light());
2088	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
2089	2581	if (source == csgItem)
2090	2582	{
2091	2583	group(new CSG());
..	..	@@ -2171,7 +2663,7 @@
2171	2663	if (source == computeAOItem)
2172	2664	{
2173	2665	Globals.drawMode = CameraPane.OCCLUSION;
2174		- Globals.theRenderer.repaint();
	2666	+ cameraView.repaint();
2175	2667	} else
2176	2668	if (source == recompileItem)
2177	2669	{
..	..	@@ -2186,7 +2678,7 @@
2186	2678	if (source == invariantsItem)
2187	2679	{
2188	2680	System.out.println("Invariants:");
2189		- Grafreed.grafreeD.universe.invariants();
	2681	+ Grafreed.grafreed.universe.invariants();
2190	2682	} else
2191	2683	if (source == memoryItem)
2192	2684	{
..	..	@@ -2217,17 +2709,40 @@
2217	2709	{
2218	2710	ToggleFullScreen();
2219	2711	} else
2220		- if (source == undoButton)
	2712	+ if (source == previousVersionButton)
2221	2713	{
2222		- Undo();
	2714	+ // Go to previous version
	2715	+ //if (!Undo())
	2716	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2717	+ PreviousVersion();
2223	2718	} else
2224		- if (source == redoButton)
	2719	+ if (source == restoreButton)
2225	2720	{
2226		- Redo();
	2721	+ // Restore current version
	2722	+ Restore();
	2723	+ //restoreButton.setEnabled(false);
2227	2724	} else
2228		- if (source == saveButton)
	2725	+ if (source == replaceButton)
2229	2726	{
2230		- 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();
2231	2746	} else
2232	2747	if (source == oneStepButton)
2233	2748	{
..	..	@@ -2236,17 +2751,14 @@
2236	2751	} else
2237	2752	if (source == screenfitButton)
2238	2753	{
2239		- //Reload(lastConverter, lastFilename, true);
2240	2754	ScreenFit();
2241	2755	} else
2242	2756	if (source == screenfitpointButton)
2243	2757	{
2244		- //Reload(lastConverter, lastFilename, true);
2245	2758	ScreenFitPoint();
2246	2759	} else
2247	2760	if (source == snapobjectButton)
2248	2761	{
2249		- //Reload(lastConverter, lastFilename, true);
2250	2762	SnapObject();
2251	2763	} else
2252	2764	// if (event.getSource() == recompileButton)
..	..	@@ -2285,11 +2797,11 @@
2285	2797	} else
2286	2798	if (source == undoItem)
2287	2799	{
2288		- Undo();
	2800	+ PreviousVersion();
2289	2801	} else
2290	2802	if (source == redoItem)
2291	2803	{
2292		- Redo();
	2804	+ NextVersion();
2293	2805	} else
2294	2806	if (source == duplicateItem)
2295	2807	{
..	..	@@ -2610,7 +3122,7 @@
2610	3122	{
2611	3123	StepAll();
2612	3124	} else
2613		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3125	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2614	3126	{
2615	3127	//int indices[] = jList.getSelectedIndices();
2616	3128	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -3092,7 +3604,7 @@
3092	3604	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3093	3605	{
3094	3606	obj = (Object3D)e.nextElement();
3095		- obj.SetBumpTexture(null);
	3607	+ obj.ResetBumpTexture();
3096	3608	}
3097	3609
3098	3610	refreshContents();
..	..	@@ -3106,6 +3618,31 @@
3106	3618	obj.SetBumpTexture(obj.GetPigmentTexture());
3107	3619	}
3108	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	+
3109	3646	refreshContents();
3110	3647	} else
3111	3648	if (source == flashSelectionButton)
..	..	@@ -3209,8 +3746,8 @@
3209	3746	// centralPanel.setVisible(true);
3210	3747	// XYZPanel.setVisible(true);
3211	3748	bigThree.ClearUI();
	3749	+ bigThree.add(scenePanel);
3212	3750	bigThree.add(centralPanel);
3213		- bigThree.add(XYZPanel);
3214	3751	bigThree.FlushUI();
3215	3752
3216	3753	cameraView.requestFocusInWindow();
..	..	@@ -3290,8 +3827,8 @@
3290	3827	// centralPanel.setVisible(true);
3291	3828	// XYZPanel.setVisible(false);
3292	3829	bigThree.ClearUI();
3293		- bigThree.add(scenePanel);
3294	3830	bigThree.add(centralPanel);
	3831	+ bigThree.add(scenePanel);
3295	3832	bigThree.FlushUI();
3296	3833
3297	3834	cameraView.requestFocusInWindow();
..	..	@@ -3397,10 +3934,10 @@
3397	3934	{
3398	3935	Object3D child = (Object3D)e.nextElement();
3399	3936	if(child.editWindow != null)
3400		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3401	3937	child.pinned = false;
3402	3938	child.CloseUI();
3403	3939	listUI.remove(child);
	3940	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3404	3941
3405	3942	//child.editWindow = null; // ???????????
3406	3943	}
..	..	@@ -3419,6 +3956,7 @@
3419	3956	obj.CloseUI();
3420	3957	}
3421	3958	listUI.clear();
	3959	+ SetPinStates(group.selection.size() > 0);
3422	3960	refreshContents(true);
3423	3961	} else
3424	3962	if (source == allParamsButton)
..	..	@@ -3474,6 +4012,9 @@
3474	4012	}
3475	4013
3476	4014	copy = group;
	4015	+
	4016	+ SetUndoStates();
	4017	+
3477	4018	//Globals.theRenderer.object = group;
3478	4019	if(!useclient)
3479	4020	{
..	..	@@ -3502,8 +4043,11 @@
3502	4043	radio.layout.doClick();
3503	4044
3504	4045	ClearUnpinned();
3505		- SetPinStates(group.selection.size() > 0);
3506		- if (group.selection.size() == 1)
	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)
3507	4051	EditSelection(false);
3508	4052	keepparent = group.parent;
3509	4053	// PARENT = NULL or not???
..	..	@@ -3516,11 +4060,13 @@
3516	4060	} else if (event.getSource() == editCameraItem)
3517	4061	{
3518	4062	cameraView.ProtectCamera();
	4063	+ cameraView.requestFocusInWindow();
3519	4064	cameraView.repaint();
3520	4065	return;
3521	4066	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3522	4067	{
3523	4068	cameraView.RevertCamera();
	4069	+ cameraView.requestFocusInWindow();
3524	4070	cameraView.repaint();
3525	4071	return;
3526	4072	// } else if (event.getSource() == textureButton)
..	..	@@ -4097,7 +4643,7 @@
4097	4643
4098	4644	try
4099	4645	{
4100		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4646	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4101	4647	}
4102	4648	catch (Exception e)
4103	4649	{
..	..	@@ -4574,6 +5120,12 @@
4574	5120
4575	5121	void EditSelection(boolean newWindow)
4576	5122	{
	5123	+ if (group.selection == null)
	5124	+ {
	5125	+ EditElement(group, newWindow); // ? new
	5126	+ return;
	5127	+ }
	5128	+
4577	5129	// aConstraints.gridy = 0;
4578	5130	for (int i=0; i<group.selection.size(); i++)
4579	5131	{
..	..	@@ -4584,12 +5136,7 @@
4584	5136	Object3D elem = (Object3D)group.selection.elementAt(i);
4585	5137	if(elem != group \|\| !newWindow)
4586	5138	{
4587		- // if (!(elem instanceof Composite))
4588		- // newWindow = false;
4589		- listUI.add(elem);
4590		- elem.openEditWindow(this, newWindow); //, false);
4591		- System.out.println("edit : " + elem);
4592		- elem.editWindow.refreshContents(true); // ? new
	5139	+ EditElement(elem, newWindow); // ? new
4593	5140	}
4594	5141	}
4595	5142	}
..	..	@@ -4652,9 +5199,7 @@
4652	5199
4653	5200	freezemodel = false;
4654	5201	}
4655		-
4656		- boolean flashIt = true;
4657		-
	5202	+
4658	5203	public void valueChanged(TreeSelectionEvent e)
4659	5204	//public boolean handleEvent(Event event)
4660	5205	{
..	..	@@ -4727,13 +5272,15 @@
4727	5272	{
4728	5273	editButton.setEnabled(enabled);
4729	5274	uneditButton.setEnabled(enabled);
4730		- unselectButton.setEnabled(enabled);
	5275	+ //unselectButton.setEnabled(enabled);
4731	5276	flashSelectionButton.setEnabled(enabled);
	5277	+
	5278	+ clearPanelButton.setEnabled(!listUI.isEmpty());
4732	5279	}
4733	5280
4734	5281	void refreshContents(boolean cp)
4735	5282	{
4736		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	5283	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4737	5284	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4738	5285	{
4739	5286	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -4833,8 +5380,8 @@
4833	5380
4834	5381	if (cut)
4835	5382	{
4836		- if (Globals.SAVEONMAKE)
4837		- Save();
	5383	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5384	+// Save();
4838	5385	//int indices[] = jList.getSelectedIndices();
4839	5386	//for (int i = indices.length - 1; i >= 0; i--)
4840	5387	//jList.remove(indices[i]);
..	..	@@ -4937,6 +5484,10 @@
4937	5484
4938	5485	void paste(boolean expand)
4939	5486	{
	5487	+ if (Globals.REPLACEONMAKE)
	5488	+ Save();
	5489	+ boolean keep = Globals.REPLACEONMAKE;
	5490	+ Globals.REPLACEONMAKE = false;
4940	5491	// if (GrafreeD.clipboard == null)
4941	5492	// return;
4942	5493	boolean first = true;
..	..	@@ -4996,6 +5547,7 @@
4996	5547	Grafreed.clipboard.get(0).parent = keepparent;
4997	5548	}
4998	5549
	5550	+ Globals.REPLACEONMAKE = keep;
4999	5551	ResetModel();
5000	5552	refreshContents();
5001	5553	}
..	..	@@ -5131,6 +5683,10 @@
5131	5683
5132	5684	void group(Object3D csg, boolean grab)
5133	5685	{
	5686	+ if (Globals.REPLACEONMAKE)
	5687	+ Save();
	5688	+ boolean keep = Globals.REPLACEONMAKE;
	5689	+ Globals.REPLACEONMAKE = false;
5134	5690	if (//false) // why??
5135	5691	!group.selection.isEmpty())
5136	5692	{
..	..	@@ -5244,10 +5800,15 @@
5244	5800	//node.add(csg);
5245	5801	//makeSomething(node);
5246	5802	makeSomething(csg);
	5803	+ Globals.REPLACEONMAKE = keep;
5247	5804	}
5248	5805
5249	5806	void Ungroup(Object3D g)
5250	5807	{
	5808	+ if (Globals.REPLACEONMAKE)
	5809	+ Save();
	5810	+ boolean keep = Globals.REPLACEONMAKE;
	5811	+ Globals.REPLACEONMAKE = false;
5251	5812	if (g instanceof HiddenObject)
5252	5813	{
5253	5814	HiddenObject h = (HiddenObject) g;
..	..	@@ -5264,6 +5825,7 @@
5264	5825	objEditor.makeSomething(g.get(i), false);
5265	5826	}
5266	5827	}
	5828	+ Globals.REPLACEONMAKE = keep;
5267	5829	}
5268	5830
5269	5831	void ungroup()
..	..	@@ -5554,7 +6116,6 @@
5554	6116
5555	6117	cButton restoreCameraButton;
5556	6118
5557		- cButton saveButton;
5558	6119	cButton oneStepButton;
5559	6120
5560	6121	cButton groupButton;
..	..	@@ -5563,6 +6124,22 @@
5563	6124	cButton switchButton;
5564	6125	cButton loopButton;
5565	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;
5566	6143
5567	6144	cButton gridButton;
5568	6145	cButton boxButton;
..	..	@@ -5627,7 +6204,7 @@
5627	6204	private MenuItem pasteLinkItem;
5628	6205	private MenuItem pasteCloneItem;
5629	6206	private MenuItem pasteExpandItem;
5630		- private MenuItem clearItem;
	6207	+ private MenuItem deleteItem;
5631	6208	private MenuItem clearAllItem;
5632	6209	private MenuItem genUVItem;
5633	6210	private MenuItem genNormalsMESHItem;
..	..	@@ -5711,6 +6288,8 @@
5711	6288	private MenuItem attachBumpItem;
5712	6289	private MenuItem detachBumpItem;
5713	6290	private MenuItem pigmentBumpItem;
	6291	+ private MenuItem embedTexturesItem;
	6292	+ private MenuItem deEmbedTexturesItem;
5714	6293
5715	6294	private MenuItem particleItem;
5716	6295	private MenuItem ragdollItem;