~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,314 @@
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 AddSkyboxTab0(JTabbedPane skyboxpanel)
	46	+ {
	47	+ cGridBag tab0 = new cGridBag().setVertical(true);
	48	+
	49	+ tab0.setName("Urban");
	50	+ skyboxpanel.add(tab0);
	51	+
	52	+ cGridBag row0 = new cGridBag();
	53	+ cGridBag row1 = new cGridBag();
	54	+ cGridBag row2 = new cGridBag();
	55	+ cGridBag row3 = new cGridBag();
	56	+ cGridBag row4 = new cGridBag();
	57	+ cGridBag row5 = new cGridBag();
	58	+ cGridBag row6 = new cGridBag();
	59	+
	60	+ AddSkyboxButton("default", "rgb", row0);
	61	+ //AddSkyboxButton("default", "cornell", row0);
	62	+ AddSkyboxButton("penguins", "dust", row0);
	63	+ AddSkyboxButton("penguins", "tropic", row0);
	64	+ AddSkyboxButton("penguins", "yonder", row0);
	65	+
	66	+ AddSkyboxButton("default", "uffizi", row1);
	67	+ AddSkyboxButton("bridge", "Bridge", row1);
	68	+ AddSkyboxButton("bridge", "Bridge2", row1);
	69	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	70	+
	71	+ AddSkyboxButton("urban", "Parliament", row2);
	72	+ AddSkyboxButton("urban", "Roundabout", row2);
	73	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	74	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	75	+
	76	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	77	+ AddSkyboxButton("urban", "UnionSquare", row3);
	78	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	79	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	80	+
	81	+ AddSkyboxButton("park", "Buddha", row4);
	82	+ AddSkyboxButton("park", "CNTower2", row4);
	83	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	84	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	85	+
	86	+ AddSkyboxButton("park", "Park", row5);
	87	+ AddSkyboxButton("park", "Pond", row5);
	88	+ AddSkyboxButton("park", "Skansen", row5);
	89	+ AddSkyboxButton("park", "Skansen2", row5);
	90	+
	91	+ AddSkyboxButton("park", "Skansen3", row6);
	92	+ AddSkyboxButton("park", "Skansen4", row6);
	93	+ AddSkyboxButton("park", "Skansen5", row6);
	94	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	95	+
	96	+ tab0.add(row0);
	97	+ tab0.add(row1);
	98	+ tab0.add(row2);
	99	+ tab0.add(row3);
	100	+ tab0.add(row4);
	101	+ tab0.add(row5);
	102	+ tab0.add(row6);
	103	+
	104	+ for (int i=5; --i>=0;)
	105	+ {
	106	+ //oe.toolboxPanel.Return();
	107	+ //tab0.add(new cGridBag());
	108	+ }
	109	+ }
	110	+
	111	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	112	+ {
	113	+ cGridBag tab0 = new cGridBag().setVertical(true);
	114	+
	115	+ tab0.setName("Nature");
	116	+ skyboxpanel.add(tab0);
	117	+
	118	+ cGridBag row0 = new cGridBag();
	119	+ cGridBag row1 = new cGridBag();
	120	+ cGridBag row2 = new cGridBag();
	121	+ cGridBag row3 = new cGridBag();
	122	+ cGridBag row4 = new cGridBag();
	123	+ cGridBag row5 = new cGridBag();
	124	+ cGridBag row6 = new cGridBag();
	125	+
	126	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	127	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	128	+ AddSkyboxButton("beach", "PalmTrees", row0);
	129	+ AddSkyboxButton("beach", "Tenerife", row0);
	130	+
	131	+ AddSkyboxButton("beach", "Tenerife2", row1);
	132	+ AddSkyboxButton("beach", "Tenerife3", row1);
	133	+ AddSkyboxButton("field", "FishPond", row1);
	134	+ AddSkyboxButton("field", "Footballfield", row1);
	135	+
	136	+ AddSkyboxButton("field", "Meadow", row2);
	137	+ AddSkyboxButton("field", "Sorsele", row2);
	138	+ AddSkyboxButton("field", "Sorsele2", row2);
	139	+ AddSkyboxButton("field", "Sorsele3", row2);
	140	+
	141	+ AddSkyboxButton("forest", "Brudslojan", row3);
	142	+ AddSkyboxButton("forest", "Langholmen2", row3);
	143	+ AddSkyboxButton("forest", "Plants", row3);
	144	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	145	+
	146	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	147	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	148	+ AddSkyboxButton("mountain", "Teide", row4);
	149	+ AddSkyboxButton("park", "Tantolunden4", row4);
	150	+
	151	+ AddSkyboxButton("park", "Stairs", row5);
	152	+ AddSkyboxButton("default", "skycube", row6);
	153	+ AddSkyboxButton("rocky", "Langholmen", row5);
	154	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	155	+
	156	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	157	+ AddSkyboxButton("default", "CloudyHills", row6);
	158	+ AddSkyboxButton("daz", "Autumn", row6);
	159	+ AddSkyboxButton("daz", "MountainTrail", row6);
	160	+ /*
	161	+Autumn
	162	+Greenlands
	163	+MountainTrail
	164	+Oasis
	165	+TheRock
	166	+TopOfTheWorld
	167	+Winter
	168	+ */
	169	+
	170	+ tab0.add(row0);
	171	+ tab0.add(row1);
	172	+ tab0.add(row2);
	173	+ tab0.add(row3);
	174	+ tab0.add(row4);
	175	+ tab0.add(row5);
	176	+ tab0.add(row6);
	177	+
	178	+ for (int i=5; --i>=0;)
	179	+ {
	180	+ //oe.toolboxPanel.Return();
	181	+ //tab0.add(new cGridBag());
	182	+ }
	183	+ }
	184	+
	185	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	186	+ {
	187	+ cGridBag tab0 = new cGridBag().setVertical(true);
	188	+
	189	+ tab0.setName("Night");
	190	+ skyboxpanel.add(tab0);
	191	+
	192	+ cGridBag row0 = new cGridBag();
	193	+ cGridBag row1 = new cGridBag();
	194	+ cGridBag row2 = new cGridBag();
	195	+ cGridBag row3 = new cGridBag();
	196	+ cGridBag row4 = new cGridBag();
	197	+ cGridBag row5 = new cGridBag();
	198	+ cGridBag row6 = new cGridBag();
	199	+
	200	+ AddSkyboxButton("night", "NightPath", row0);
	201	+ AddSkyboxButton("night", "PondNight", row0);
	202	+ AddSkyboxButton("night", "Powerlines", row0);
	203	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	204	+
	205	+ AddSkyboxButton("urban", "CNTower", row1);
	206	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	207	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	208	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	209	+
	210	+ AddSkyboxButton("penguins", "kenon_star", row2);
	211	+ AddSkyboxButton("persson", "corona", row2);
	212	+ AddSkyboxButton("persson", "spaceskybox", row2);
	213	+ AddSkyboxButton("indoors", "Vasa", row2);
	214	+
	215	+ AddSkyboxButton("winter", "Backyard", row3);
	216	+ AddSkyboxButton("winter", "Creek", row3);
	217	+ AddSkyboxButton("winter", "FootballField3", row3);
	218	+ AddSkyboxButton("winter", "Forest", row3);
	219	+
	220	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	221	+ AddSkyboxButton("winter", "House", row4);
	222	+ AddSkyboxButton("winter", "IceLake", row4);
	223	+ AddSkyboxButton("winter", "IceRiver", row4);
	224	+
	225	+ AddSkyboxButton("winter", "Park3", row5);
	226	+ AddSkyboxButton("winter", "PondWinter", row5);
	227	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	228	+ AddSkyboxButton("winter", "Vindelalven", row5);
	229	+
	230	+ AddSkyboxButton("daz", "TheRock", row6);
	231	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	232	+ AddSkyboxButton("daz", "Winter", row6);
	233	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	234	+
	235	+ tab0.add(row0);
	236	+ tab0.add(row1);
	237	+ tab0.add(row2);
	238	+ tab0.add(row3);
	239	+ tab0.add(row4);
	240	+ tab0.add(row5);
	241	+ tab0.add(row6);
	242	+
	243	+ for (int i=5; --i>=0;)
	244	+ {
	245	+ //oe.toolboxPanel.Return();
	246	+ //tab0.add(new cGridBag());
	247	+ }
	248	+ }
	249	+
	250	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	251	+ {
	252	+ cGridBag tab0 = new cGridBag().setVertical(true);
	253	+
	254	+ tab0.setName("Others");
	255	+ skyboxpanel.add(tab0);
	256	+
	257	+ cGridBag row0 = new cGridBag();
	258	+ cGridBag row1 = new cGridBag();
	259	+ cGridBag row2 = new cGridBag();
	260	+ cGridBag row3 = new cGridBag();
	261	+ cGridBag row4 = new cGridBag();
	262	+ cGridBag row5 = new cGridBag();
	263	+ cGridBag row6 = new cGridBag();
	264	+
	265	+ AddSkyboxButton("mayhem", "afterrain", row0);
	266	+ AddSkyboxButton("mayhem", "aqua4", row0);
	267	+ AddSkyboxButton("mayhem", "aqua9", row0);
	268	+ AddSkyboxButton("mayhem", "flame", row0);
	269	+
	270	+ AddSkyboxButton("mayhem", "h2s", row1);
	271	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	272	+ AddSkyboxButton("mayhem", "scorched", row1);
	273	+ AddSkyboxButton("penguins", "desertdawn", row1);
	274	+
	275	+ AddSkyboxButton("persson", "Citadella", row2);
	276	+ AddSkyboxButton("persson", "Citadella2", row2);
	277	+ AddSkyboxButton("persson", "clouds1", row2);
	278	+ AddSkyboxButton("penguins", "wrath", row2);
	279	+
	280	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	281	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	282	+ AddSkyboxButton("indoors", "DallasW", row3);
	283	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	284	+
	285	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	286	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	287	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	288	+ AddSkyboxButton("persson", "redeclipse", row4);
	289	+
	290	+ AddSkyboxButton("daz", "Greenlands", row5);
	291	+ AddSkyboxButton("daz", "Oasis", row5);
	292	+ AddSkyboxButton("elyvisions", "arch3", row5);
	293	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	294	+
	295	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	296	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	297	+ AddSkyboxButton("elyvisions", "heaven", row6);
	298	+ AddSkyboxButton("elyvisions", "hot", row6);
	299	+
	300	+ tab0.add(row0);
	301	+ tab0.add(row1);
	302	+ tab0.add(row2);
	303	+ tab0.add(row3);
	304	+ tab0.add(row4);
	305	+ tab0.add(row5);
	306	+ tab0.add(row6);
	307	+
	308	+ for (int i=5; --i>=0;)
	309	+ {
	310	+ //oe.toolboxPanel.Return();
	311	+ //tab0.add(new cGridBag());
	312	+ }
	313	+ }
	314	+
	315	+ public void CallBack(String[] path)
	316	+ {
	317	+ for (int i = 0; i < path.length; i++)
	318	+ {
	319	+ System.out.print(path[i] + "/");
	320	+ }
	321	+
	322	+ System.out.println();
	323	+ }
	324	+
	325	+ public void ChangeSkybox(String skybox)
	326	+ {
	327	+ //cameraView.envyoff = false;
	328	+ group.skyboxname = skybox;
	329	+ group.skyboxext = "jpg";
	330	+ cameraView.repaint();
	331	+
	332	+ Grafreed.ParseResources("textures", this);
	333	+ }
	334	+
26	335	//ObjEditor objEditor;
27	336	public void closeUI2()
28	337	{
..	..	@@ -60,6 +369,12 @@
60	369	this.copy = this.group = group;
61	370	//selectees = this.group.selectees;
62	371
	372	+ if (copy.versionlist == null)
	373	+ {
	374	+ copy.versionlist = new Object3D[100];
	375	+ copy.versionindex = -1;
	376	+ }
	377	+
63	378	if(ui)
64	379	SetupUI(objEditor);
65	380	}
..	..	@@ -80,14 +395,22 @@
80	395	SetupViews(objEditor);
81	396
82	397	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	398	+
	399	+ if (copy.versionlist == null)
	400	+ {
	401	+ copy.versionlist = new Object3D[100];
	402	+ copy.versionindex = -1;
	403	+
	404	+ Save(true);
	405	+ }
83	406	}
84	407
85	408	void CloneSelection(boolean supports)
86	409	{
87		- if (Globals.SAVEONMAKE)
	410	+ if (Globals.REPLACEONMAKE)
88	411	Save();
89		- boolean keep = Globals.SAVEONMAKE;
90		- Globals.SAVEONMAKE = false;
	412	+ boolean keep = Globals.REPLACEONMAKE;
	413	+ Globals.REPLACEONMAKE = false;
91	414	// Object3D keep = GrafreeD.clipboard;
92	415	//Object3D obj;
93	416	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -98,7 +421,7 @@
98	421
99	422	makeSomething(clone, i==group.selection.size()-1);
100	423	}
101		- Globals.SAVEONMAKE = keep;
	424	+ Globals.REPLACEONMAKE = keep;
102	425	}
103	426
104	427	void CloneClipboard(boolean supports)
..	..	@@ -194,8 +517,8 @@
194	517	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
195	518	// pasteExpandItem.addActionListener(this);
196	519	menu.add("-");
197		- clearItem = menu.add(new MenuItem("Clear"));
198		- clearItem.addActionListener(this);
	520	+ deleteItem = menu.add(new MenuItem("Delete"));
	521	+ deleteItem.addActionListener(this);
199	522
200	523	if (Globals.ADVANCED)
201	524	{
..	..	@@ -421,7 +744,7 @@
421	744	genNormalsMESHItem.addActionListener(this);
422	745	if (Globals.ADVANCED)
423	746	{
424		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	747	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
425	748	genNormalsMINEItem.addActionListener(this);
426	749	}
427	750	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -514,10 +837,15 @@
514	837	attachBumpItem.addActionListener(this);
515	838	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
516	839	pigmentBumpItem.addActionListener(this);
	840	+ //embedTexturesItem
517	841	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
518	842	detachPigmentItem.addActionListener(this);
519	843	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
520	844	detachBumpItem.addActionListener(this);
	845	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	846	+ embedTexturesItem.addActionListener(this);
	847	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	848	+ deEmbedTexturesItem.addActionListener(this);
521	849	menu.add("-");
522	850	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
523	851	sortbysizeItem.addActionListener(this);
..	..	@@ -544,6 +872,7 @@
544	872	buildToolsMenu(menu);
545	873	}
546	874
	875	+
547	876	void SetupUI2(ObjEditor oe)
548	877	{
549	878	// June 2019
..	..	@@ -588,7 +917,7 @@
588	917	*/
589	918	cGridBag copyOptionsPanel = new cGridBag();
590	919
591		- copyOptionsPanel.preferredHeight = 1;
	920	+ copyOptionsPanel.preferredHeight = 2;
592	921
593	922	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
594	923
..	..	@@ -615,29 +944,46 @@
615	944	restoreCameraButton.setToolTipText("Restore viewpoint");
616	945	restoreCameraButton.addActionListener(this);
617	946
618		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
619		- undoButton.setToolTipText("Undo changes");
620		- undoButton.addActionListener(this);
621		- undoButton.setEnabled(false);
	947	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	948	+ saveVersionButton.setToolTipText("Duplicate current version");
	949	+ saveVersionButton.addActionListener(this);
	950	+
	951	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	952	+ deleteVersionButton.setToolTipText("Delete current version");
	953	+ deleteVersionButton.addActionListener(this);
	954	+
	955	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	956	+ previousVersionButton.setToolTipText("Previous version");
	957	+ previousVersionButton.addActionListener(this);
	958	+ previousVersionButton.setEnabled(false);
622	959
623		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624		- redoButton.setToolTipText("Redo changes");
625		- redoButton.addActionListener(this);
626		- redoButton.setEnabled(false);
	960	+ cGridBag updown = new cGridBag().setVertical(true);
	961	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	962	+ restoreButton.setToolTipText("Undo (restore current version)");
	963	+ restoreButton.addActionListener(this);
	964	+ //restoreButton.setEnabled(false);
627	965
628		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629		- saveButton.setToolTipText("Save changes");
630		- saveButton.addActionListener(this);
	966	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	967	+ replaceButton.setToolTipText("Save (replace current version)");
	968	+ replaceButton.addActionListener(this);
	969	+ //replaceButton.setEnabled(false);
631	970
632		- copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	971	+ copyOptionsPanel.add(updown);
	972	+
	973	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	974	+ nextVersionButton.setToolTipText("Next version");
	975	+ nextVersionButton.addActionListener(this);
	976	+ nextVersionButton.setEnabled(false);
	977	+
	978	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
633	979	liveCB.setToolTipText("Enable animation");
634	980	liveCB.addItemListener(this);
635	981
636		- copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	982	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
637	983	oneStepButton.setToolTipText("Animate one step forward");
638	984	oneStepButton.addActionListener(this);
639	985
640		- copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	986	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
641	987	fastCB.setToolTipText("Fast mode");
642	988	fastCB.addItemListener(this);
643	989
..	..	@@ -655,31 +1001,32 @@
655	1001	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
656	1002	snapobjectButton.addActionListener(this);
657	1003	snapobjectButton.setToolTipText("Snap Object");
	1004	+
	1005	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1006	+ fourButton.addActionListener(this);
	1007	+ fourButton.setToolTipText("Show control panel only");
658	1008	}
659	1009
660	1010	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
661	1011
662		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
663		- twoButton.setToolTipText("Show center view only");
	1012	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1013	+ twoButton.setToolTipText("Show 3D view only");
664	1014	twoButton.addActionListener(this);
665	1015	this.fullscreenLayout = twoButton;
666	1016
667		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
668		- fourButton.addActionListener(this);
669		- fourButton.setToolTipText("Show left panel only");
670		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671		- sixButton.setToolTipText("2-column layout left");
672		- sixButton.addActionListener(this);
673		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
674		- threeButton.setToolTipText("2-column layout right");
	1017	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1018	+ threeButton.setToolTipText("Show controls and 3D view");
675	1019	threeButton.addActionListener(this);
676		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
677		- sevenButton.setToolTipText("3-column layout");
678		- sevenButton.addActionListener(this);
	1020	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1021	+ sixButton.setToolTipText("Show 3D view and controls");
	1022	+ sixButton.addActionListener(this);
	1023	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1024	+// sevenButton.setToolTipText("3-column layout");
	1025	+// sevenButton.addActionListener(this);
679	1026	//
680	1027
681		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682		- rootButton.setToolTipText("Edit selection in new tab");
	1028	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1029	+ rootButton.setToolTipText("Open selection in new tab");
683	1030	rootButton.addActionListener(this);
684	1031
685	1032	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -688,28 +1035,30 @@
688	1035	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
689	1036	//clearButton.addActionListener(this);
690	1037
	1038	+ cGridBag row1 = new cGridBag();
	1039	+
691	1040	// INSERT
692		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1041	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
693	1042	gridButton.setToolTipText("Create grid");
694	1043	gridButton.addActionListener(this);
695	1044
696		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1045	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
697	1046	boxButton.setToolTipText("Create box");
698	1047	boxButton.addActionListener(this);
699	1048
700		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1049	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
701	1050	sphereButton.setToolTipText("Create sphere");
702	1051	sphereButton.addActionListener(this);
703	1052
704		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1053	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
705	1054	coneButton.setToolTipText("Create cone");
706	1055	coneButton.addActionListener(this);
707	1056
708		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1057	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
709	1058	torusButton.setToolTipText("Create torus");
710	1059	torusButton.addActionListener(this);
711	1060
712		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
713	1062	superButton.setToolTipText("Create superellipsoid");
714	1063	superButton.addActionListener(this);
715	1064
..	..	@@ -720,51 +1069,57 @@
720	1069	kleinButton.addActionListener(this);
721	1070	}
722	1071
723		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
724	1073	particlesButton.setToolTipText("Create particle system");
725	1074	particlesButton.addActionListener(this);
726	1075
727		- oe.toolboxPanel.Return();
	1076	+ oe.toolboxPanel.add(row1);
728	1077
729		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1078	+ cGridBag row2 = new cGridBag();
	1079	+
	1080	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
730	1081	groupButton.setToolTipText("Create group");
731	1082	groupButton.addActionListener(this);
732	1083
733		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
734	1085	compositeButton.setToolTipText("Create composite");
735	1086	compositeButton.addActionListener(this);
736	1087
737		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1088	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
738	1089	switchButton.setToolTipText("Create item switcher");
739	1090	switchButton.addActionListener(this);
740	1091
741		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1092	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
742	1093	loopButton.setToolTipText("Create loop");
743	1094	loopButton.addActionListener(this);
744	1095
745		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1096	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
746	1097	textureButton.setToolTipText("Create texture");
747	1098	textureButton.addActionListener(this);
748	1099
749		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1100	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
750	1101	overlayButton.setToolTipText("Create overlay");
751	1102	overlayButton.addActionListener(this);
752	1103
753		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1104	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
754	1105	lightButton.setToolTipText("Create light");
755	1106	lightButton.addActionListener(this);
756	1107
757		- for (int i=6; --i>=0;)
758		- {
759		- oe.toolboxPanel.Return();
760		- oe.toolboxPanel.add(new cGridBag());
761		- oe.toolboxPanel.add(new cGridBag());
762		- oe.toolboxPanel.add(new cGridBag());
763		- oe.toolboxPanel.add(new cGridBag());
764		- oe.toolboxPanel.add(new cGridBag());
765		- oe.toolboxPanel.add(new cGridBag());
766		- oe.toolboxPanel.add(new cGridBag());
767		- }
	1108	+ oe.toolboxPanel.add(row2);
	1109	+
	1110	+ // ENVYMAPS
	1111	+ cGridBag skyboxpane = new cGridBag();
	1112	+ skyboxpane.preferredHeight = 100;
	1113	+
	1114	+ oe.skyboxPanel.add(skyboxpane);
	1115	+
	1116	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1117	+ skyboxpane.add(skyboxpanel);
	1118	+
	1119	+ AddSkyboxTab0(skyboxpanel);
	1120	+ AddSkyboxTab1(skyboxpanel);
	1121	+ AddSkyboxTab2(skyboxpanel);
	1122	+ AddSkyboxTab3(skyboxpanel);
768	1123
769	1124	// EDIT panel
770	1125	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -772,20 +1127,20 @@
772	1127	editButton.addActionListener(this);
773	1128
774	1129	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
775		- uneditButton.setToolTipText("Remove selection controls");
	1130	+ uneditButton.setToolTipText("Unpin and remove selection controls");
776	1131	uneditButton.addActionListener(this);
777	1132
778	1133	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
779	1134	allParamsButton.setToolTipText("Show all controle");
780	1135	allParamsButton.addActionListener(this);
781	1136
782		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1137	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
783	1138	clearPanelButton.setToolTipText("Clear edit panel");
784	1139	clearPanelButton.addActionListener(this);
785	1140
786		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
787		- unselectButton.setToolTipText("Unselect");
788		- unselectButton.addActionListener(this);
	1141	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1142	+ //unselectButton.setToolTipText("Unselect");
	1143	+ //unselectButton.addActionListener(this);
789	1144
790	1145	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
791	1146	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -820,9 +1175,12 @@
820	1175
821	1176	oe.treePanel.add(copyOptionsPanel);
822	1177	oe.treePanel.Return();
	1178	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1179	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1180	+ sliderPane.preferredHeight = 1;
823	1181
824		-// mainPanel.setDividerLocation(0.5); //1.0);
825		-// mainPanel.setResizeWeight(0.5);
	1182	+// mainPanel.setDividerLocation(0.1); //1.0);
	1183	+ mainPanel.setResizeWeight(0.4);
826	1184
827	1185	//jList.addListSelectionListener(this);
828	1186	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -830,7 +1188,7 @@
830	1188	//jTree.setEditable(true);
831	1189	oe.jTree.setDragEnabled(true);
832	1190	//jTree.setPreferredSize(new Dimension(10,10));
833		- jSP.setPreferredSize(new Dimension(100,200));
	1191	+ //jSP.setPreferredSize(new Dimension(100,200));
834	1192
835	1193	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
836	1194
..	..	@@ -842,7 +1200,7 @@
842	1200	dgr.addDragGestureListener(this);
843	1201	}catch(Exception e) {}
844	1202	*/
845		- radio.layout = sevenButton;
	1203	+ radio.layout = threeButton; // sixButton;
846	1204	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
847	1205	}
848	1206
..	..	@@ -893,9 +1251,12 @@
893	1251	smoothCB.setToolTipText("Snapping delay");
894	1252	smoothCB.addItemListener(this);
895	1253
896		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
897		- slowCB.setToolTipText("Smooth interpolation");
898		- slowCB.addItemListener(this);
	1254	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1255	+// slowCB.setToolTipText("Smooth interpolation");
	1256	+// slowCB.addItemListener(this);
	1257	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1258	+ minshaderCB.setToolTipText("Minimal fast shader");
	1259	+ minshaderCB.addItemListener(this);
899	1260
900	1261	// constraints.gridy += 1;
901	1262	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -945,9 +1306,9 @@
945	1306	toggleSwitchCB.setToolTipText("Choose a single item");
946	1307	toggleSwitchCB.addItemListener(this);
947	1308
948		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
949		- autosaveCB.setToolTipText("On structure change");
950		- autosaveCB.addItemListener(this);
	1309	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1310	+ autokeepCB.setToolTipText("On structure change");
	1311	+ autokeepCB.addItemListener(this);
951	1312
952	1313	panel.Return();
953	1314	if (Globals.ADVANCED)
..	..	@@ -984,7 +1345,7 @@
984	1345	}
985	1346
986	1347	radioButton.SetObject(obj);
987		- radioButton.layout = sevenButton;
	1348	+ radioButton.layout = threeButton; // sixButton;
988	1349	radioButton.SetCamera(cameraView.renderCamera, false);
989	1350	radioButton.addActionListener(this);
990	1351	radioPanel.add(radioButton);
..	..	@@ -1009,6 +1370,8 @@
1009	1370	cCheckBox localCB;
1010	1371	cCheckBox crowdCB;
1011	1372	cCheckBox smoothCB;
	1373	+ cCheckBox minshaderCB;
	1374	+
1012	1375	cToggleButton fastCB;
1013	1376	cCheckBox slowCB;
1014	1377	cCheckBox boxCB;
..	..	@@ -1024,7 +1387,7 @@
1024	1387
1025	1388	cCheckBox oeilCB;
1026	1389	cCheckBox shadowCB;
1027		- cCheckBox autosaveCB;
	1390	+ cCheckBox autokeepCB;
1028	1391	cCheckBox lookAtCB;
1029	1392
1030	1393	// static int COLOR = 1;
..	..	@@ -1079,6 +1442,12 @@
1079	1442	{
1080	1443	cameraView.ToggleInertia();
1081	1444	cameraView.repaint();
	1445	+ }
	1446	+ else if(e.getSource() == minshaderCB)
	1447	+ {
	1448	+ Globals.MINSHADER ^= true;
	1449	+ cameraView.programInitialized = false;
	1450	+ cameraView.repaint();
1082	1451	}
1083	1452	else if(e.getSource() == localCB)
1084	1453	{
..	..	@@ -1136,9 +1505,9 @@
1136	1505	{
1137	1506	Globals.FREEZEONMOVE ^= true;
1138	1507	}
1139		- else if(e.getSource() == autosaveCB)
	1508	+ else if(e.getSource() == autokeepCB)
1140	1509	{
1141		- Globals.SAVEONMAKE ^= true;
	1510	+ Globals.REPLACEONMAKE ^= true;
1142	1511	}
1143	1512	else if(e.getSource() == lookAtCB)
1144	1513	{
..	..	@@ -1664,6 +2033,16 @@
1664	2033	}
1665	2034	}
1666	2035	}
	2036	+
	2037	+ private void EditElement(Object3D elem, boolean newWindow)
	2038	+ {
	2039	+ // if (!(elem instanceof Composite))
	2040	+ // newWindow = false;
	2041	+ listUI.add(elem);
	2042	+ elem.openEditWindow(this, newWindow); //, false);
	2043	+ System.out.println("edit : " + elem);
	2044	+ elem.editWindow.refreshContents(true); // ? new
	2045	+ }
1667	2046
1668	2047	/**
1669	2048	* applyExample
..	..	@@ -2092,6 +2471,23 @@
2092	2471	{
2093	2472	makeSomething(new Light());
2094	2473	} else
	2474	+// if (source == skybox1Button \|\|
	2475	+// source == skybox2Button \|\|
	2476	+// source == skybox3Button \|\|
	2477	+// source == skybox4Button \|\|
	2478	+// source == skybox5Button \|\|
	2479	+// source == skybox6Button \|\|
	2480	+// source == skybox7Button \|\|
	2481	+// source == skybox11Button \|\|
	2482	+// source == skybox12Button \|\|
	2483	+// source == skybox13Button \|\|
	2484	+// source == skybox14Button \|\|
	2485	+// source == skybox15Button \|\|
	2486	+// source == skybox16Button \|\|
	2487	+// source == skybox17Button)
	2488	+// {
	2489	+// ChangeSkybox(source);
	2490	+// } else
2095	2491	if (source == csgItem)
2096	2492	{
2097	2493	group(new CSG());
..	..	@@ -2177,7 +2573,7 @@
2177	2573	if (source == computeAOItem)
2178	2574	{
2179	2575	Globals.drawMode = CameraPane.OCCLUSION;
2180		- Globals.theRenderer.repaint();
	2576	+ cameraView.repaint();
2181	2577	} else
2182	2578	if (source == recompileItem)
2183	2579	{
..	..	@@ -2192,7 +2588,7 @@
2192	2588	if (source == invariantsItem)
2193	2589	{
2194	2590	System.out.println("Invariants:");
2195		- Grafreed.grafreeD.universe.invariants();
	2591	+ Grafreed.grafreed.universe.invariants();
2196	2592	} else
2197	2593	if (source == memoryItem)
2198	2594	{
..	..	@@ -2223,19 +2619,40 @@
2223	2619	{
2224	2620	ToggleFullScreen();
2225	2621	} else
2226		- if (source == undoButton)
	2622	+ if (source == previousVersionButton)
2227	2623	{
2228		- if (!Undo())
2229		- java.awt.Toolkit.getDefaultToolkit().beep();
	2624	+ // Go to previous version
	2625	+ //if (!Undo())
	2626	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2627	+ PreviousVersion();
2230	2628	} else
2231		- if (source == redoButton)
	2629	+ if (source == restoreButton)
2232	2630	{
2233		- Redo();
	2631	+ // Restore current version
	2632	+ Restore();
	2633	+ //restoreButton.setEnabled(false);
2234	2634	} else
2235		- if (source == saveButton)
	2635	+ if (source == replaceButton)
2236	2636	{
	2637	+ // Overwrite current version
	2638	+ Replace();
	2639	+ //replaceButton.setEnabled(false);
	2640	+ } else
	2641	+ if (source == nextVersionButton)
	2642	+ {
	2643	+ // Go to next version
	2644	+ NextVersion();
	2645	+ } else
	2646	+ if (source == saveVersionButton)
	2647	+ {
	2648	+ // Save a new version
2237	2649	if (!Save(true))
2238	2650	java.awt.Toolkit.getDefaultToolkit().beep();
	2651	+ } else
	2652	+ if (source == deleteVersionButton)
	2653	+ {
	2654	+ // Delete a new version
	2655	+ DeleteVersion();
2239	2656	} else
2240	2657	if (source == oneStepButton)
2241	2658	{
..	..	@@ -2290,11 +2707,11 @@
2290	2707	} else
2291	2708	if (source == undoItem)
2292	2709	{
2293		- Undo();
	2710	+ PreviousVersion();
2294	2711	} else
2295	2712	if (source == redoItem)
2296	2713	{
2297		- Redo();
	2714	+ NextVersion();
2298	2715	} else
2299	2716	if (source == duplicateItem)
2300	2717	{
..	..	@@ -2615,7 +3032,7 @@
2615	3032	{
2616	3033	StepAll();
2617	3034	} else
2618		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3035	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2619	3036	{
2620	3037	//int indices[] = jList.getSelectedIndices();
2621	3038	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -3097,7 +3514,7 @@
3097	3514	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3098	3515	{
3099	3516	obj = (Object3D)e.nextElement();
3100		- obj.SetBumpTexture(null);
	3517	+ obj.ResetBumpTexture();
3101	3518	}
3102	3519
3103	3520	refreshContents();
..	..	@@ -3111,6 +3528,31 @@
3111	3528	obj.SetBumpTexture(obj.GetPigmentTexture());
3112	3529	}
3113	3530
	3531	+ refreshContents();
	3532	+ } else
	3533	+ if (source == embedTexturesItem)
	3534	+ {
	3535	+ Object3D obj;
	3536	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3537	+ {
	3538	+ obj = (Object3D)e.nextElement();
	3539	+ obj.EmbedTextures(true);
	3540	+ }
	3541	+
	3542	+ refreshContents();
	3543	+ } else
	3544	+ if (source == deEmbedTexturesItem)
	3545	+ {
	3546	+ Object3D obj;
	3547	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3548	+ {
	3549	+ obj = (Object3D)e.nextElement();
	3550	+ obj.EmbedTextures(false);
	3551	+ }
	3552	+
	3553	+ CameraPane.texturepigment.clear();
	3554	+ CameraPane.texturebump.clear();
	3555	+
3114	3556	refreshContents();
3115	3557	} else
3116	3558	if (source == flashSelectionButton)
..	..	@@ -3214,8 +3656,8 @@
3214	3656	// centralPanel.setVisible(true);
3215	3657	// XYZPanel.setVisible(true);
3216	3658	bigThree.ClearUI();
	3659	+ bigThree.add(scenePanel);
3217	3660	bigThree.add(centralPanel);
3218		- bigThree.add(XYZPanel);
3219	3661	bigThree.FlushUI();
3220	3662
3221	3663	cameraView.requestFocusInWindow();
..	..	@@ -3295,8 +3737,8 @@
3295	3737	// centralPanel.setVisible(true);
3296	3738	// XYZPanel.setVisible(false);
3297	3739	bigThree.ClearUI();
3298		- bigThree.add(scenePanel);
3299	3740	bigThree.add(centralPanel);
	3741	+ bigThree.add(scenePanel);
3300	3742	bigThree.FlushUI();
3301	3743
3302	3744	cameraView.requestFocusInWindow();
..	..	@@ -3402,10 +3844,10 @@
3402	3844	{
3403	3845	Object3D child = (Object3D)e.nextElement();
3404	3846	if(child.editWindow != null)
3405		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3406	3847	child.pinned = false;
3407	3848	child.CloseUI();
3408	3849	listUI.remove(child);
	3850	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3409	3851
3410	3852	//child.editWindow = null; // ???????????
3411	3853	}
..	..	@@ -3424,6 +3866,7 @@
3424	3866	obj.CloseUI();
3425	3867	}
3426	3868	listUI.clear();
	3869	+ SetPinStates(group.selection.size() > 0);
3427	3870	refreshContents(true);
3428	3871	} else
3429	3872	if (source == allParamsButton)
..	..	@@ -3479,6 +3922,9 @@
3479	3922	}
3480	3923
3481	3924	copy = group;
	3925	+
	3926	+ SetUndoStates();
	3927	+
3482	3928	//Globals.theRenderer.object = group;
3483	3929	if(!useclient)
3484	3930	{
..	..	@@ -3507,8 +3953,11 @@
3507	3953	radio.layout.doClick();
3508	3954
3509	3955	ClearUnpinned();
3510		- SetPinStates(group.selection.size() > 0);
3511		- if (group.selection.size() == 1)
	3956	+
	3957	+ //Grafreed.Assert(group != null);
	3958	+ //Grafreed.Assert(group.selection != null);
	3959	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3960	+ if (group.selection == null \|\| group.selection.size() == 1)
3512	3961	EditSelection(false);
3513	3962	keepparent = group.parent;
3514	3963	// PARENT = NULL or not???
..	..	@@ -3521,11 +3970,13 @@
3521	3970	} else if (event.getSource() == editCameraItem)
3522	3971	{
3523	3972	cameraView.ProtectCamera();
	3973	+ cameraView.requestFocusInWindow();
3524	3974	cameraView.repaint();
3525	3975	return;
3526	3976	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3527	3977	{
3528	3978	cameraView.RevertCamera();
	3979	+ cameraView.requestFocusInWindow();
3529	3980	cameraView.repaint();
3530	3981	return;
3531	3982	// } else if (event.getSource() == textureButton)
..	..	@@ -4102,7 +4553,7 @@
4102	4553
4103	4554	try
4104	4555	{
4105		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4556	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4106	4557	}
4107	4558	catch (Exception e)
4108	4559	{
..	..	@@ -4579,6 +5030,12 @@
4579	5030
4580	5031	void EditSelection(boolean newWindow)
4581	5032	{
	5033	+ if (group.selection == null)
	5034	+ {
	5035	+ EditElement(group, newWindow); // ? new
	5036	+ return;
	5037	+ }
	5038	+
4582	5039	// aConstraints.gridy = 0;
4583	5040	for (int i=0; i<group.selection.size(); i++)
4584	5041	{
..	..	@@ -4589,12 +5046,7 @@
4589	5046	Object3D elem = (Object3D)group.selection.elementAt(i);
4590	5047	if(elem != group \|\| !newWindow)
4591	5048	{
4592		- // if (!(elem instanceof Composite))
4593		- // newWindow = false;
4594		- listUI.add(elem);
4595		- elem.openEditWindow(this, newWindow); //, false);
4596		- System.out.println("edit : " + elem);
4597		- elem.editWindow.refreshContents(true); // ? new
	5049	+ EditElement(elem, newWindow); // ? new
4598	5050	}
4599	5051	}
4600	5052	}
..	..	@@ -4657,9 +5109,7 @@
4657	5109
4658	5110	freezemodel = false;
4659	5111	}
4660		-
4661		- boolean flashIt = true;
4662		-
	5112	+
4663	5113	public void valueChanged(TreeSelectionEvent e)
4664	5114	//public boolean handleEvent(Event event)
4665	5115	{
..	..	@@ -4732,13 +5182,15 @@
4732	5182	{
4733	5183	editButton.setEnabled(enabled);
4734	5184	uneditButton.setEnabled(enabled);
4735		- unselectButton.setEnabled(enabled);
	5185	+ //unselectButton.setEnabled(enabled);
4736	5186	flashSelectionButton.setEnabled(enabled);
	5187	+
	5188	+ clearPanelButton.setEnabled(!listUI.isEmpty());
4737	5189	}
4738	5190
4739	5191	void refreshContents(boolean cp)
4740	5192	{
4741		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	5193	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4742	5194	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4743	5195	{
4744	5196	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -4942,10 +5394,10 @@
4942	5394
4943	5395	void paste(boolean expand)
4944	5396	{
4945		- if (Globals.SAVEONMAKE)
	5397	+ if (Globals.REPLACEONMAKE)
4946	5398	Save();
4947		- boolean keep = Globals.SAVEONMAKE;
4948		- Globals.SAVEONMAKE = false;
	5399	+ boolean keep = Globals.REPLACEONMAKE;
	5400	+ Globals.REPLACEONMAKE = false;
4949	5401	// if (GrafreeD.clipboard == null)
4950	5402	// return;
4951	5403	boolean first = true;
..	..	@@ -5005,7 +5457,7 @@
5005	5457	Grafreed.clipboard.get(0).parent = keepparent;
5006	5458	}
5007	5459
5008		- Globals.SAVEONMAKE = keep;
	5460	+ Globals.REPLACEONMAKE = keep;
5009	5461	ResetModel();
5010	5462	refreshContents();
5011	5463	}
..	..	@@ -5141,10 +5593,10 @@
5141	5593
5142	5594	void group(Object3D csg, boolean grab)
5143	5595	{
5144		- if (Globals.SAVEONMAKE)
	5596	+ if (Globals.REPLACEONMAKE)
5145	5597	Save();
5146		- boolean keep = Globals.SAVEONMAKE;
5147		- Globals.SAVEONMAKE = false;
	5598	+ boolean keep = Globals.REPLACEONMAKE;
	5599	+ Globals.REPLACEONMAKE = false;
5148	5600	if (//false) // why??
5149	5601	!group.selection.isEmpty())
5150	5602	{
..	..	@@ -5258,15 +5710,15 @@
5258	5710	//node.add(csg);
5259	5711	//makeSomething(node);
5260	5712	makeSomething(csg);
5261		- Globals.SAVEONMAKE = keep;
	5713	+ Globals.REPLACEONMAKE = keep;
5262	5714	}
5263	5715
5264	5716	void Ungroup(Object3D g)
5265	5717	{
5266		- if (Globals.SAVEONMAKE)
	5718	+ if (Globals.REPLACEONMAKE)
5267	5719	Save();
5268		- boolean keep = Globals.SAVEONMAKE;
5269		- Globals.SAVEONMAKE = false;
	5720	+ boolean keep = Globals.REPLACEONMAKE;
	5721	+ Globals.REPLACEONMAKE = false;
5270	5722	if (g instanceof HiddenObject)
5271	5723	{
5272	5724	HiddenObject h = (HiddenObject) g;
..	..	@@ -5283,7 +5735,7 @@
5283	5735	objEditor.makeSomething(g.get(i), false);
5284	5736	}
5285	5737	}
5286		- Globals.SAVEONMAKE = keep;
	5738	+ Globals.REPLACEONMAKE = keep;
5287	5739	}
5288	5740
5289	5741	void ungroup()
..	..	@@ -5574,7 +6026,6 @@
5574	6026
5575	6027	cButton restoreCameraButton;
5576	6028
5577		- cButton saveButton;
5578	6029	cButton oneStepButton;
5579	6030
5580	6031	cButton groupButton;
..	..	@@ -5583,6 +6034,22 @@
5583	6034	cButton switchButton;
5584	6035	cButton loopButton;
5585	6036	cButton textureButton;
	6037	+
	6038	+ cButton skybox1Button;
	6039	+ cButton skybox2Button;
	6040	+ cButton skybox3Button;
	6041	+ cButton skybox4Button;
	6042	+ cButton skybox5Button;
	6043	+ cButton skybox6Button;
	6044	+ cButton skybox7Button;
	6045	+
	6046	+ cButton skybox11Button;
	6047	+ cButton skybox12Button;
	6048	+ cButton skybox13Button;
	6049	+ cButton skybox14Button;
	6050	+ cButton skybox15Button;
	6051	+ cButton skybox16Button;
	6052	+ cButton skybox17Button;
5586	6053
5587	6054	cButton gridButton;
5588	6055	cButton boxButton;
..	..	@@ -5647,7 +6114,7 @@
5647	6114	private MenuItem pasteLinkItem;
5648	6115	private MenuItem pasteCloneItem;
5649	6116	private MenuItem pasteExpandItem;
5650		- private MenuItem clearItem;
	6117	+ private MenuItem deleteItem;
5651	6118	private MenuItem clearAllItem;
5652	6119	private MenuItem genUVItem;
5653	6120	private MenuItem genNormalsMESHItem;
..	..	@@ -5731,6 +6198,8 @@
5731	6198	private MenuItem attachBumpItem;
5732	6199	private MenuItem detachBumpItem;
5733	6200	private MenuItem pigmentBumpItem;
	6201	+ private MenuItem embedTexturesItem;
	6202	+ private MenuItem deEmbedTexturesItem;
5734	6203
5735	6204	private MenuItem particleItem;
5736	6205	private MenuItem ragdollItem;