~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -23,6 +23,302 @@
23	23	DragGestureListener, DragSourceListener, DropTargetListener,
24	24	ItemListener // ListSelectionListener
25	25	{
	26	+
	27	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	28	+ {
	29	+ cButton skyboxButton;
	30	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	31	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	32	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	33	+ skyboxButton.setToolTipText(s);
	34	+ skyboxButton.addActionListener(new ActionListener()
	35	+ {
	36	+ @Override
	37	+ public void actionPerformed(ActionEvent e)
	38	+ {
	39	+ ChangeSkybox(path);
	40	+ }
	41	+ });
	42	+ }
	43	+
	44	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	45	+ {
	46	+ cGridBag tab0 = new cGridBag().setVertical(true);
	47	+
	48	+ tab0.setName("Urban");
	49	+ skyboxpanel.add(tab0);
	50	+
	51	+ cGridBag row0 = new cGridBag();
	52	+ cGridBag row1 = new cGridBag();
	53	+ cGridBag row2 = new cGridBag();
	54	+ cGridBag row3 = new cGridBag();
	55	+ cGridBag row4 = new cGridBag();
	56	+ cGridBag row5 = new cGridBag();
	57	+ cGridBag row6 = new cGridBag();
	58	+
	59	+ AddSkyboxButton("default", "rgb", row0);
	60	+ //AddSkyboxButton("default", "cornell", row0);
	61	+ AddSkyboxButton("penguins", "dust", row0);
	62	+ AddSkyboxButton("penguins", "tropic", row0);
	63	+ AddSkyboxButton("penguins", "yonder", row0);
	64	+
	65	+ AddSkyboxButton("default", "uffizi", row1);
	66	+ AddSkyboxButton("bridge", "Bridge", row1);
	67	+ AddSkyboxButton("bridge", "Bridge2", row1);
	68	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	69	+
	70	+ AddSkyboxButton("urban", "Parliament", row2);
	71	+ AddSkyboxButton("urban", "Roundabout", row2);
	72	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	73	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	74	+
	75	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	76	+ AddSkyboxButton("urban", "UnionSquare", row3);
	77	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	78	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	79	+
	80	+ AddSkyboxButton("park", "Buddha", row4);
	81	+ AddSkyboxButton("park", "CNTower2", row4);
	82	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	83	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	84	+
	85	+ AddSkyboxButton("park", "Park", row5);
	86	+ AddSkyboxButton("park", "Pond", row5);
	87	+ AddSkyboxButton("park", "Skansen", row5);
	88	+ AddSkyboxButton("park", "Skansen2", row5);
	89	+
	90	+ AddSkyboxButton("park", "Skansen3", row6);
	91	+ AddSkyboxButton("park", "Skansen4", row6);
	92	+ AddSkyboxButton("park", "Skansen5", row6);
	93	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	94	+
	95	+ tab0.add(row0);
	96	+ tab0.add(row1);
	97	+ tab0.add(row2);
	98	+ tab0.add(row3);
	99	+ tab0.add(row4);
	100	+ tab0.add(row5);
	101	+ tab0.add(row6);
	102	+
	103	+ for (int i=5; --i>=0;)
	104	+ {
	105	+ //oe.toolboxPanel.Return();
	106	+ //tab0.add(new cGridBag());
	107	+ }
	108	+ }
	109	+
	110	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	111	+ {
	112	+ cGridBag tab0 = new cGridBag().setVertical(true);
	113	+
	114	+ tab0.setName("Nature");
	115	+ skyboxpanel.add(tab0);
	116	+
	117	+ cGridBag row0 = new cGridBag();
	118	+ cGridBag row1 = new cGridBag();
	119	+ cGridBag row2 = new cGridBag();
	120	+ cGridBag row3 = new cGridBag();
	121	+ cGridBag row4 = new cGridBag();
	122	+ cGridBag row5 = new cGridBag();
	123	+ cGridBag row6 = new cGridBag();
	124	+
	125	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	126	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	127	+ AddSkyboxButton("beach", "PalmTrees", row0);
	128	+ AddSkyboxButton("beach", "Tenerife", row0);
	129	+
	130	+ AddSkyboxButton("beach", "Tenerife2", row1);
	131	+ AddSkyboxButton("beach", "Tenerife3", row1);
	132	+ AddSkyboxButton("field", "FishPond", row1);
	133	+ AddSkyboxButton("field", "Footballfield", row1);
	134	+
	135	+ AddSkyboxButton("field", "Meadow", row2);
	136	+ AddSkyboxButton("field", "Sorsele", row2);
	137	+ AddSkyboxButton("field", "Sorsele2", row2);
	138	+ AddSkyboxButton("field", "Sorsele3", row2);
	139	+
	140	+ AddSkyboxButton("forest", "Brudslojan", row3);
	141	+ AddSkyboxButton("forest", "Langholmen2", row3);
	142	+ AddSkyboxButton("forest", "Plants", row3);
	143	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	144	+
	145	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	146	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	147	+ AddSkyboxButton("mountain", "Teide", row4);
	148	+ AddSkyboxButton("park", "Tantolunden4", row4);
	149	+
	150	+ AddSkyboxButton("park", "Stairs", row5);
	151	+ AddSkyboxButton("default", "skycube", row6);
	152	+ AddSkyboxButton("rocky", "Langholmen", row5);
	153	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	154	+
	155	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	156	+ AddSkyboxButton("default", "CloudyHills", row6);
	157	+ AddSkyboxButton("daz", "Autumn", row6);
	158	+ AddSkyboxButton("daz", "MountainTrail", row6);
	159	+ /*
	160	+Autumn
	161	+Greenlands
	162	+MountainTrail
	163	+Oasis
	164	+TheRock
	165	+TopOfTheWorld
	166	+Winter
	167	+ */
	168	+
	169	+ tab0.add(row0);
	170	+ tab0.add(row1);
	171	+ tab0.add(row2);
	172	+ tab0.add(row3);
	173	+ tab0.add(row4);
	174	+ tab0.add(row5);
	175	+ tab0.add(row6);
	176	+
	177	+ for (int i=5; --i>=0;)
	178	+ {
	179	+ //oe.toolboxPanel.Return();
	180	+ //tab0.add(new cGridBag());
	181	+ }
	182	+ }
	183	+
	184	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	185	+ {
	186	+ cGridBag tab0 = new cGridBag().setVertical(true);
	187	+
	188	+ tab0.setName("Night");
	189	+ skyboxpanel.add(tab0);
	190	+
	191	+ cGridBag row0 = new cGridBag();
	192	+ cGridBag row1 = new cGridBag();
	193	+ cGridBag row2 = new cGridBag();
	194	+ cGridBag row3 = new cGridBag();
	195	+ cGridBag row4 = new cGridBag();
	196	+ cGridBag row5 = new cGridBag();
	197	+ cGridBag row6 = new cGridBag();
	198	+
	199	+ AddSkyboxButton("night", "NightPath", row0);
	200	+ AddSkyboxButton("night", "PondNight", row0);
	201	+ AddSkyboxButton("night", "Powerlines", row0);
	202	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	203	+
	204	+ AddSkyboxButton("urban", "CNTower", row1);
	205	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	206	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	207	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	208	+
	209	+ AddSkyboxButton("penguins", "kenon_star", row2);
	210	+ AddSkyboxButton("persson", "corona", row2);
	211	+ AddSkyboxButton("persson", "spaceskybox", row2);
	212	+ AddSkyboxButton("indoors", "Vasa", row2);
	213	+
	214	+ AddSkyboxButton("winter", "Backyard", row3);
	215	+ AddSkyboxButton("winter", "Creek", row3);
	216	+ AddSkyboxButton("winter", "FootballField3", row3);
	217	+ AddSkyboxButton("winter", "Forest", row3);
	218	+
	219	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	220	+ AddSkyboxButton("winter", "House", row4);
	221	+ AddSkyboxButton("winter", "IceLake", row4);
	222	+ AddSkyboxButton("winter", "IceRiver", row4);
	223	+
	224	+ AddSkyboxButton("winter", "Park3", row5);
	225	+ AddSkyboxButton("winter", "PondWinter", row5);
	226	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	227	+ AddSkyboxButton("winter", "Vindelalven", row5);
	228	+
	229	+ AddSkyboxButton("daz", "TheRock", row6);
	230	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	231	+ AddSkyboxButton("daz", "Winter", row6);
	232	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	233	+
	234	+ tab0.add(row0);
	235	+ tab0.add(row1);
	236	+ tab0.add(row2);
	237	+ tab0.add(row3);
	238	+ tab0.add(row4);
	239	+ tab0.add(row5);
	240	+ tab0.add(row6);
	241	+
	242	+ for (int i=5; --i>=0;)
	243	+ {
	244	+ //oe.toolboxPanel.Return();
	245	+ //tab0.add(new cGridBag());
	246	+ }
	247	+ }
	248	+
	249	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	250	+ {
	251	+ cGridBag tab0 = new cGridBag().setVertical(true);
	252	+
	253	+ tab0.setName("Others");
	254	+ skyboxpanel.add(tab0);
	255	+
	256	+ cGridBag row0 = new cGridBag();
	257	+ cGridBag row1 = new cGridBag();
	258	+ cGridBag row2 = new cGridBag();
	259	+ cGridBag row3 = new cGridBag();
	260	+ cGridBag row4 = new cGridBag();
	261	+ cGridBag row5 = new cGridBag();
	262	+ cGridBag row6 = new cGridBag();
	263	+
	264	+ AddSkyboxButton("mayhem", "afterrain", row0);
	265	+ AddSkyboxButton("mayhem", "aqua4", row0);
	266	+ AddSkyboxButton("mayhem", "aqua9", row0);
	267	+ AddSkyboxButton("mayhem", "flame", row0);
	268	+
	269	+ AddSkyboxButton("mayhem", "h2s", row1);
	270	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	271	+ AddSkyboxButton("mayhem", "scorched", row1);
	272	+ AddSkyboxButton("penguins", "desertdawn", row1);
	273	+
	274	+ AddSkyboxButton("persson", "Citadella", row2);
	275	+ AddSkyboxButton("persson", "Citadella2", row2);
	276	+ AddSkyboxButton("persson", "clouds1", row2);
	277	+ AddSkyboxButton("penguins", "wrath", row2);
	278	+
	279	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	280	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	281	+ AddSkyboxButton("indoors", "DallasW", row3);
	282	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	283	+
	284	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	285	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	286	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	287	+ AddSkyboxButton("persson", "redeclipse", row4);
	288	+
	289	+ AddSkyboxButton("daz", "Greenlands", row5);
	290	+ AddSkyboxButton("daz", "Oasis", row5);
	291	+ AddSkyboxButton("elyvisions", "arch3", row5);
	292	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	293	+
	294	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	295	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	296	+ AddSkyboxButton("elyvisions", "heaven", row6);
	297	+ AddSkyboxButton("elyvisions", "hot", row6);
	298	+
	299	+ tab0.add(row0);
	300	+ tab0.add(row1);
	301	+ tab0.add(row2);
	302	+ tab0.add(row3);
	303	+ tab0.add(row4);
	304	+ tab0.add(row5);
	305	+ tab0.add(row6);
	306	+
	307	+ for (int i=5; --i>=0;)
	308	+ {
	309	+ //oe.toolboxPanel.Return();
	310	+ //tab0.add(new cGridBag());
	311	+ }
	312	+ }
	313	+
	314	+ public void ChangeSkybox(String name)
	315	+ {
	316	+ //cameraView.envyoff = false;
	317	+ group.skyboxname = name;
	318	+ group.skyboxext = "jpg";
	319	+ cameraView.repaint();
	320	+ }
	321	+
26	322	//ObjEditor objEditor;
27	323	public void closeUI2()
28	324	{
..	..	@@ -60,6 +356,12 @@
60	356	this.copy = this.group = group;
61	357	//selectees = this.group.selectees;
62	358
	359	+ if (copy.versionlist == null)
	360	+ {
	361	+ copy.versionlist = new Object3D[100];
	362	+ copy.versionindex = -1;
	363	+ }
	364	+
63	365	if(ui)
64	366	SetupUI(objEditor);
65	367	}
..	..	@@ -80,10 +382,22 @@
80	382	SetupViews(objEditor);
81	383
82	384	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	385	+
	386	+ if (copy.versionlist == null)
	387	+ {
	388	+ copy.versionlist = new Object3D[100];
	389	+ copy.versionindex = -1;
	390	+
	391	+ Save(true);
	392	+ }
83	393	}
84	394
85	395	void CloneSelection(boolean supports)
86	396	{
	397	+ if (Globals.REPLACEONMAKE)
	398	+ Save();
	399	+ boolean keep = Globals.REPLACEONMAKE;
	400	+ Globals.REPLACEONMAKE = false;
87	401	// Object3D keep = GrafreeD.clipboard;
88	402	//Object3D obj;
89	403	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +408,7 @@
94	408
95	409	makeSomething(clone, i==group.selection.size()-1);
96	410	}
	411	+ Globals.REPLACEONMAKE = keep;
97	412	}
98	413
99	414	void CloneClipboard(boolean supports)
..	..	@@ -189,8 +504,8 @@
189	504	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
190	505	// pasteExpandItem.addActionListener(this);
191	506	menu.add("-");
192		- clearItem = menu.add(new MenuItem("Clear"));
193		- clearItem.addActionListener(this);
	507	+ deleteItem = menu.add(new MenuItem("Delete"));
	508	+ deleteItem.addActionListener(this);
194	509
195	510	if (Globals.ADVANCED)
196	511	{
..	..	@@ -380,14 +695,14 @@
380	695	shadowYItem.addActionListener(this);
381	696	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
382	697	shadowZItem.addActionListener(this);
	698	+ attributeItem = menu.add(new MenuItem("Attribute"));
	699	+ attributeItem.addActionListener(this);
383	700
384	701	if (Globals.ADVANCED)
385	702	{
386	703	menu.add("-");
387	704	linkerItem = menu.add(new MenuItem("Linker"));
388	705	linkerItem.addActionListener(this);
389		- attributeItem = menu.add(new MenuItem("Attribute"));
390		- attributeItem.addActionListener(this);
391	706	templateItem = menu.add(new MenuItem("Template"));
392	707	templateItem.addActionListener(this);
393	708	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -416,7 +731,7 @@
416	731	genNormalsMESHItem.addActionListener(this);
417	732	if (Globals.ADVANCED)
418	733	{
419		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	734	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
420	735	genNormalsMINEItem.addActionListener(this);
421	736	}
422	737	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -509,10 +824,15 @@
509	824	attachBumpItem.addActionListener(this);
510	825	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
511	826	pigmentBumpItem.addActionListener(this);
	827	+ //embedTexturesItem
512	828	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
513	829	detachPigmentItem.addActionListener(this);
514	830	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
515	831	detachBumpItem.addActionListener(this);
	832	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	833	+ embedTexturesItem.addActionListener(this);
	834	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	835	+ deEmbedTexturesItem.addActionListener(this);
516	836	menu.add("-");
517	837	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
518	838	sortbysizeItem.addActionListener(this);
..	..	@@ -539,6 +859,7 @@
539	859	buildToolsMenu(menu);
540	860	}
541	861
	862	+
542	863	void SetupUI2(ObjEditor oe)
543	864	{
544	865	// June 2019
..	..	@@ -583,7 +904,7 @@
583	904	*/
584	905	cGridBag copyOptionsPanel = new cGridBag();
585	906
586		- copyOptionsPanel.preferredHeight = 1;
	907	+ copyOptionsPanel.preferredHeight = 2;
587	908
588	909	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
589	910
..	..	@@ -610,29 +931,46 @@
610	931	restoreCameraButton.setToolTipText("Restore viewpoint");
611	932	restoreCameraButton.addActionListener(this);
612	933
613		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
614		- undoButton.setToolTipText("Undo changes");
615		- undoButton.addActionListener(this);
616		- undoButton.setEnabled(false);
	934	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	935	+ saveVersionButton.setToolTipText("Duplicate current version");
	936	+ saveVersionButton.addActionListener(this);
	937	+
	938	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	939	+ deleteVersionButton.setToolTipText("Delete current version");
	940	+ deleteVersionButton.addActionListener(this);
	941	+
	942	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	943	+ previousVersionButton.setToolTipText("Previous version");
	944	+ previousVersionButton.addActionListener(this);
	945	+ previousVersionButton.setEnabled(false);
617	946
618		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
619		- redoButton.setToolTipText("Redo changes");
620		- redoButton.addActionListener(this);
621		- redoButton.setEnabled(false);
	947	+ cGridBag updown = new cGridBag().setVertical(true);
	948	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	949	+ restoreButton.setToolTipText("Undo (restore current version)");
	950	+ restoreButton.addActionListener(this);
	951	+ //restoreButton.setEnabled(false);
622	952
623		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624		- saveButton.setToolTipText("Save changes");
625		- saveButton.addActionListener(this);
	953	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	954	+ replaceButton.setToolTipText("Save (replace current version)");
	955	+ replaceButton.addActionListener(this);
	956	+ //replaceButton.setEnabled(false);
626	957
627		- copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	958	+ copyOptionsPanel.add(updown);
	959	+
	960	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	961	+ nextVersionButton.setToolTipText("Next version");
	962	+ nextVersionButton.addActionListener(this);
	963	+ nextVersionButton.setEnabled(false);
	964	+
	965	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
628	966	liveCB.setToolTipText("Enable animation");
629	967	liveCB.addItemListener(this);
630	968
631		- copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	969	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632	970	oneStepButton.setToolTipText("Animate one step forward");
633	971	oneStepButton.addActionListener(this);
634	972
635		- copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	973	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
636	974	fastCB.setToolTipText("Fast mode");
637	975	fastCB.addItemListener(this);
638	976
..	..	@@ -650,31 +988,32 @@
650	988	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
651	989	snapobjectButton.addActionListener(this);
652	990	snapobjectButton.setToolTipText("Snap Object");
	991	+
	992	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	993	+ fourButton.addActionListener(this);
	994	+ fourButton.setToolTipText("Show control panel only");
653	995	}
654	996
655	997	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
656	998
657		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658		- twoButton.setToolTipText("Show center view only");
	999	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1000	+ twoButton.setToolTipText("Show 3D view only");
659	1001	twoButton.addActionListener(this);
660	1002	this.fullscreenLayout = twoButton;
661	1003
662		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
663		- fourButton.addActionListener(this);
664		- fourButton.setToolTipText("Show left panel only");
665		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
666		- sixButton.setToolTipText("2-column layout left");
667		- sixButton.addActionListener(this);
668		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
669		- threeButton.setToolTipText("2-column layout right");
	1004	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1005	+ threeButton.setToolTipText("Show controls and 3D view");
670	1006	threeButton.addActionListener(this);
671		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
672		- sevenButton.setToolTipText("3-column layout");
673		- sevenButton.addActionListener(this);
	1007	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1008	+ sixButton.setToolTipText("Show 3D view and controls");
	1009	+ sixButton.addActionListener(this);
	1010	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1011	+// sevenButton.setToolTipText("3-column layout");
	1012	+// sevenButton.addActionListener(this);
674	1013	//
675	1014
676		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
677		- rootButton.setToolTipText("Edit selection in new tab");
	1015	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1016	+ rootButton.setToolTipText("Open selection in new tab");
678	1017	rootButton.addActionListener(this);
679	1018
680	1019	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -683,28 +1022,30 @@
683	1022	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
684	1023	//clearButton.addActionListener(this);
685	1024
	1025	+ cGridBag row1 = new cGridBag();
	1026	+
686	1027	// INSERT
687		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1028	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
688	1029	gridButton.setToolTipText("Create grid");
689	1030	gridButton.addActionListener(this);
690	1031
691		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1032	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
692	1033	boxButton.setToolTipText("Create box");
693	1034	boxButton.addActionListener(this);
694	1035
695		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1036	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
696	1037	sphereButton.setToolTipText("Create sphere");
697	1038	sphereButton.addActionListener(this);
698	1039
699		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1040	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
700	1041	coneButton.setToolTipText("Create cone");
701	1042	coneButton.addActionListener(this);
702	1043
703		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1044	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
704	1045	torusButton.setToolTipText("Create torus");
705	1046	torusButton.addActionListener(this);
706	1047
707		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1048	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
708	1049	superButton.setToolTipText("Create superellipsoid");
709	1050	superButton.addActionListener(this);
710	1051
..	..	@@ -715,51 +1056,57 @@
715	1056	kleinButton.addActionListener(this);
716	1057	}
717	1058
718		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1059	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
719	1060	particlesButton.setToolTipText("Create particle system");
720	1061	particlesButton.addActionListener(this);
721	1062
722		- oe.toolboxPanel.Return();
	1063	+ oe.toolboxPanel.add(row1);
723	1064
724		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1065	+ cGridBag row2 = new cGridBag();
	1066	+
	1067	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
725	1068	groupButton.setToolTipText("Create group");
726	1069	groupButton.addActionListener(this);
727	1070
728		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1071	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
729	1072	compositeButton.setToolTipText("Create composite");
730	1073	compositeButton.addActionListener(this);
731	1074
732		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1075	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
733	1076	switchButton.setToolTipText("Create item switcher");
734	1077	switchButton.addActionListener(this);
735	1078
736		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1079	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
737	1080	loopButton.setToolTipText("Create loop");
738	1081	loopButton.addActionListener(this);
739	1082
740		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1083	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
741	1084	textureButton.setToolTipText("Create texture");
742	1085	textureButton.addActionListener(this);
743	1086
744		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1087	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
745	1088	overlayButton.setToolTipText("Create overlay");
746	1089	overlayButton.addActionListener(this);
747	1090
748		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1091	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
749	1092	lightButton.setToolTipText("Create light");
750	1093	lightButton.addActionListener(this);
751	1094
752		- for (int i=6; --i>=0;)
753		- {
754		- oe.toolboxPanel.Return();
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		- oe.toolboxPanel.add(new cGridBag());
762		- }
	1095	+ oe.toolboxPanel.add(row2);
	1096	+
	1097	+ // ENVYMAPS
	1098	+ cGridBag skyboxpane = new cGridBag();
	1099	+ skyboxpane.preferredHeight = 100;
	1100	+
	1101	+ oe.toolboxPanel.add(skyboxpane);
	1102	+
	1103	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1104	+ skyboxpane.add(skyboxpanel);
	1105	+
	1106	+ AddSkyboxTab0(skyboxpanel);
	1107	+ AddSkyboxTab1(skyboxpanel);
	1108	+ AddSkyboxTab2(skyboxpanel);
	1109	+ AddSkyboxTab3(skyboxpanel);
763	1110
764	1111	// EDIT panel
765	1112	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -767,14 +1114,14 @@
767	1114	editButton.addActionListener(this);
768	1115
769	1116	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
770		- uneditButton.setToolTipText("Remove selection controls");
	1117	+ uneditButton.setToolTipText("Unpin and remove selection controls");
771	1118	uneditButton.addActionListener(this);
772	1119
773	1120	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
774	1121	allParamsButton.setToolTipText("Show all controle");
775	1122	allParamsButton.addActionListener(this);
776	1123
777		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
778	1125	clearPanelButton.setToolTipText("Clear edit panel");
779	1126	clearPanelButton.addActionListener(this);
780	1127
..	..	@@ -815,9 +1162,12 @@
815	1162
816	1163	oe.treePanel.add(copyOptionsPanel);
817	1164	oe.treePanel.Return();
	1165	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1166	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1167	+ sliderPane.preferredHeight = 1;
818	1168
819		-// mainPanel.setDividerLocation(0.5); //1.0);
820		-// mainPanel.setResizeWeight(0.5);
	1169	+// mainPanel.setDividerLocation(0.1); //1.0);
	1170	+ mainPanel.setResizeWeight(0.4);
821	1171
822	1172	//jList.addListSelectionListener(this);
823	1173	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -825,7 +1175,7 @@
825	1175	//jTree.setEditable(true);
826	1176	oe.jTree.setDragEnabled(true);
827	1177	//jTree.setPreferredSize(new Dimension(10,10));
828		- jSP.setPreferredSize(new Dimension(100,200));
	1178	+ //jSP.setPreferredSize(new Dimension(100,200));
829	1179
830	1180	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
831	1181
..	..	@@ -837,7 +1187,7 @@
837	1187	dgr.addDragGestureListener(this);
838	1188	}catch(Exception e) {}
839	1189	*/
840		- radio.layout = sevenButton;
	1190	+ radio.layout = threeButton; // sixButton;
841	1191	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
842	1192	}
843	1193
..	..	@@ -888,9 +1238,12 @@
888	1238	smoothCB.setToolTipText("Snapping delay");
889	1239	smoothCB.addItemListener(this);
890	1240
891		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
892		- slowCB.setToolTipText("Smooth interpolation");
893		- slowCB.addItemListener(this);
	1241	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1242	+// slowCB.setToolTipText("Smooth interpolation");
	1243	+// slowCB.addItemListener(this);
	1244	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1245	+ minshaderCB.setToolTipText("Minimal fast shader");
	1246	+ minshaderCB.addItemListener(this);
894	1247
895	1248	// constraints.gridy += 1;
896	1249	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -940,9 +1293,9 @@
940	1293	toggleSwitchCB.setToolTipText("Choose a single item");
941	1294	toggleSwitchCB.addItemListener(this);
942	1295
943		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
944		- autosaveCB.setToolTipText("On structure change");
945		- autosaveCB.addItemListener(this);
	1296	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1297	+ autokeepCB.setToolTipText("On structure change");
	1298	+ autokeepCB.addItemListener(this);
946	1299
947	1300	panel.Return();
948	1301	if (Globals.ADVANCED)
..	..	@@ -971,7 +1324,7 @@
971	1324	{
972	1325	cRadio radioButton = new cRadio(obj.name);
973	1326
974		- // Patch to avoid bug with transparency.
	1327	+ // June 2019. Patch to avoid bug with transparency.
975	1328	radioButton.hadMaterial = obj.material != null;
976	1329	if (!radioButton.hadMaterial)
977	1330	{
..	..	@@ -979,7 +1332,7 @@
979	1332	}
980	1333
981	1334	radioButton.SetObject(obj);
982		- radioButton.layout = sevenButton;
	1335	+ radioButton.layout = threeButton; // sixButton;
983	1336	radioButton.SetCamera(cameraView.renderCamera, false);
984	1337	radioButton.addActionListener(this);
985	1338	radioPanel.add(radioButton);
..	..	@@ -1004,6 +1357,8 @@
1004	1357	cCheckBox localCB;
1005	1358	cCheckBox crowdCB;
1006	1359	cCheckBox smoothCB;
	1360	+ cCheckBox minshaderCB;
	1361	+
1007	1362	cToggleButton fastCB;
1008	1363	cCheckBox slowCB;
1009	1364	cCheckBox boxCB;
..	..	@@ -1019,7 +1374,7 @@
1019	1374
1020	1375	cCheckBox oeilCB;
1021	1376	cCheckBox shadowCB;
1022		- cCheckBox autosaveCB;
	1377	+ cCheckBox autokeepCB;
1023	1378	cCheckBox lookAtCB;
1024	1379
1025	1380	// static int COLOR = 1;
..	..	@@ -1074,6 +1429,12 @@
1074	1429	{
1075	1430	cameraView.ToggleInertia();
1076	1431	cameraView.repaint();
	1432	+ }
	1433	+ else if(e.getSource() == minshaderCB)
	1434	+ {
	1435	+ Globals.MINSHADER ^= true;
	1436	+ cameraView.programInitialized = false;
	1437	+ cameraView.repaint();
1077	1438	}
1078	1439	else if(e.getSource() == localCB)
1079	1440	{
..	..	@@ -1131,9 +1492,9 @@
1131	1492	{
1132	1493	Globals.FREEZEONMOVE ^= true;
1133	1494	}
1134		- else if(e.getSource() == autosaveCB)
	1495	+ else if(e.getSource() == autokeepCB)
1135	1496	{
1136		- Globals.SAVEONMAKE ^= true;
	1497	+ Globals.REPLACEONMAKE ^= true;
1137	1498	}
1138	1499	else if(e.getSource() == lookAtCB)
1139	1500	{
..	..	@@ -1223,7 +1584,7 @@
1223	1584	// return;
1224	1585	// }
1225	1586
1226		- String string = (String) object;
	1587	+ String string = object.toString();
1227	1588
1228	1589	// File path for Mac and Windows
1229	1590	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1488,6 +1849,8 @@
1488	1849	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1489	1850	reduce34MorphItem.addActionListener(this);
1490	1851	menu.add("-");
	1852	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1853	+ memoryItem.addActionListener(this);
1491	1854	menu.add(computeAOItem = new MenuItem("Compute AO"));
1492	1855	computeAOItem.addActionListener(this);
1493	1856
..	..	@@ -1496,8 +1859,6 @@
1496	1859	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1497	1860	mirrorItem.addActionListener(this);
1498	1861	menu.add("-");
1499		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1500		- memoryItem.addActionListener(this);
1501	1862	menu.add(analyzeItem = new MenuItem("Analyze"));
1502	1863	analyzeItem.addActionListener(this);
1503	1864	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1658,6 +2019,16 @@
1658	2019	listUI.remove(i);
1659	2020	}
1660	2021	}
	2022	+ }
	2023	+
	2024	+ private void EditElement(Object3D elem, boolean newWindow)
	2025	+ {
	2026	+ // if (!(elem instanceof Composite))
	2027	+ // newWindow = false;
	2028	+ listUI.add(elem);
	2029	+ elem.openEditWindow(this, newWindow); //, false);
	2030	+ System.out.println("edit : " + elem);
	2031	+ elem.editWindow.refreshContents(true); // ? new
1661	2032	}
1662	2033
1663	2034	/**
..	..	@@ -2087,6 +2458,23 @@
2087	2458	{
2088	2459	makeSomething(new Light());
2089	2460	} else
	2461	+// if (source == skybox1Button \|\|
	2462	+// source == skybox2Button \|\|
	2463	+// source == skybox3Button \|\|
	2464	+// source == skybox4Button \|\|
	2465	+// source == skybox5Button \|\|
	2466	+// source == skybox6Button \|\|
	2467	+// source == skybox7Button \|\|
	2468	+// source == skybox11Button \|\|
	2469	+// source == skybox12Button \|\|
	2470	+// source == skybox13Button \|\|
	2471	+// source == skybox14Button \|\|
	2472	+// source == skybox15Button \|\|
	2473	+// source == skybox16Button \|\|
	2474	+// source == skybox17Button)
	2475	+// {
	2476	+// ChangeSkybox(source);
	2477	+// } else
2090	2478	if (source == csgItem)
2091	2479	{
2092	2480	group(new CSG());
..	..	@@ -2172,7 +2560,7 @@
2172	2560	if (source == computeAOItem)
2173	2561	{
2174	2562	Globals.drawMode = CameraPane.OCCLUSION;
2175		- Globals.theRenderer.repaint();
	2563	+ cameraView.repaint();
2176	2564	} else
2177	2565	if (source == recompileItem)
2178	2566	{
..	..	@@ -2187,7 +2575,7 @@
2187	2575	if (source == invariantsItem)
2188	2576	{
2189	2577	System.out.println("Invariants:");
2190		- Grafreed.grafreeD.universe.invariants();
	2578	+ Grafreed.grafreed.universe.invariants();
2191	2579	} else
2192	2580	if (source == memoryItem)
2193	2581	{
..	..	@@ -2218,19 +2606,40 @@
2218	2606	{
2219	2607	ToggleFullScreen();
2220	2608	} else
2221		- if (source == undoButton)
	2609	+ if (source == previousVersionButton)
2222	2610	{
2223		- if (!Undo())
2224		- java.awt.Toolkit.getDefaultToolkit().beep();
	2611	+ // Go to previous version
	2612	+ //if (!Undo())
	2613	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2614	+ PreviousVersion();
2225	2615	} else
2226		- if (source == redoButton)
	2616	+ if (source == restoreButton)
2227	2617	{
2228		- Redo();
	2618	+ // Restore current version
	2619	+ Restore();
	2620	+ //restoreButton.setEnabled(false);
2229	2621	} else
2230		- if (source == saveButton)
	2622	+ if (source == replaceButton)
2231	2623	{
	2624	+ // Overwrite current version
	2625	+ Replace();
	2626	+ //replaceButton.setEnabled(false);
	2627	+ } else
	2628	+ if (source == nextVersionButton)
	2629	+ {
	2630	+ // Go to next version
	2631	+ NextVersion();
	2632	+ } else
	2633	+ if (source == saveVersionButton)
	2634	+ {
	2635	+ // Save a new version
2232	2636	if (!Save(true))
2233	2637	java.awt.Toolkit.getDefaultToolkit().beep();
	2638	+ } else
	2639	+ if (source == deleteVersionButton)
	2640	+ {
	2641	+ // Delete a new version
	2642	+ DeleteVersion();
2234	2643	} else
2235	2644	if (source == oneStepButton)
2236	2645	{
..	..	@@ -2285,11 +2694,11 @@
2285	2694	} else
2286	2695	if (source == undoItem)
2287	2696	{
2288		- Undo();
	2697	+ PreviousVersion();
2289	2698	} else
2290	2699	if (source == redoItem)
2291	2700	{
2292		- Redo();
	2701	+ NextVersion();
2293	2702	} else
2294	2703	if (source == duplicateItem)
2295	2704	{
..	..	@@ -2610,7 +3019,7 @@
2610	3019	{
2611	3020	StepAll();
2612	3021	} else
2613		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3022	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2614	3023	{
2615	3024	//int indices[] = jList.getSelectedIndices();
2616	3025	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -3092,7 +3501,7 @@
3092	3501	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3093	3502	{
3094	3503	obj = (Object3D)e.nextElement();
3095		- obj.SetBumpTexture(null);
	3504	+ obj.ResetBumpTexture();
3096	3505	}
3097	3506
3098	3507	refreshContents();
..	..	@@ -3106,6 +3515,31 @@
3106	3515	obj.SetBumpTexture(obj.GetPigmentTexture());
3107	3516	}
3108	3517
	3518	+ refreshContents();
	3519	+ } else
	3520	+ if (source == embedTexturesItem)
	3521	+ {
	3522	+ Object3D obj;
	3523	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3524	+ {
	3525	+ obj = (Object3D)e.nextElement();
	3526	+ obj.EmbedTextures(true);
	3527	+ }
	3528	+
	3529	+ refreshContents();
	3530	+ } else
	3531	+ if (source == deEmbedTexturesItem)
	3532	+ {
	3533	+ Object3D obj;
	3534	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3535	+ {
	3536	+ obj = (Object3D)e.nextElement();
	3537	+ obj.EmbedTextures(false);
	3538	+ }
	3539	+
	3540	+ CameraPane.texturepigment.clear();
	3541	+ CameraPane.texturebump.clear();
	3542	+
3109	3543	refreshContents();
3110	3544	} else
3111	3545	if (source == flashSelectionButton)
..	..	@@ -3209,8 +3643,8 @@
3209	3643	// centralPanel.setVisible(true);
3210	3644	// XYZPanel.setVisible(true);
3211	3645	bigThree.ClearUI();
	3646	+ bigThree.add(scenePanel);
3212	3647	bigThree.add(centralPanel);
3213		- bigThree.add(XYZPanel);
3214	3648	bigThree.FlushUI();
3215	3649
3216	3650	cameraView.requestFocusInWindow();
..	..	@@ -3290,8 +3724,8 @@
3290	3724	// centralPanel.setVisible(true);
3291	3725	// XYZPanel.setVisible(false);
3292	3726	bigThree.ClearUI();
3293		- bigThree.add(scenePanel);
3294	3727	bigThree.add(centralPanel);
	3728	+ bigThree.add(scenePanel);
3295	3729	bigThree.FlushUI();
3296	3730
3297	3731	cameraView.requestFocusInWindow();
..	..	@@ -3397,10 +3831,10 @@
3397	3831	{
3398	3832	Object3D child = (Object3D)e.nextElement();
3399	3833	if(child.editWindow != null)
3400		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3401	3834	child.pinned = false;
3402	3835	child.CloseUI();
3403	3836	listUI.remove(child);
	3837	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3404	3838
3405	3839	//child.editWindow = null; // ???????????
3406	3840	}
..	..	@@ -3419,6 +3853,7 @@
3419	3853	obj.CloseUI();
3420	3854	}
3421	3855	listUI.clear();
	3856	+ SetPinStates(group.selection.size() > 0);
3422	3857	refreshContents(true);
3423	3858	} else
3424	3859	if (source == allParamsButton)
..	..	@@ -3474,6 +3909,9 @@
3474	3909	}
3475	3910
3476	3911	copy = group;
	3912	+
	3913	+ SetUndoStates();
	3914	+
3477	3915	//Globals.theRenderer.object = group;
3478	3916	if(!useclient)
3479	3917	{
..	..	@@ -3502,8 +3940,11 @@
3502	3940	radio.layout.doClick();
3503	3941
3504	3942	ClearUnpinned();
3505		- SetPinStates(group.selection.size() > 0);
3506		- if (group.selection.size() == 1)
	3943	+
	3944	+ //Grafreed.Assert(group != null);
	3945	+ //Grafreed.Assert(group.selection != null);
	3946	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3947	+ if (group.selection == null \|\| group.selection.size() == 1)
3507	3948	EditSelection(false);
3508	3949	keepparent = group.parent;
3509	3950	// PARENT = NULL or not???
..	..	@@ -3516,11 +3957,13 @@
3516	3957	} else if (event.getSource() == editCameraItem)
3517	3958	{
3518	3959	cameraView.ProtectCamera();
	3960	+ cameraView.requestFocusInWindow();
3519	3961	cameraView.repaint();
3520	3962	return;
3521	3963	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3522	3964	{
3523	3965	cameraView.RevertCamera();
	3966	+ cameraView.requestFocusInWindow();
3524	3967	cameraView.repaint();
3525	3968	return;
3526	3969	// } else if (event.getSource() == textureButton)
..	..	@@ -4097,7 +4540,7 @@
4097	4540
4098	4541	try
4099	4542	{
4100		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4543	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4101	4544	}
4102	4545	catch (Exception e)
4103	4546	{
..	..	@@ -4574,6 +5017,12 @@
4574	5017
4575	5018	void EditSelection(boolean newWindow)
4576	5019	{
	5020	+ if (group.selection == null)
	5021	+ {
	5022	+ EditElement(group, newWindow); // ? new
	5023	+ return;
	5024	+ }
	5025	+
4577	5026	// aConstraints.gridy = 0;
4578	5027	for (int i=0; i<group.selection.size(); i++)
4579	5028	{
..	..	@@ -4584,12 +5033,7 @@
4584	5033	Object3D elem = (Object3D)group.selection.elementAt(i);
4585	5034	if(elem != group \|\| !newWindow)
4586	5035	{
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
	5036	+ EditElement(elem, newWindow); // ? new
4593	5037	}
4594	5038	}
4595	5039	}
..	..	@@ -4652,9 +5096,7 @@
4652	5096
4653	5097	freezemodel = false;
4654	5098	}
4655		-
4656		- boolean flashIt = true;
4657		-
	5099	+
4658	5100	public void valueChanged(TreeSelectionEvent e)
4659	5101	//public boolean handleEvent(Event event)
4660	5102	{
..	..	@@ -4729,11 +5171,13 @@
4729	5171	uneditButton.setEnabled(enabled);
4730	5172	unselectButton.setEnabled(enabled);
4731	5173	flashSelectionButton.setEnabled(enabled);
	5174	+
	5175	+ clearPanelButton.setEnabled(!listUI.isEmpty());
4732	5176	}
4733	5177
4734	5178	void refreshContents(boolean cp)
4735	5179	{
4736		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	5180	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4737	5181	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4738	5182	{
4739	5183	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -4833,8 +5277,8 @@
4833	5277
4834	5278	if (cut)
4835	5279	{
4836		- if (Globals.SAVEONMAKE)
4837		- Save();
	5280	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5281	+// Save();
4838	5282	//int indices[] = jList.getSelectedIndices();
4839	5283	//for (int i = indices.length - 1; i >= 0; i--)
4840	5284	//jList.remove(indices[i]);
..	..	@@ -4937,6 +5381,10 @@
4937	5381
4938	5382	void paste(boolean expand)
4939	5383	{
	5384	+ if (Globals.REPLACEONMAKE)
	5385	+ Save();
	5386	+ boolean keep = Globals.REPLACEONMAKE;
	5387	+ Globals.REPLACEONMAKE = false;
4940	5388	// if (GrafreeD.clipboard == null)
4941	5389	// return;
4942	5390	boolean first = true;
..	..	@@ -4996,6 +5444,7 @@
4996	5444	Grafreed.clipboard.get(0).parent = keepparent;
4997	5445	}
4998	5446
	5447	+ Globals.REPLACEONMAKE = keep;
4999	5448	ResetModel();
5000	5449	refreshContents();
5001	5450	}
..	..	@@ -5131,6 +5580,10 @@
5131	5580
5132	5581	void group(Object3D csg, boolean grab)
5133	5582	{
	5583	+ if (Globals.REPLACEONMAKE)
	5584	+ Save();
	5585	+ boolean keep = Globals.REPLACEONMAKE;
	5586	+ Globals.REPLACEONMAKE = false;
5134	5587	if (//false) // why??
5135	5588	!group.selection.isEmpty())
5136	5589	{
..	..	@@ -5244,10 +5697,15 @@
5244	5697	//node.add(csg);
5245	5698	//makeSomething(node);
5246	5699	makeSomething(csg);
	5700	+ Globals.REPLACEONMAKE = keep;
5247	5701	}
5248	5702
5249	5703	void Ungroup(Object3D g)
5250	5704	{
	5705	+ if (Globals.REPLACEONMAKE)
	5706	+ Save();
	5707	+ boolean keep = Globals.REPLACEONMAKE;
	5708	+ Globals.REPLACEONMAKE = false;
5251	5709	if (g instanceof HiddenObject)
5252	5710	{
5253	5711	HiddenObject h = (HiddenObject) g;
..	..	@@ -5264,6 +5722,7 @@
5264	5722	objEditor.makeSomething(g.get(i), false);
5265	5723	}
5266	5724	}
	5725	+ Globals.REPLACEONMAKE = keep;
5267	5726	}
5268	5727
5269	5728	void ungroup()
..	..	@@ -5554,7 +6013,6 @@
5554	6013
5555	6014	cButton restoreCameraButton;
5556	6015
5557		- cButton saveButton;
5558	6016	cButton oneStepButton;
5559	6017
5560	6018	cButton groupButton;
..	..	@@ -5563,6 +6021,22 @@
5563	6021	cButton switchButton;
5564	6022	cButton loopButton;
5565	6023	cButton textureButton;
	6024	+
	6025	+ cButton skybox1Button;
	6026	+ cButton skybox2Button;
	6027	+ cButton skybox3Button;
	6028	+ cButton skybox4Button;
	6029	+ cButton skybox5Button;
	6030	+ cButton skybox6Button;
	6031	+ cButton skybox7Button;
	6032	+
	6033	+ cButton skybox11Button;
	6034	+ cButton skybox12Button;
	6035	+ cButton skybox13Button;
	6036	+ cButton skybox14Button;
	6037	+ cButton skybox15Button;
	6038	+ cButton skybox16Button;
	6039	+ cButton skybox17Button;
5566	6040
5567	6041	cButton gridButton;
5568	6042	cButton boxButton;
..	..	@@ -5627,7 +6101,7 @@
5627	6101	private MenuItem pasteLinkItem;
5628	6102	private MenuItem pasteCloneItem;
5629	6103	private MenuItem pasteExpandItem;
5630		- private MenuItem clearItem;
	6104	+ private MenuItem deleteItem;
5631	6105	private MenuItem clearAllItem;
5632	6106	private MenuItem genUVItem;
5633	6107	private MenuItem genNormalsMESHItem;
..	..	@@ -5711,6 +6185,8 @@
5711	6185	private MenuItem attachBumpItem;
5712	6186	private MenuItem detachBumpItem;
5713	6187	private MenuItem pigmentBumpItem;
	6188	+ private MenuItem embedTexturesItem;
	6189	+ private MenuItem deEmbedTexturesItem;
5714	6190
5715	6191	private MenuItem particleItem;
5716	6192	private MenuItem ragdollItem;