~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,335 @@
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, final String t, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
	50	+ textureButton.setToolTipText(f + "s");
	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	+ cameraView.repaint();
	354	+ }
	355	+
26	356	//ObjEditor objEditor;
27	357	public void closeUI2()
28	358	{
..	..	@@ -60,6 +390,12 @@
60	390	this.copy = this.group = group;
61	391	//selectees = this.group.selectees;
62	392
	393	+ if (copy.versionlist == null)
	394	+ {
	395	+ copy.versionlist = new Object3D[100];
	396	+ copy.versionindex = -1;
	397	+ }
	398	+
63	399	if(ui)
64	400	SetupUI(objEditor);
65	401	}
..	..	@@ -80,10 +416,22 @@
80	416	SetupViews(objEditor);
81	417
82	418	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	419	+
	420	+ if (copy.versionlist == null)
	421	+ {
	422	+ copy.versionlist = new Object3D[100];
	423	+ copy.versionindex = -1;
	424	+
	425	+ Save(true);
	426	+ }
83	427	}
84	428
85	429	void CloneSelection(boolean supports)
86	430	{
	431	+ if (Globals.REPLACEONMAKE)
	432	+ Save();
	433	+ boolean keep = Globals.REPLACEONMAKE;
	434	+ Globals.REPLACEONMAKE = false;
87	435	// Object3D keep = GrafreeD.clipboard;
88	436	//Object3D obj;
89	437	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +442,7 @@
94	442
95	443	makeSomething(clone, i==group.selection.size()-1);
96	444	}
	445	+ Globals.REPLACEONMAKE = keep;
97	446	}
98	447
99	448	void CloneClipboard(boolean supports)
..	..	@@ -189,8 +538,8 @@
189	538	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
190	539	// pasteExpandItem.addActionListener(this);
191	540	menu.add("-");
192		- clearItem = menu.add(new MenuItem("Clear"));
193		- clearItem.addActionListener(this);
	541	+ deleteItem = menu.add(new MenuItem("Delete"));
	542	+ deleteItem.addActionListener(this);
194	543
195	544	if (Globals.ADVANCED)
196	545	{
..	..	@@ -220,7 +569,7 @@
220	569	// toggleSwitchItem.addItemListener(this);
221	570	// toggleSwitchItem.setState(CameraPane.SWITCH);
222	571
223		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	572	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
224	573	toggleHandleItem.addItemListener(this);
225	574	toggleHandleItem.setState(CameraPane.HANDLES);
226	575
..	..	@@ -380,13 +729,14 @@
380	729	shadowYItem.addActionListener(this);
381	730	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
382	731	shadowZItem.addActionListener(this);
	732	+ attributeItem = menu.add(new MenuItem("Attribute"));
	733	+ attributeItem.addActionListener(this);
	734	+
383	735	if (Globals.ADVANCED)
384	736	{
385	737	menu.add("-");
386	738	linkerItem = menu.add(new MenuItem("Linker"));
387	739	linkerItem.addActionListener(this);
388		- attributeItem = menu.add(new MenuItem("Attribute"));
389		- attributeItem.addActionListener(this);
390	740	templateItem = menu.add(new MenuItem("Template"));
391	741	templateItem.addActionListener(this);
392	742	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -415,7 +765,7 @@
415	765	genNormalsMESHItem.addActionListener(this);
416	766	if (Globals.ADVANCED)
417	767	{
418		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	768	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
419	769	genNormalsMINEItem.addActionListener(this);
420	770	}
421	771	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -508,10 +858,15 @@
508	858	attachBumpItem.addActionListener(this);
509	859	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
510	860	pigmentBumpItem.addActionListener(this);
	861	+ //embedTexturesItem
511	862	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
512	863	detachPigmentItem.addActionListener(this);
513	864	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
514	865	detachBumpItem.addActionListener(this);
	866	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	867	+ embedTexturesItem.addActionListener(this);
	868	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	869	+ deEmbedTexturesItem.addActionListener(this);
515	870	menu.add("-");
516	871	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
517	872	sortbysizeItem.addActionListener(this);
..	..	@@ -538,6 +893,68 @@
538	893	buildToolsMenu(menu);
539	894	}
540	895
	896	+ JTabbedPane resourcecontainer;
	897	+ cGridBag currenttab;
	898	+ boolean added; // patch for jar
	899	+
	900	+ int tabcount = 0;
	901	+ int colcount = 0;
	902	+ int rowcount = 0;
	903	+
	904	+ int columns = 5;
	905	+ int rows = 7;
	906	+
	907	+ public void ResourceCallBack(String[] path)
	908	+ {
	909	+ for (int i = 0; i < path.length; i++)
	910	+ System.out.print(path[i] + "/");
	911	+ System.out.println();
	912	+ if (rowcount == 0)
	913	+ {
	914	+ currenttab = new cGridBag();
	915	+ added = false;
	916	+ String tabname = String.valueOf((char)('A'+tabcount));
	917	+ currenttab.setName(tabname);
	918	+ rowcount = 1;
	919	+ }
	920	+
	921	+ if (path.length > 1 && path[1].toLowerCase().endsWith(".jpg"))
	922	+ {
	923	+ if (!added)
	924	+ {
	925	+ added = true;
	926	+ resourcecontainer.add(currenttab);
	927	+ String tabname = String.valueOf((char)('A'+tabcount));
	928	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	929	+ }
	930	+
	931	+ AddTextureButton(path[0], path[1], currenttab);
	932	+ if (++colcount >= columns)
	933	+ {
	934	+ colcount = 0;
	935	+ currenttab.Return();
	936	+
	937	+ if (rowcount++ >= rows)
	938	+ {
	939	+ rowcount = 0;
	940	+ }
	941	+ }
	942	+ }
	943	+ else
	944	+ {
	945	+// if (!path[path.length-1].equals("icons"))
	946	+// resourcecontainer.Return();
	947	+ }
	948	+ }
	949	+
	950	+ void CreateTexturePanel(cGridBag container)
	951	+ {
	952	+ resourcecontainer = new JTabbedPane();
	953	+ container.add(resourcecontainer);
	954	+
	955	+ Grafreed.ParseResources("textures", this);
	956	+ }
	957	+
541	958	void SetupUI2(ObjEditor oe)
542	959	{
543	960	// June 2019
..	..	@@ -590,50 +1007,70 @@
590	1007	//minButton.setToolTipText("Minimize window");
591	1008	//minButton.addActionListener(this);
592	1009
593		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594		- maxButton.setToolTipText("Maximize window");
595		- maxButton.addActionListener(this);
	1010	+ if (Globals.ADVANCED)
	1011	+ {
	1012	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1013	+ maxButton.setToolTipText("Maximize window");
	1014	+ maxButton.addActionListener(this);
	1015	+ }
596	1016
597	1017	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
598	1018	fullButton.setToolTipText("Full-screen window");
599	1019	fullButton.addActionListener(this);
600	1020
	1021	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1022	+ screenfitButton.setToolTipText("Screen fit");
	1023	+ screenfitButton.addActionListener(this);
	1024	+
601	1025	oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602	1026	restoreCameraButton.setToolTipText("Restore viewpoint");
603	1027	restoreCameraButton.addActionListener(this);
604	1028
605		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
606		- undoButton.setToolTipText("Undo changes");
607		- undoButton.addActionListener(this);
608		- undoButton.setEnabled(false);
	1029	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1030	+ saveVersionButton.setToolTipText("Duplicate current version");
	1031	+ saveVersionButton.addActionListener(this);
	1032	+
	1033	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1034	+ deleteVersionButton.setToolTipText("Delete current version");
	1035	+ deleteVersionButton.addActionListener(this);
	1036	+
	1037	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1038	+ previousVersionButton.setToolTipText("Previous version");
	1039	+ previousVersionButton.addActionListener(this);
	1040	+ previousVersionButton.setEnabled(false);
609	1041
610		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
611		- redoButton.setToolTipText("Redo changes");
612		- redoButton.addActionListener(this);
613		- redoButton.setEnabled(false);
	1042	+ cGridBag updown = new cGridBag().setVertical(true);
	1043	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1044	+ restoreButton.setToolTipText("Undo (restore current version)");
	1045	+ restoreButton.addActionListener(this);
	1046	+ //restoreButton.setEnabled(false);
614	1047
615		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
616		- saveButton.setToolTipText("Save changes");
617		- saveButton.addActionListener(this);
	1048	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1049	+ replaceButton.setToolTipText("Save (replace current version)");
	1050	+ replaceButton.addActionListener(this);
	1051	+ //replaceButton.setEnabled(false);
618	1052
619		- copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1053	+ copyOptionsPanel.add(updown);
	1054	+
	1055	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1056	+ nextVersionButton.setToolTipText("Next version");
	1057	+ nextVersionButton.addActionListener(this);
	1058	+ nextVersionButton.setEnabled(false);
	1059	+
	1060	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
620	1061	liveCB.setToolTipText("Enable animation");
621	1062	liveCB.addItemListener(this);
622	1063
623		- copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1064	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624	1065	oneStepButton.setToolTipText("Animate one step forward");
625	1066	oneStepButton.addActionListener(this);
626	1067
627		- copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1068	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
628	1069	fastCB.setToolTipText("Fast mode");
629	1070	fastCB.addItemListener(this);
630	1071
631	1072	//oe.toolboxPanel.Return();
632	1073
633		- copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- screenfitButton.setToolTipText("Screen fit");
635		- screenfitButton.addActionListener(this);
636		-
637	1074	// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
638	1075	// trackCB.setToolTipText("Enable tracking");
639	1076	// trackCB.addItemListener(this);
..	..	@@ -646,31 +1083,32 @@
646	1083	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
647	1084	snapobjectButton.addActionListener(this);
648	1085	snapobjectButton.setToolTipText("Snap Object");
	1086	+
	1087	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1088	+ fourButton.addActionListener(this);
	1089	+ fourButton.setToolTipText("Show control panel only");
649	1090	}
650	1091
651	1092	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
652	1093
653		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654		- twoButton.setToolTipText("Show center view only");
	1094	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1095	+ twoButton.setToolTipText("Show 3D view only");
655	1096	twoButton.addActionListener(this);
656	1097	this.fullscreenLayout = twoButton;
657	1098
658		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
659		- fourButton.addActionListener(this);
660		- fourButton.setToolTipText("Show left panel only");
661		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662		- sixButton.setToolTipText("2-column layout left");
663		- sixButton.addActionListener(this);
664		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
665		- threeButton.setToolTipText("2-column layout right");
	1099	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1100	+ threeButton.setToolTipText("Show controls and 3D view");
666	1101	threeButton.addActionListener(this);
667		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
668		- sevenButton.setToolTipText("3-column layout");
669		- sevenButton.addActionListener(this);
	1102	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ sixButton.setToolTipText("Show 3D view and controls");
	1104	+ sixButton.addActionListener(this);
	1105	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1106	+// sevenButton.setToolTipText("3-column layout");
	1107	+// sevenButton.addActionListener(this);
670	1108	//
671	1109
672		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
673		- rootButton.setToolTipText("Edit selection in new tab");
	1110	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1111	+ rootButton.setToolTipText("Open selection in new tab");
674	1112	rootButton.addActionListener(this);
675	1113
676	1114	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -679,28 +1117,30 @@
679	1117	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
680	1118	//clearButton.addActionListener(this);
681	1119
	1120	+ cGridBag row1 = new cGridBag();
	1121	+
682	1122	// INSERT
683		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1123	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
684	1124	gridButton.setToolTipText("Create grid");
685	1125	gridButton.addActionListener(this);
686	1126
687		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1127	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
688	1128	boxButton.setToolTipText("Create box");
689	1129	boxButton.addActionListener(this);
690	1130
691		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1131	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
692	1132	sphereButton.setToolTipText("Create sphere");
693	1133	sphereButton.addActionListener(this);
694	1134
695		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1135	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
696	1136	coneButton.setToolTipText("Create cone");
697	1137	coneButton.addActionListener(this);
698	1138
699		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1139	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
700	1140	torusButton.setToolTipText("Create torus");
701	1141	torusButton.addActionListener(this);
702	1142
703		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1143	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
704	1144	superButton.setToolTipText("Create superellipsoid");
705	1145	superButton.addActionListener(this);
706	1146
..	..	@@ -711,51 +1151,53 @@
711	1151	kleinButton.addActionListener(this);
712	1152	}
713	1153
714		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1154	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
715	1155	particlesButton.setToolTipText("Create particle system");
716	1156	particlesButton.addActionListener(this);
717	1157
718		- oe.toolboxPanel.Return();
	1158	+ oe.toolboxPanel.add(row1);
719	1159
720		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1160	+ cGridBag row2 = new cGridBag();
	1161	+
	1162	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
721	1163	groupButton.setToolTipText("Create group");
722	1164	groupButton.addActionListener(this);
723	1165
724		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1166	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
725	1167	compositeButton.setToolTipText("Create composite");
726	1168	compositeButton.addActionListener(this);
727	1169
728		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
729		- switchButton.setToolTipText("Create switch");
	1170	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1171	+ switchButton.setToolTipText("Create item switcher");
730	1172	switchButton.addActionListener(this);
731	1173
732		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1174	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
733	1175	loopButton.setToolTipText("Create loop");
734	1176	loopButton.addActionListener(this);
735	1177
736		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1178	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
737	1179	textureButton.setToolTipText("Create texture");
738	1180	textureButton.addActionListener(this);
739	1181
740		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1182	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
741	1183	overlayButton.setToolTipText("Create overlay");
742	1184	overlayButton.addActionListener(this);
743	1185
744		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1186	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
745	1187	lightButton.setToolTipText("Create light");
746	1188	lightButton.addActionListener(this);
747	1189
748		- for (int i=6; --i>=0;)
749		- {
750		- oe.toolboxPanel.Return();
751		- oe.toolboxPanel.add(new cGridBag());
752		- oe.toolboxPanel.add(new cGridBag());
753		- oe.toolboxPanel.add(new cGridBag());
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		- }
	1190	+ oe.toolboxPanel.add(row2);
	1191	+
	1192	+ cGridBag textures = new cGridBag();
	1193	+
	1194	+ CreateTexturePanel(textures);
	1195	+
	1196	+ oe.toolboxPanel.add(textures);
	1197	+
	1198	+ textures.preferredHeight = 100;
	1199	+
	1200	+ CreateSkyboxPanel(oe.skyboxPanel);
759	1201
760	1202	// EDIT panel
761	1203	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -763,20 +1205,20 @@
763	1205	editButton.addActionListener(this);
764	1206
765	1207	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
766		- uneditButton.setToolTipText("Remove selection controls");
	1208	+ uneditButton.setToolTipText("Unpin and remove selection controls");
767	1209	uneditButton.addActionListener(this);
768	1210
769	1211	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
770		- allParamsButton.setToolTipText("Show all controle");
	1212	+ allParamsButton.setToolTipText("Show all controls");
771	1213	allParamsButton.addActionListener(this);
772	1214
773		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
774		- clearPanelButton.setToolTipText("Clear edit panel");
	1215	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ clearPanelButton.setToolTipText("Clear all controls");
775	1217	clearPanelButton.addActionListener(this);
776	1218
777		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
778		- unselectButton.setToolTipText("Unselect");
779		- unselectButton.addActionListener(this);
	1219	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ //unselectButton.setToolTipText("Unselect");
	1221	+ //unselectButton.addActionListener(this);
780	1222
781	1223	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
782	1224	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -811,9 +1253,12 @@
811	1253
812	1254	oe.treePanel.add(copyOptionsPanel);
813	1255	oe.treePanel.Return();
	1256	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1257	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1258	+ sliderPane.preferredHeight = 1;
814	1259
815		-// mainPanel.setDividerLocation(0.5); //1.0);
816		-// mainPanel.setResizeWeight(0.5);
	1260	+// mainPanel.setDividerLocation(0.1); //1.0);
	1261	+ mainPanel.setResizeWeight(0.4);
817	1262
818	1263	//jList.addListSelectionListener(this);
819	1264	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -821,7 +1266,7 @@
821	1266	//jTree.setEditable(true);
822	1267	oe.jTree.setDragEnabled(true);
823	1268	//jTree.setPreferredSize(new Dimension(10,10));
824		- jSP.setPreferredSize(new Dimension(100,200));
	1269	+ //jSP.setPreferredSize(new Dimension(100,200));
825	1270
826	1271	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
827	1272
..	..	@@ -833,7 +1278,7 @@
833	1278	dgr.addDragGestureListener(this);
834	1279	}catch(Exception e) {}
835	1280	*/
836		- radio.layout = sevenButton;
	1281	+ radio.layout = threeButton; // sixButton;
837	1282	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
838	1283	}
839	1284
..	..	@@ -863,9 +1308,13 @@
863	1308
864	1309	if (true) // Globals.ADVANCED)
865	1310	{
866		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
867		- supportCB.setToolTipText("Enable rigging");
868		- supportCB.addItemListener(this);
	1311	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1312	+// supportCB.setToolTipText("Enable rigging");
	1313	+// supportCB.addItemListener(this);
	1314	+
	1315	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1316	+ freezeCB.setToolTipText("Fast moving camera");
	1317	+ freezeCB.addItemListener(this);
869	1318
870	1319	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
871	1320	// localCB.addItemListener(this);
..	..	@@ -880,9 +1329,12 @@
880	1329	smoothCB.setToolTipText("Snapping delay");
881	1330	smoothCB.addItemListener(this);
882	1331
883		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
884		- slowCB.setToolTipText("Smooth interpolation");
885		- slowCB.addItemListener(this);
	1332	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1333	+// slowCB.setToolTipText("Smooth interpolation");
	1334	+// slowCB.addItemListener(this);
	1335	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1336	+ minshaderCB.setToolTipText("Minimal fast shader");
	1337	+ minshaderCB.addItemListener(this);
886	1338
887	1339	// constraints.gridy += 1;
888	1340	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -929,12 +1381,12 @@
929	1381	toggleTextureCB.addItemListener(this);
930	1382
931	1383	panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
932		- toggleSwitchCB.setToolTipText("Use switch");
	1384	+ toggleSwitchCB.setToolTipText("Choose a single item");
933	1385	toggleSwitchCB.addItemListener(this);
934	1386
935		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
936		- autosaveCB.setToolTipText("On structure change");
937		- autosaveCB.addItemListener(this);
	1387	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1388	+ autokeepCB.setToolTipText("On structure change");
	1389	+ autokeepCB.addItemListener(this);
938	1390
939	1391	panel.Return();
940	1392	if (Globals.ADVANCED)
..	..	@@ -963,7 +1415,7 @@
963	1415	{
964	1416	cRadio radioButton = new cRadio(obj.name);
965	1417
966		- // Patch to avoid bug with transparency.
	1418	+ // June 2019. Patch to avoid bug with transparency.
967	1419	radioButton.hadMaterial = obj.material != null;
968	1420	if (!radioButton.hadMaterial)
969	1421	{
..	..	@@ -971,7 +1423,7 @@
971	1423	}
972	1424
973	1425	radioButton.SetObject(obj);
974		- radioButton.layout = sevenButton;
	1426	+ radioButton.layout = threeButton; // sixButton;
975	1427	radioButton.SetCamera(cameraView.renderCamera, false);
976	1428	radioButton.addActionListener(this);
977	1429	radioPanel.add(radioButton);
..	..	@@ -996,10 +1448,13 @@
996	1448	cCheckBox localCB;
997	1449	cCheckBox crowdCB;
998	1450	cCheckBox smoothCB;
	1451	+ cCheckBox minshaderCB;
	1452	+
999	1453	cToggleButton fastCB;
1000	1454	cCheckBox slowCB;
1001	1455	cCheckBox boxCB;
1002	1456	cCheckBox zoomBoxCB;
	1457	+ cCheckBox freezeCB;
1003	1458	//cToggleButton trackCB;
1004	1459	cCheckBox trackCB;
1005	1460	cCheckBox smoothfocusCB;
..	..	@@ -1010,7 +1465,7 @@
1010	1465
1011	1466	cCheckBox oeilCB;
1012	1467	cCheckBox shadowCB;
1013		- cCheckBox autosaveCB;
	1468	+ cCheckBox autokeepCB;
1014	1469	cCheckBox lookAtCB;
1015	1470
1016	1471	// static int COLOR = 1;
..	..	@@ -1066,6 +1521,12 @@
1066	1521	cameraView.ToggleInertia();
1067	1522	cameraView.repaint();
1068	1523	}
	1524	+ else if(e.getSource() == minshaderCB)
	1525	+ {
	1526	+ Globals.MINSHADER ^= true;
	1527	+ cameraView.programInitialized = false;
	1528	+ cameraView.repaint();
	1529	+ }
1069	1530	else if(e.getSource() == localCB)
1070	1531	{
1071	1532	cameraView.ToggleLocal();
..	..	@@ -1118,9 +1579,13 @@
1118	1579	{
1119	1580	Globals.COMPUTESHADOWWHENLIVE ^= true;
1120	1581	}
1121		- else if(e.getSource() == autosaveCB)
	1582	+ else if(e.getSource() == freezeCB)
1122	1583	{
1123		- Globals.SAVEONMAKE ^= true;
	1584	+ Globals.FREEZEONMOVE ^= true;
	1585	+ }
	1586	+ else if(e.getSource() == autokeepCB)
	1587	+ {
	1588	+ Globals.REPLACEONMAKE ^= true;
1124	1589	}
1125	1590	else if(e.getSource() == lookAtCB)
1126	1591	{
..	..	@@ -1202,8 +1667,6 @@
1202	1667	}
1203	1668	}
1204	1669
1205		- String string = (String) object;
1206		-
1207	1670	System.out.println("Transfer = " + object + "; drop : " + target);
1208	1671	// if( object instanceof java.io.File[])
1209	1672	// {
..	..	@@ -1211,6 +1674,8 @@
1211	1674	// objEditor.DropFile((java.io.File[]) object, true);
1212	1675	// return;
1213	1676	// }
	1677	+
	1678	+ String string = object.toString();
1214	1679
1215	1680	// File path for Mac and Windows
1216	1681	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1460,6 +1925,9 @@
1460	1925	animationItem.addItemListener(this);
1461	1926	animationItem.setState(Globals.ANIMATION);
1462	1927
	1928	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1929	+ archiveItem.addActionListener(this);
	1930	+
1463	1931	menu.add("-");
1464	1932	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1465	1933	parseverticesItem.addActionListener(this);
..	..	@@ -1472,6 +1940,8 @@
1472	1940	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1473	1941	reduce34MorphItem.addActionListener(this);
1474	1942	menu.add("-");
	1943	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1944	+ memoryItem.addActionListener(this);
1475	1945	menu.add(computeAOItem = new MenuItem("Compute AO"));
1476	1946	computeAOItem.addActionListener(this);
1477	1947
..	..	@@ -1480,8 +1950,6 @@
1480	1950	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1481	1951	mirrorItem.addActionListener(this);
1482	1952	menu.add("-");
1483		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1484		- memoryItem.addActionListener(this);
1485	1953	menu.add(analyzeItem = new MenuItem("Analyze"));
1486	1954	analyzeItem.addActionListener(this);
1487	1955	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1642,6 +2110,16 @@
1642	2110	listUI.remove(i);
1643	2111	}
1644	2112	}
	2113	+ }
	2114	+
	2115	+ private void EditElement(Object3D elem, boolean newWindow)
	2116	+ {
	2117	+ // if (!(elem instanceof Composite))
	2118	+ // newWindow = false;
	2119	+ listUI.add(elem);
	2120	+ elem.openEditWindow(this, newWindow); //, false);
	2121	+ System.out.println("edit : " + elem);
	2122	+ elem.editWindow.refreshContents(true); // ? new
1645	2123	}
1646	2124
1647	2125	/**
..	..	@@ -2071,6 +2549,23 @@
2071	2549	{
2072	2550	makeSomething(new Light());
2073	2551	} else
	2552	+// if (source == skybox1Button \|\|
	2553	+// source == skybox2Button \|\|
	2554	+// source == skybox3Button \|\|
	2555	+// source == skybox4Button \|\|
	2556	+// source == skybox5Button \|\|
	2557	+// source == skybox6Button \|\|
	2558	+// source == skybox7Button \|\|
	2559	+// source == skybox11Button \|\|
	2560	+// source == skybox12Button \|\|
	2561	+// source == skybox13Button \|\|
	2562	+// source == skybox14Button \|\|
	2563	+// source == skybox15Button \|\|
	2564	+// source == skybox16Button \|\|
	2565	+// source == skybox17Button)
	2566	+// {
	2567	+// ChangeSkybox(source);
	2568	+// } else
2074	2569	if (source == csgItem)
2075	2570	{
2076	2571	group(new CSG());
..	..	@@ -2122,25 +2617,25 @@
2122	2617	Composite csg = new GroupLeaf();
2123	2618	csg.count = 5;
2124	2619	group(csg);
2125		- Composite child = new cGroup();
	2620	+ Composite child = new cGroup("Branch");
2126	2621	csg.addChild(child);
2127	2622	child.addChild(csg);
2128	2623	} else
2129	2624	if (source == doubleItem)
2130	2625	{
2131		- Composite csg = new GroupLeaf();
	2626	+ Composite csg = new GroupLeaf("Fork");
2132	2627	csg.count = 5;
2133	2628	group(csg);
2134		- Composite child = new cGroup();
	2629	+ Composite child = new cGroup("Branch A");
2135	2630	csg.addChild(child);
2136	2631	child.addChild(csg);
2137		- child = new cGroup();
	2632	+ child = new cGroup("Branch B");
2138	2633	csg.addChild(child);
2139	2634	child.addChild(csg);
2140	2635	} else
2141	2636	if (source == tripleItem)
2142	2637	{
2143		- Composite csg = new GroupLeaf();
	2638	+ Composite csg = new GroupLeaf("Trident");
2144	2639	csg.count = 4;
2145	2640	group(csg);
2146	2641	Composite child = new cGroup();
..	..	@@ -2156,7 +2651,7 @@
2156	2651	if (source == computeAOItem)
2157	2652	{
2158	2653	Globals.drawMode = CameraPane.OCCLUSION;
2159		- Globals.theRenderer.repaint();
	2654	+ cameraView.repaint();
2160	2655	} else
2161	2656	if (source == recompileItem)
2162	2657	{
..	..	@@ -2171,7 +2666,7 @@
2171	2666	if (source == invariantsItem)
2172	2667	{
2173	2668	System.out.println("Invariants:");
2174		- Grafreed.grafreeD.universe.invariants();
	2669	+ Grafreed.grafreed.universe.invariants();
2175	2670	} else
2176	2671	if (source == memoryItem)
2177	2672	{
..	..	@@ -2202,17 +2697,40 @@
2202	2697	{
2203	2698	ToggleFullScreen();
2204	2699	} else
2205		- if (source == undoButton)
	2700	+ if (source == previousVersionButton)
2206	2701	{
2207		- Undo();
	2702	+ // Go to previous version
	2703	+ //if (!Undo())
	2704	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2705	+ PreviousVersion();
2208	2706	} else
2209		- if (source == redoButton)
	2707	+ if (source == restoreButton)
2210	2708	{
2211		- Redo();
	2709	+ // Restore current version
	2710	+ Restore();
	2711	+ //restoreButton.setEnabled(false);
2212	2712	} else
2213		- if (source == saveButton)
	2713	+ if (source == replaceButton)
2214	2714	{
2215		- Save();
	2715	+ // Overwrite current version
	2716	+ Replace();
	2717	+ //replaceButton.setEnabled(false);
	2718	+ } else
	2719	+ if (source == nextVersionButton)
	2720	+ {
	2721	+ // Go to next version
	2722	+ NextVersion();
	2723	+ } else
	2724	+ if (source == saveVersionButton)
	2725	+ {
	2726	+ // Save a new version
	2727	+ if (!Save(true))
	2728	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2729	+ } else
	2730	+ if (source == deleteVersionButton)
	2731	+ {
	2732	+ // Delete a new version
	2733	+ DeleteVersion();
2216	2734	} else
2217	2735	if (source == oneStepButton)
2218	2736	{
..	..	@@ -2221,17 +2739,14 @@
2221	2739	} else
2222	2740	if (source == screenfitButton)
2223	2741	{
2224		- //Reload(lastConverter, lastFilename, true);
2225	2742	ScreenFit();
2226	2743	} else
2227	2744	if (source == screenfitpointButton)
2228	2745	{
2229		- //Reload(lastConverter, lastFilename, true);
2230	2746	ScreenFitPoint();
2231	2747	} else
2232	2748	if (source == snapobjectButton)
2233	2749	{
2234		- //Reload(lastConverter, lastFilename, true);
2235	2750	SnapObject();
2236	2751	} else
2237	2752	// if (event.getSource() == recompileButton)
..	..	@@ -2270,11 +2785,11 @@
2270	2785	} else
2271	2786	if (source == undoItem)
2272	2787	{
2273		- Undo();
	2788	+ PreviousVersion();
2274	2789	} else
2275	2790	if (source == redoItem)
2276	2791	{
2277		- Redo();
	2792	+ NextVersion();
2278	2793	} else
2279	2794	if (source == duplicateItem)
2280	2795	{
..	..	@@ -2595,7 +3110,7 @@
2595	3110	{
2596	3111	StepAll();
2597	3112	} else
2598		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3113	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2599	3114	{
2600	3115	//int indices[] = jList.getSelectedIndices();
2601	3116	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2755,15 +3270,28 @@
2755	3270	} else
2756	3271	if (source == ungroupItem \|\| source == ungroupButton)
2757	3272	{
2758		- //ungroup();
	3273	+ boolean hasRoot = false;
	3274	+
2759	3275	for (int i=0; i<group.selection.size(); i++)
2760	3276	{
2761		- Ungroup(group.selection.get(i));
	3277	+ if (group.selection.get(i) == group)
	3278	+ {
	3279	+ hasRoot = true;
	3280	+ break;
	3281	+ }
2762	3282	}
2763	3283
2764		- ClearSelection(false);
2765		-
2766		- refreshContents();
	3284	+ if (!hasRoot)
	3285	+ {
	3286	+ for (int i=0; i<group.selection.size(); i++)
	3287	+ {
	3288	+ Ungroup(group.selection.get(i));
	3289	+ }
	3290	+
	3291	+ ClearSelection(false);
	3292	+
	3293	+ refreshContents();
	3294	+ }
2767	3295	} else
2768	3296	if (source == genUVItem)
2769	3297	{
..	..	@@ -3064,7 +3592,7 @@
3064	3592	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3065	3593	{
3066	3594	obj = (Object3D)e.nextElement();
3067		- obj.SetBumpTexture(null);
	3595	+ obj.ResetBumpTexture();
3068	3596	}
3069	3597
3070	3598	refreshContents();
..	..	@@ -3078,6 +3606,31 @@
3078	3606	obj.SetBumpTexture(obj.GetPigmentTexture());
3079	3607	}
3080	3608
	3609	+ refreshContents();
	3610	+ } else
	3611	+ if (source == embedTexturesItem)
	3612	+ {
	3613	+ Object3D obj;
	3614	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3615	+ {
	3616	+ obj = (Object3D)e.nextElement();
	3617	+ obj.EmbedTextures(true);
	3618	+ }
	3619	+
	3620	+ refreshContents();
	3621	+ } else
	3622	+ if (source == deEmbedTexturesItem)
	3623	+ {
	3624	+ Object3D obj;
	3625	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3626	+ {
	3627	+ obj = (Object3D)e.nextElement();
	3628	+ obj.EmbedTextures(false);
	3629	+ }
	3630	+
	3631	+ CameraPane.texturepigment.clear();
	3632	+ CameraPane.texturebump.clear();
	3633	+
3081	3634	refreshContents();
3082	3635	} else
3083	3636	if (source == flashSelectionButton)
..	..	@@ -3181,8 +3734,8 @@
3181	3734	// centralPanel.setVisible(true);
3182	3735	// XYZPanel.setVisible(true);
3183	3736	bigThree.ClearUI();
	3737	+ bigThree.add(scenePanel);
3184	3738	bigThree.add(centralPanel);
3185		- bigThree.add(XYZPanel);
3186	3739	bigThree.FlushUI();
3187	3740
3188	3741	cameraView.requestFocusInWindow();
..	..	@@ -3262,8 +3815,8 @@
3262	3815	// centralPanel.setVisible(true);
3263	3816	// XYZPanel.setVisible(false);
3264	3817	bigThree.ClearUI();
3265		- bigThree.add(scenePanel);
3266	3818	bigThree.add(centralPanel);
	3819	+ bigThree.add(scenePanel);
3267	3820	bigThree.FlushUI();
3268	3821
3269	3822	cameraView.requestFocusInWindow();
..	..	@@ -3369,10 +3922,10 @@
3369	3922	{
3370	3923	Object3D child = (Object3D)e.nextElement();
3371	3924	if(child.editWindow != null)
3372		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3373	3925	child.pinned = false;
3374	3926	child.CloseUI();
3375	3927	listUI.remove(child);
	3928	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3376	3929
3377	3930	//child.editWindow = null; // ???????????
3378	3931	}
..	..	@@ -3391,6 +3944,7 @@
3391	3944	obj.CloseUI();
3392	3945	}
3393	3946	listUI.clear();
	3947	+ SetPinStates(group.selection.size() > 0);
3394	3948	refreshContents(true);
3395	3949	} else
3396	3950	if (source == allParamsButton)
..	..	@@ -3446,6 +4000,9 @@
3446	4000	}
3447	4001
3448	4002	copy = group;
	4003	+
	4004	+ SetUndoStates();
	4005	+
3449	4006	//Globals.theRenderer.object = group;
3450	4007	if(!useclient)
3451	4008	{
..	..	@@ -3474,8 +4031,11 @@
3474	4031	radio.layout.doClick();
3475	4032
3476	4033	ClearUnpinned();
3477		- SetPinStates(group.selection.size() > 0);
3478		- if (group.selection.size() == 1)
	4034	+
	4035	+ //Grafreed.Assert(group != null);
	4036	+ //Grafreed.Assert(group.selection != null);
	4037	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4038	+ if (group.selection == null \|\| group.selection.size() == 1)
3479	4039	EditSelection(false);
3480	4040	keepparent = group.parent;
3481	4041	// PARENT = NULL or not???
..	..	@@ -3488,11 +4048,13 @@
3488	4048	} else if (event.getSource() == editCameraItem)
3489	4049	{
3490	4050	cameraView.ProtectCamera();
	4051	+ cameraView.requestFocusInWindow();
3491	4052	cameraView.repaint();
3492	4053	return;
3493	4054	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3494	4055	{
3495	4056	cameraView.RevertCamera();
	4057	+ cameraView.requestFocusInWindow();
3496	4058	cameraView.repaint();
3497	4059	return;
3498	4060	// } else if (event.getSource() == textureButton)
..	..	@@ -4069,7 +4631,7 @@
4069	4631
4070	4632	try
4071	4633	{
4072		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4634	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4073	4635	}
4074	4636	catch (Exception e)
4075	4637	{
..	..	@@ -4546,6 +5108,12 @@
4546	5108
4547	5109	void EditSelection(boolean newWindow)
4548	5110	{
	5111	+ if (group.selection == null)
	5112	+ {
	5113	+ EditElement(group, newWindow); // ? new
	5114	+ return;
	5115	+ }
	5116	+
4549	5117	// aConstraints.gridy = 0;
4550	5118	for (int i=0; i<group.selection.size(); i++)
4551	5119	{
..	..	@@ -4556,12 +5124,7 @@
4556	5124	Object3D elem = (Object3D)group.selection.elementAt(i);
4557	5125	if(elem != group \|\| !newWindow)
4558	5126	{
4559		- // if (!(elem instanceof Composite))
4560		- // newWindow = false;
4561		- listUI.add(elem);
4562		- elem.openEditWindow(this, newWindow); //, false);
4563		- System.out.println("edit : " + elem);
4564		- elem.editWindow.refreshContents(true); // ? new
	5127	+ EditElement(elem, newWindow); // ? new
4565	5128	}
4566	5129	}
4567	5130	}
..	..	@@ -4624,9 +5187,7 @@
4624	5187
4625	5188	freezemodel = false;
4626	5189	}
4627		-
4628		- boolean flashIt = true;
4629		-
	5190	+
4630	5191	public void valueChanged(TreeSelectionEvent e)
4631	5192	//public boolean handleEvent(Event event)
4632	5193	{
..	..	@@ -4699,14 +5260,16 @@
4699	5260	{
4700	5261	editButton.setEnabled(enabled);
4701	5262	uneditButton.setEnabled(enabled);
4702		- unselectButton.setEnabled(enabled);
	5263	+ //unselectButton.setEnabled(enabled);
4703	5264	flashSelectionButton.setEnabled(enabled);
	5265	+
	5266	+ clearPanelButton.setEnabled(!listUI.isEmpty());
4704	5267	}
4705	5268
4706	5269	void refreshContents(boolean cp)
4707	5270	{
4708		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4709		- if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	5271	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5272	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4710	5273	{
4711	5274	objEditor.ClearInfo(); // .GetMaterial());
4712	5275
..	..	@@ -4805,8 +5368,8 @@
4805	5368
4806	5369	if (cut)
4807	5370	{
4808		- if (Globals.SAVEONMAKE)
4809		- Save();
	5371	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5372	+// Save();
4810	5373	//int indices[] = jList.getSelectedIndices();
4811	5374	//for (int i = indices.length - 1; i >= 0; i--)
4812	5375	//jList.remove(indices[i]);
..	..	@@ -4909,6 +5472,10 @@
4909	5472
4910	5473	void paste(boolean expand)
4911	5474	{
	5475	+ if (Globals.REPLACEONMAKE)
	5476	+ Save();
	5477	+ boolean keep = Globals.REPLACEONMAKE;
	5478	+ Globals.REPLACEONMAKE = false;
4912	5479	// if (GrafreeD.clipboard == null)
4913	5480	// return;
4914	5481	boolean first = true;
..	..	@@ -4968,6 +5535,7 @@
4968	5535	Grafreed.clipboard.get(0).parent = keepparent;
4969	5536	}
4970	5537
	5538	+ Globals.REPLACEONMAKE = keep;
4971	5539	ResetModel();
4972	5540	refreshContents();
4973	5541	}
..	..	@@ -5103,6 +5671,10 @@
5103	5671
5104	5672	void group(Object3D csg, boolean grab)
5105	5673	{
	5674	+ if (Globals.REPLACEONMAKE)
	5675	+ Save();
	5676	+ boolean keep = Globals.REPLACEONMAKE;
	5677	+ Globals.REPLACEONMAKE = false;
5106	5678	if (//false) // why??
5107	5679	!group.selection.isEmpty())
5108	5680	{
..	..	@@ -5216,10 +5788,15 @@
5216	5788	//node.add(csg);
5217	5789	//makeSomething(node);
5218	5790	makeSomething(csg);
	5791	+ Globals.REPLACEONMAKE = keep;
5219	5792	}
5220	5793
5221	5794	void Ungroup(Object3D g)
5222	5795	{
	5796	+ if (Globals.REPLACEONMAKE)
	5797	+ Save();
	5798	+ boolean keep = Globals.REPLACEONMAKE;
	5799	+ Globals.REPLACEONMAKE = false;
5223	5800	if (g instanceof HiddenObject)
5224	5801	{
5225	5802	HiddenObject h = (HiddenObject) g;
..	..	@@ -5236,6 +5813,7 @@
5236	5813	objEditor.makeSomething(g.get(i), false);
5237	5814	}
5238	5815	}
	5816	+ Globals.REPLACEONMAKE = keep;
5239	5817	}
5240	5818
5241	5819	void ungroup()
..	..	@@ -5526,10 +6104,6 @@
5526	6104
5527	6105	cButton restoreCameraButton;
5528	6106
5529		- cButton minButton;
5530		- cButton maxButton;
5531		- cButton fullButton;
5532		- cButton saveButton;
5533	6107	cButton oneStepButton;
5534	6108
5535	6109	cButton groupButton;
..	..	@@ -5538,6 +6112,22 @@
5538	6112	cButton switchButton;
5539	6113	cButton loopButton;
5540	6114	cButton textureButton;
	6115	+
	6116	+ cButton skybox1Button;
	6117	+ cButton skybox2Button;
	6118	+ cButton skybox3Button;
	6119	+ cButton skybox4Button;
	6120	+ cButton skybox5Button;
	6121	+ cButton skybox6Button;
	6122	+ cButton skybox7Button;
	6123	+
	6124	+ cButton skybox11Button;
	6125	+ cButton skybox12Button;
	6126	+ cButton skybox13Button;
	6127	+ cButton skybox14Button;
	6128	+ cButton skybox15Button;
	6129	+ cButton skybox16Button;
	6130	+ cButton skybox17Button;
5541	6131
5542	6132	cButton gridButton;
5543	6133	cButton boxButton;
..	..	@@ -5602,7 +6192,7 @@
5602	6192	private MenuItem pasteLinkItem;
5603	6193	private MenuItem pasteCloneItem;
5604	6194	private MenuItem pasteExpandItem;
5605		- private MenuItem clearItem;
	6195	+ private MenuItem deleteItem;
5606	6196	private MenuItem clearAllItem;
5607	6197	private MenuItem genUVItem;
5608	6198	private MenuItem genNormalsMESHItem;
..	..	@@ -5686,6 +6276,8 @@
5686	6276	private MenuItem attachBumpItem;
5687	6277	private MenuItem detachBumpItem;
5688	6278	private MenuItem pigmentBumpItem;
	6279	+ private MenuItem embedTexturesItem;
	6280	+ private MenuItem deEmbedTexturesItem;
5689	6281
5690	6282	private MenuItem particleItem;
5691	6283	private MenuItem ragdollItem;