~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -23,6 +23,237 @@
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 + "/" + s + ".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("default", "uffizi", row0);
	62	+ AddSkyboxButton("default", "CloudyHills", row0);
	63	+
	64	+ AddSkyboxButton("default", "skycube", row1);
	65	+ AddSkyboxButton("bridge", "Bridge", row1);
	66	+ AddSkyboxButton("bridge", "Bridge2", row1);
	67	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	68	+
	69	+ AddSkyboxButton("urban", "Parliament", row2);
	70	+ AddSkyboxButton("urban", "Roundabout", row2);
	71	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	72	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	73	+
	74	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	75	+ AddSkyboxButton("urban", "UnionSquare", row3);
	76	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	77	+ AddSkyboxButton("park", "Buddha", row3);
	78	+
	79	+ AddSkyboxButton("park", "CNTower2", row4);
	80	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	81	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	82	+ AddSkyboxButton("park", "Park", row4);
	83	+
	84	+ AddSkyboxButton("park", "Pond", row5);
	85	+ AddSkyboxButton("park", "Skansen", row5);
	86	+ AddSkyboxButton("park", "Skansen2", row5);
	87	+ AddSkyboxButton("park", "Skansen3", row5);
	88	+
	89	+ AddSkyboxButton("park", "Skansen4", row6);
	90	+ AddSkyboxButton("park", "Skansen5", row6);
	91	+ AddSkyboxButton("park", "Stairs", row6);
	92	+ AddSkyboxButton("park", "Tantolunden4", row6);
	93	+
	94	+ tab0.add(row0);
	95	+ tab0.add(row1);
	96	+ tab0.add(row2);
	97	+ tab0.add(row3);
	98	+ tab0.add(row4);
	99	+ tab0.add(row5);
	100	+ tab0.add(row6);
	101	+
	102	+ for (int i=5; --i>=0;)
	103	+ {
	104	+ //oe.toolboxPanel.Return();
	105	+ //tab0.add(new cGridBag());
	106	+ }
	107	+ }
	108	+
	109	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	110	+ {
	111	+ cGridBag tab0 = new cGridBag().setVertical(true);
	112	+
	113	+ tab0.setName("Nature");
	114	+ skyboxpanel.add(tab0);
	115	+
	116	+ cGridBag row0 = new cGridBag();
	117	+ cGridBag row1 = new cGridBag();
	118	+ cGridBag row2 = new cGridBag();
	119	+ cGridBag row3 = new cGridBag();
	120	+ cGridBag row4 = new cGridBag();
	121	+ cGridBag row5 = new cGridBag();
	122	+ cGridBag row6 = new cGridBag();
	123	+
	124	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	125	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	126	+ AddSkyboxButton("beach", "PalmTrees", row0);
	127	+ AddSkyboxButton("beach", "Tenerife", row0);
	128	+
	129	+ AddSkyboxButton("beach", "Tenerife2", row1);
	130	+ AddSkyboxButton("beach", "Tenerife3", row1);
	131	+ AddSkyboxButton("field", "FishPond", row1);
	132	+ AddSkyboxButton("field", "Footballfield", row1);
	133	+
	134	+ AddSkyboxButton("field", "Meadow", row2);
	135	+ AddSkyboxButton("field", "Sorsele", row2);
	136	+ AddSkyboxButton("field", "Sorsele2", row2);
	137	+ AddSkyboxButton("field", "Sorsele3", row2);
	138	+
	139	+ AddSkyboxButton("forest", "Brudslojan", row3);
	140	+ AddSkyboxButton("forest", "Langholmen2", row3);
	141	+ AddSkyboxButton("forest", "Plants", row3);
	142	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	143	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	144	+
	145	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	146	+ AddSkyboxButton("mountain", "Ryfjallet", row4);
	147	+ AddSkyboxButton("mountain", "Teide", row4);
	148	+
	149	+ AddSkyboxButton("rocky", "Langholmen", row5);
	150	+ AddSkyboxButton("rocky", "Riddarfjarden", row5);
	151	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	152	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	153	+ /*
	154	+Kastellholmen
	155	+Langholmen
	156	+Riddarfjarden
	157	+Skinnarviksberget
	158	+Tanto
	159	+Tantolunden2
	160	+Tantolunden6
	161	+ */
	162	+
	163	+ tab0.add(row0);
	164	+ tab0.add(row1);
	165	+ tab0.add(row2);
	166	+ tab0.add(row3);
	167	+ tab0.add(row4);
	168	+ tab0.add(row5);
	169	+ tab0.add(row6);
	170	+
	171	+ for (int i=5; --i>=0;)
	172	+ {
	173	+ //oe.toolboxPanel.Return();
	174	+ //tab0.add(new cGridBag());
	175	+ }
	176	+ }
	177	+
	178	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	179	+ {
	180	+ cGridBag tab0 = new cGridBag().setVertical(true);
	181	+
	182	+ tab0.setName("Night");
	183	+ skyboxpanel.add(tab0);
	184	+
	185	+ cGridBag row0 = new cGridBag();
	186	+ cGridBag row1 = new cGridBag();
	187	+ cGridBag row2 = new cGridBag();
	188	+ cGridBag row3 = new cGridBag();
	189	+ cGridBag row4 = new cGridBag();
	190	+ cGridBag row5 = new cGridBag();
	191	+ cGridBag row6 = new cGridBag();
	192	+
	193	+ AddSkyboxButton("night", "NightPath", row0);
	194	+ AddSkyboxButton("night", "PondNight", row0);
	195	+ AddSkyboxButton("night", "Powerlines", row0);
	196	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	197	+
	198	+ AddSkyboxButton("urban", "CNTower", row1);
	199	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	200	+ AddSkyboxButton("indoors", "DallasW", row1);
	201	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row1);
	202	+
	203	+ AddSkyboxButton("indoors", "Vasa", row2);
	204	+ AddSkyboxButton("winter", "Backyard", row2);
	205	+ AddSkyboxButton("winter", "Creek", row2);
	206	+ AddSkyboxButton("winter", "FootballField3", row2);
	207	+
	208	+ AddSkyboxButton("winter", "Forest", row3);
	209	+ AddSkyboxButton("winter", "HornstullsStrand2", row3);
	210	+ AddSkyboxButton("winter", "House", row3);
	211	+ AddSkyboxButton("winter", "IceLake", row3);
	212	+
	213	+ AddSkyboxButton("winter", "IceRiver", row4);
	214	+ AddSkyboxButton("winter", "Park3", row4);
	215	+ AddSkyboxButton("winter", "PondWinter", row4);
	216	+
	217	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	218	+ AddSkyboxButton("winter", "Vindelalven", row5);
	219	+ /*
	220	+Backyard
	221	+Creek
	222	+FootballField3
	223	+Forest
	224	+HornstullsStrand2
	225	+House
	226	+IceLake
	227	+IceRiver
	228	+Park3
	229	+PondWinter
	230	+Tantolunden5
	231	+Vindelalven *
	232	+ */
	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 ChangeSkybox(String name)
	250	+ {
	251	+ cameraView.envyoff = false;
	252	+ cameraView.skyboxname = name;
	253	+ cameraView.skyboxext = "jpg";
	254	+ cameraView.repaint();
	255	+ }
	256	+
26	257	//ObjEditor objEditor;
27	258	public void closeUI2()
28	259	{
..	..	@@ -60,6 +291,12 @@
60	291	this.copy = this.group = group;
61	292	//selectees = this.group.selectees;
62	293
	294	+ if (copy.versions == null)
	295	+ {
	296	+ copy.versions = new byte[100][];
	297	+ copy.versionindex = -1;
	298	+ }
	299	+
63	300	if(ui)
64	301	SetupUI(objEditor);
65	302	}
..	..	@@ -80,6 +317,14 @@
80	317	SetupViews(objEditor);
81	318
82	319	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	320	+
	321	+ if (copy.versions == null)
	322	+ {
	323	+ copy.versions = new byte[100][];
	324	+ copy.versionindex = -1;
	325	+
	326	+ Save(true);
	327	+ }
83	328	}
84	329
85	330	void CloneSelection(boolean supports)
..	..	@@ -194,8 +439,8 @@
194	439	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
195	440	// pasteExpandItem.addActionListener(this);
196	441	menu.add("-");
197		- clearItem = menu.add(new MenuItem("Clear"));
198		- clearItem.addActionListener(this);
	442	+ deleteItem = menu.add(new MenuItem("Delete"));
	443	+ deleteItem.addActionListener(this);
199	444
200	445	if (Globals.ADVANCED)
201	446	{
..	..	@@ -421,7 +666,7 @@
421	666	genNormalsMESHItem.addActionListener(this);
422	667	if (Globals.ADVANCED)
423	668	{
424		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	669	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
425	670	genNormalsMINEItem.addActionListener(this);
426	671	}
427	672	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -514,10 +759,15 @@
514	759	attachBumpItem.addActionListener(this);
515	760	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
516	761	pigmentBumpItem.addActionListener(this);
	762	+ //embedTexturesItem
517	763	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
518	764	detachPigmentItem.addActionListener(this);
519	765	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
520	766	detachBumpItem.addActionListener(this);
	767	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	768	+ embedTexturesItem.addActionListener(this);
	769	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	770	+ deEmbedTexturesItem.addActionListener(this);
521	771	menu.add("-");
522	772	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
523	773	sortbysizeItem.addActionListener(this);
..	..	@@ -589,7 +839,7 @@
589	839	*/
590	840	cGridBag copyOptionsPanel = new cGridBag();
591	841
592		- copyOptionsPanel.preferredHeight = 1;
	842	+ copyOptionsPanel.preferredHeight = 2;
593	843
594	844	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
595	845
..	..	@@ -669,31 +919,32 @@
669	919	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
670	920	snapobjectButton.addActionListener(this);
671	921	snapobjectButton.setToolTipText("Snap Object");
	922	+
	923	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	924	+ fourButton.addActionListener(this);
	925	+ fourButton.setToolTipText("Show control panel only");
672	926	}
673	927
674	928	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
675	929
676		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
677		- twoButton.setToolTipText("Show center view only");
	930	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	931	+ twoButton.setToolTipText("Show 3D view only");
678	932	twoButton.addActionListener(this);
679	933	this.fullscreenLayout = twoButton;
680	934
681		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682		- fourButton.addActionListener(this);
683		- fourButton.setToolTipText("Show left panel only");
684		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
685		- sixButton.setToolTipText("2-column layout left");
686		- sixButton.addActionListener(this);
687		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
688		- threeButton.setToolTipText("2-column layout right");
	935	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	936	+ threeButton.setToolTipText("Show controls and 3D view");
689	937	threeButton.addActionListener(this);
690		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
691		- sevenButton.setToolTipText("3-column layout");
692		- sevenButton.addActionListener(this);
	938	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	939	+ sixButton.setToolTipText("Show 3D view and controls");
	940	+ sixButton.addActionListener(this);
	941	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	942	+// sevenButton.setToolTipText("3-column layout");
	943	+// sevenButton.addActionListener(this);
693	944	//
694	945
695		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
696		- rootButton.setToolTipText("Edit selection in new tab");
	946	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	947	+ rootButton.setToolTipText("Open selection in new tab");
697	948	rootButton.addActionListener(this);
698	949
699	950	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -702,28 +953,30 @@
702	953	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
703	954	//clearButton.addActionListener(this);
704	955
	956	+ cGridBag row1 = new cGridBag();
	957	+
705	958	// INSERT
706		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	959	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
707	960	gridButton.setToolTipText("Create grid");
708	961	gridButton.addActionListener(this);
709	962
710		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	963	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
711	964	boxButton.setToolTipText("Create box");
712	965	boxButton.addActionListener(this);
713	966
714		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	967	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
715	968	sphereButton.setToolTipText("Create sphere");
716	969	sphereButton.addActionListener(this);
717	970
718		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	971	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
719	972	coneButton.setToolTipText("Create cone");
720	973	coneButton.addActionListener(this);
721	974
722		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	975	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
723	976	torusButton.setToolTipText("Create torus");
724	977	torusButton.addActionListener(this);
725	978
726		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	979	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
727	980	superButton.setToolTipText("Create superellipsoid");
728	981	superButton.addActionListener(this);
729	982
..	..	@@ -734,51 +987,56 @@
734	987	kleinButton.addActionListener(this);
735	988	}
736	989
737		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	990	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
738	991	particlesButton.setToolTipText("Create particle system");
739	992	particlesButton.addActionListener(this);
740	993
741		- oe.toolboxPanel.Return();
	994	+ oe.toolboxPanel.add(row1);
742	995
743		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	996	+ cGridBag row2 = new cGridBag();
	997	+
	998	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
744	999	groupButton.setToolTipText("Create group");
745	1000	groupButton.addActionListener(this);
746	1001
747		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1002	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
748	1003	compositeButton.setToolTipText("Create composite");
749	1004	compositeButton.addActionListener(this);
750	1005
751		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1006	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
752	1007	switchButton.setToolTipText("Create item switcher");
753	1008	switchButton.addActionListener(this);
754	1009
755		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1010	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
756	1011	loopButton.setToolTipText("Create loop");
757	1012	loopButton.addActionListener(this);
758	1013
759		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1014	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
760	1015	textureButton.setToolTipText("Create texture");
761	1016	textureButton.addActionListener(this);
762	1017
763		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1018	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
764	1019	overlayButton.setToolTipText("Create overlay");
765	1020	overlayButton.addActionListener(this);
766	1021
767		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1022	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
768	1023	lightButton.setToolTipText("Create light");
769	1024	lightButton.addActionListener(this);
770	1025
771		- for (int i=6; --i>=0;)
772		- {
773		- oe.toolboxPanel.Return();
774		- oe.toolboxPanel.add(new cGridBag());
775		- oe.toolboxPanel.add(new cGridBag());
776		- oe.toolboxPanel.add(new cGridBag());
777		- oe.toolboxPanel.add(new cGridBag());
778		- oe.toolboxPanel.add(new cGridBag());
779		- oe.toolboxPanel.add(new cGridBag());
780		- oe.toolboxPanel.add(new cGridBag());
781		- }
	1026	+ oe.toolboxPanel.add(row2);
	1027	+
	1028	+ // ENVYMAPS
	1029	+ cGridBag skyboxpane = new cGridBag();
	1030	+ skyboxpane.preferredHeight = 100;
	1031	+
	1032	+ oe.toolboxPanel.add(skyboxpane);
	1033	+
	1034	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1035	+ skyboxpane.add(skyboxpanel);
	1036	+
	1037	+ AddSkyboxTab0(skyboxpanel);
	1038	+ AddSkyboxTab1(skyboxpanel);
	1039	+ AddSkyboxTab2(skyboxpanel);
782	1040
783	1041	// EDIT panel
784	1042	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -834,12 +1092,12 @@
834	1092
835	1093	oe.treePanel.add(copyOptionsPanel);
836	1094	oe.treePanel.Return();
837		- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 10, 0);
838		- versionField = (cNumberSlider)sliderPane.getComponent(1);
	1095	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1096	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
839	1097	sliderPane.preferredHeight = 1;
840	1098
841		-// mainPanel.setDividerLocation(0.5); //1.0);
842		-// mainPanel.setResizeWeight(0.5);
	1099	+// mainPanel.setDividerLocation(0.1); //1.0);
	1100	+ mainPanel.setResizeWeight(0.4);
843	1101
844	1102	//jList.addListSelectionListener(this);
845	1103	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -847,7 +1105,7 @@
847	1105	//jTree.setEditable(true);
848	1106	oe.jTree.setDragEnabled(true);
849	1107	//jTree.setPreferredSize(new Dimension(10,10));
850		- jSP.setPreferredSize(new Dimension(100,200));
	1108	+ //jSP.setPreferredSize(new Dimension(100,200));
851	1109
852	1110	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
853	1111
..	..	@@ -859,7 +1117,7 @@
859	1117	dgr.addDragGestureListener(this);
860	1118	}catch(Exception e) {}
861	1119	*/
862		- radio.layout = sevenButton;
	1120	+ radio.layout = sixButton; // sevenButton;
863	1121	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
864	1122	}
865	1123
..	..	@@ -1001,7 +1259,7 @@
1001	1259	}
1002	1260
1003	1261	radioButton.SetObject(obj);
1004		- radioButton.layout = sevenButton;
	1262	+ radioButton.layout = sixButton; // sevenButton;
1005	1263	radioButton.SetCamera(cameraView.renderCamera, false);
1006	1264	radioButton.addActionListener(this);
1007	1265	radioPanel.add(radioButton);
..	..	@@ -1681,6 +1939,16 @@
1681	1939	}
1682	1940	}
1683	1941	}
	1942	+
	1943	+ private void EditElement(Object3D elem, boolean newWindow)
	1944	+ {
	1945	+ // if (!(elem instanceof Composite))
	1946	+ // newWindow = false;
	1947	+ listUI.add(elem);
	1948	+ elem.openEditWindow(this, newWindow); //, false);
	1949	+ System.out.println("edit : " + elem);
	1950	+ elem.editWindow.refreshContents(true); // ? new
	1951	+ }
1684	1952
1685	1953	/**
1686	1954	* applyExample
..	..	@@ -2109,6 +2377,23 @@
2109	2377	{
2110	2378	makeSomething(new Light());
2111	2379	} else
	2380	+// if (source == skybox1Button \|\|
	2381	+// source == skybox2Button \|\|
	2382	+// source == skybox3Button \|\|
	2383	+// source == skybox4Button \|\|
	2384	+// source == skybox5Button \|\|
	2385	+// source == skybox6Button \|\|
	2386	+// source == skybox7Button \|\|
	2387	+// source == skybox11Button \|\|
	2388	+// source == skybox12Button \|\|
	2389	+// source == skybox13Button \|\|
	2390	+// source == skybox14Button \|\|
	2391	+// source == skybox15Button \|\|
	2392	+// source == skybox16Button \|\|
	2393	+// source == skybox17Button)
	2394	+// {
	2395	+// ChangeSkybox(source);
	2396	+// } else
2112	2397	if (source == csgItem)
2113	2398	{
2114	2399	group(new CSG());
..	..	@@ -2194,7 +2479,7 @@
2194	2479	if (source == computeAOItem)
2195	2480	{
2196	2481	Globals.drawMode = CameraPane.OCCLUSION;
2197		- Globals.theRenderer.repaint();
	2482	+ cameraView.repaint();
2198	2483	} else
2199	2484	if (source == recompileItem)
2200	2485	{
..	..	@@ -2646,7 +2931,7 @@
2646	2931	{
2647	2932	StepAll();
2648	2933	} else
2649		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2934	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2650	2935	{
2651	2936	//int indices[] = jList.getSelectedIndices();
2652	2937	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -3128,7 +3413,7 @@
3128	3413	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3129	3414	{
3130	3415	obj = (Object3D)e.nextElement();
3131		- obj.SetBumpTexture(null);
	3416	+ obj.ResetBumpTexture();
3132	3417	}
3133	3418
3134	3419	refreshContents();
..	..	@@ -3142,6 +3427,31 @@
3142	3427	obj.SetBumpTexture(obj.GetPigmentTexture());
3143	3428	}
3144	3429
	3430	+ refreshContents();
	3431	+ } else
	3432	+ if (source == embedTexturesItem)
	3433	+ {
	3434	+ Object3D obj;
	3435	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3436	+ {
	3437	+ obj = (Object3D)e.nextElement();
	3438	+ obj.EmbedTextures(true);
	3439	+ }
	3440	+
	3441	+ refreshContents();
	3442	+ } else
	3443	+ if (source == deEmbedTexturesItem)
	3444	+ {
	3445	+ Object3D obj;
	3446	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3447	+ {
	3448	+ obj = (Object3D)e.nextElement();
	3449	+ obj.EmbedTextures(false);
	3450	+ }
	3451	+
	3452	+ CameraPane.texturepigment.clear();
	3453	+ CameraPane.texturebump.clear();
	3454	+
3145	3455	refreshContents();
3146	3456	} else
3147	3457	if (source == flashSelectionButton)
..	..	@@ -3245,8 +3555,8 @@
3245	3555	// centralPanel.setVisible(true);
3246	3556	// XYZPanel.setVisible(true);
3247	3557	bigThree.ClearUI();
	3558	+ bigThree.add(scenePanel);
3248	3559	bigThree.add(centralPanel);
3249		- bigThree.add(XYZPanel);
3250	3560	bigThree.FlushUI();
3251	3561
3252	3562	cameraView.requestFocusInWindow();
..	..	@@ -3326,8 +3636,8 @@
3326	3636	// centralPanel.setVisible(true);
3327	3637	// XYZPanel.setVisible(false);
3328	3638	bigThree.ClearUI();
3329		- bigThree.add(scenePanel);
3330	3639	bigThree.add(centralPanel);
	3640	+ bigThree.add(scenePanel);
3331	3641	bigThree.FlushUI();
3332	3642
3333	3643	cameraView.requestFocusInWindow();
..	..	@@ -3541,8 +3851,10 @@
3541	3851	radio.layout.doClick();
3542	3852
3543	3853	ClearUnpinned();
3544		- SetPinStates(group.selection.size() > 0);
3545		- if (group.selection.size() == 1)
	3854	+ //Grafreed.Assert(group != null);
	3855	+ //Grafreed.Assert(group.selection != null);
	3856	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3857	+ if (group.selection == null \|\| group.selection.size() == 1)
3546	3858	EditSelection(false);
3547	3859	keepparent = group.parent;
3548	3860	// PARENT = NULL or not???
..	..	@@ -4136,7 +4448,7 @@
4136	4448
4137	4449	try
4138	4450	{
4139		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4451	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4140	4452	}
4141	4453	catch (Exception e)
4142	4454	{
..	..	@@ -4613,6 +4925,12 @@
4613	4925
4614	4926	void EditSelection(boolean newWindow)
4615	4927	{
	4928	+ if (group.selection == null)
	4929	+ {
	4930	+ EditElement(group, newWindow); // ? new
	4931	+ return;
	4932	+ }
	4933	+
4616	4934	// aConstraints.gridy = 0;
4617	4935	for (int i=0; i<group.selection.size(); i++)
4618	4936	{
..	..	@@ -4623,12 +4941,7 @@
4623	4941	Object3D elem = (Object3D)group.selection.elementAt(i);
4624	4942	if(elem != group \|\| !newWindow)
4625	4943	{
4626		- // if (!(elem instanceof Composite))
4627		- // newWindow = false;
4628		- listUI.add(elem);
4629		- elem.openEditWindow(this, newWindow); //, false);
4630		- System.out.println("edit : " + elem);
4631		- elem.editWindow.refreshContents(true); // ? new
	4944	+ EditElement(elem, newWindow); // ? new
4632	4945	}
4633	4946	}
4634	4947	}
..	..	@@ -4772,7 +5085,7 @@
4772	5085
4773	5086	void refreshContents(boolean cp)
4774	5087	{
4775		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	5088	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4776	5089	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4777	5090	{
4778	5091	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -5618,6 +5931,22 @@
5618	5931	cButton loopButton;
5619	5932	cButton textureButton;
5620	5933
	5934	+ cButton skybox1Button;
	5935	+ cButton skybox2Button;
	5936	+ cButton skybox3Button;
	5937	+ cButton skybox4Button;
	5938	+ cButton skybox5Button;
	5939	+ cButton skybox6Button;
	5940	+ cButton skybox7Button;
	5941	+
	5942	+ cButton skybox11Button;
	5943	+ cButton skybox12Button;
	5944	+ cButton skybox13Button;
	5945	+ cButton skybox14Button;
	5946	+ cButton skybox15Button;
	5947	+ cButton skybox16Button;
	5948	+ cButton skybox17Button;
	5949	+
5621	5950	cButton gridButton;
5622	5951	cButton boxButton;
5623	5952	cButton sphereButton;
..	..	@@ -5681,7 +6010,7 @@
5681	6010	private MenuItem pasteLinkItem;
5682	6011	private MenuItem pasteCloneItem;
5683	6012	private MenuItem pasteExpandItem;
5684		- private MenuItem clearItem;
	6013	+ private MenuItem deleteItem;
5685	6014	private MenuItem clearAllItem;
5686	6015	private MenuItem genUVItem;
5687	6016	private MenuItem genNormalsMESHItem;
..	..	@@ -5765,6 +6094,8 @@
5765	6094	private MenuItem attachBumpItem;
5766	6095	private MenuItem detachBumpItem;
5767	6096	private MenuItem pigmentBumpItem;
	6097	+ private MenuItem embedTexturesItem;
	6098	+ private MenuItem deEmbedTexturesItem;
5768	6099
5769	6100	private MenuItem particleItem;
5770	6101	private MenuItem ragdollItem;