~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.versions == null)
	360	+ {
	361	+ copy.versions = new byte[100][];
	362	+ copy.versionindex = -1;
	363	+ }
	364	+
63	365	if(ui)
64	366	SetupUI(objEditor);
65	367	}
..	..	@@ -80,6 +382,14 @@
80	382	SetupViews(objEditor);
81	383
82	384	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	385	+
	386	+ if (copy.versions == null)
	387	+ {
	388	+ copy.versions = new byte[100][];
	389	+ copy.versionindex = -1;
	390	+
	391	+ Save(true);
	392	+ }
83	393	}
84	394
85	395	void CloneSelection(boolean supports)
..	..	@@ -194,8 +504,8 @@
194	504	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
195	505	// pasteExpandItem.addActionListener(this);
196	506	menu.add("-");
197		- clearItem = menu.add(new MenuItem("Clear"));
198		- clearItem.addActionListener(this);
	507	+ deleteItem = menu.add(new MenuItem("Delete"));
	508	+ deleteItem.addActionListener(this);
199	509
200	510	if (Globals.ADVANCED)
201	511	{
..	..	@@ -421,7 +731,7 @@
421	731	genNormalsMESHItem.addActionListener(this);
422	732	if (Globals.ADVANCED)
423	733	{
424		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	734	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
425	735	genNormalsMINEItem.addActionListener(this);
426	736	}
427	737	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -514,10 +824,15 @@
514	824	attachBumpItem.addActionListener(this);
515	825	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
516	826	pigmentBumpItem.addActionListener(this);
	827	+ //embedTexturesItem
517	828	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
518	829	detachPigmentItem.addActionListener(this);
519	830	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
520	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);
521	836	menu.add("-");
522	837	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
523	838	sortbysizeItem.addActionListener(this);
..	..	@@ -589,7 +904,7 @@
589	904	*/
590	905	cGridBag copyOptionsPanel = new cGridBag();
591	906
592		- copyOptionsPanel.preferredHeight = 1;
	907	+ copyOptionsPanel.preferredHeight = 2;
593	908
594	909	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
595	910
..	..	@@ -669,31 +984,32 @@
669	984	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
670	985	snapobjectButton.addActionListener(this);
671	986	snapobjectButton.setToolTipText("Snap Object");
	987	+
	988	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	989	+ fourButton.addActionListener(this);
	990	+ fourButton.setToolTipText("Show control panel only");
672	991	}
673	992
674	993	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
675	994
676		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
677		- twoButton.setToolTipText("Show center view only");
	995	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	996	+ twoButton.setToolTipText("Show 3D view only");
678	997	twoButton.addActionListener(this);
679	998	this.fullscreenLayout = twoButton;
680	999
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");
	1000	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1001	+ threeButton.setToolTipText("Show controls and 3D view");
689	1002	threeButton.addActionListener(this);
690		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
691		- sevenButton.setToolTipText("3-column layout");
692		- sevenButton.addActionListener(this);
	1003	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1004	+ sixButton.setToolTipText("Show 3D view and controls");
	1005	+ sixButton.addActionListener(this);
	1006	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1007	+// sevenButton.setToolTipText("3-column layout");
	1008	+// sevenButton.addActionListener(this);
693	1009	//
694	1010
695		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
696		- rootButton.setToolTipText("Edit selection in new tab");
	1011	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1012	+ rootButton.setToolTipText("Open selection in new tab");
697	1013	rootButton.addActionListener(this);
698	1014
699	1015	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -702,28 +1018,30 @@
702	1018	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
703	1019	//clearButton.addActionListener(this);
704	1020
	1021	+ cGridBag row1 = new cGridBag();
	1022	+
705	1023	// INSERT
706		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1024	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
707	1025	gridButton.setToolTipText("Create grid");
708	1026	gridButton.addActionListener(this);
709	1027
710		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1028	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
711	1029	boxButton.setToolTipText("Create box");
712	1030	boxButton.addActionListener(this);
713	1031
714		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1032	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
715	1033	sphereButton.setToolTipText("Create sphere");
716	1034	sphereButton.addActionListener(this);
717	1035
718		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1036	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
719	1037	coneButton.setToolTipText("Create cone");
720	1038	coneButton.addActionListener(this);
721	1039
722		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1040	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
723	1041	torusButton.setToolTipText("Create torus");
724	1042	torusButton.addActionListener(this);
725	1043
726		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1044	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
727	1045	superButton.setToolTipText("Create superellipsoid");
728	1046	superButton.addActionListener(this);
729	1047
..	..	@@ -734,51 +1052,57 @@
734	1052	kleinButton.addActionListener(this);
735	1053	}
736	1054
737		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1055	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
738	1056	particlesButton.setToolTipText("Create particle system");
739	1057	particlesButton.addActionListener(this);
740	1058
741		- oe.toolboxPanel.Return();
	1059	+ oe.toolboxPanel.add(row1);
742	1060
743		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+ cGridBag row2 = new cGridBag();
	1062	+
	1063	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
744	1064	groupButton.setToolTipText("Create group");
745	1065	groupButton.addActionListener(this);
746	1066
747		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1067	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
748	1068	compositeButton.setToolTipText("Create composite");
749	1069	compositeButton.addActionListener(this);
750	1070
751		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1071	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
752	1072	switchButton.setToolTipText("Create item switcher");
753	1073	switchButton.addActionListener(this);
754	1074
755		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1075	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
756	1076	loopButton.setToolTipText("Create loop");
757	1077	loopButton.addActionListener(this);
758	1078
759		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1079	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
760	1080	textureButton.setToolTipText("Create texture");
761	1081	textureButton.addActionListener(this);
762	1082
763		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1083	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
764	1084	overlayButton.setToolTipText("Create overlay");
765	1085	overlayButton.addActionListener(this);
766	1086
767		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1087	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
768	1088	lightButton.setToolTipText("Create light");
769	1089	lightButton.addActionListener(this);
770	1090
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		- }
	1091	+ oe.toolboxPanel.add(row2);
	1092	+
	1093	+ // ENVYMAPS
	1094	+ cGridBag skyboxpane = new cGridBag();
	1095	+ skyboxpane.preferredHeight = 100;
	1096	+
	1097	+ oe.toolboxPanel.add(skyboxpane);
	1098	+
	1099	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1100	+ skyboxpane.add(skyboxpanel);
	1101	+
	1102	+ AddSkyboxTab0(skyboxpanel);
	1103	+ AddSkyboxTab1(skyboxpanel);
	1104	+ AddSkyboxTab2(skyboxpanel);
	1105	+ AddSkyboxTab3(skyboxpanel);
782	1106
783	1107	// EDIT panel
784	1108	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -834,12 +1158,12 @@
834	1158
835	1159	oe.treePanel.add(copyOptionsPanel);
836	1160	oe.treePanel.Return();
837		- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 10, 0);
838		- versionField = (cNumberSlider)sliderPane.getComponent(1);
	1161	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1162	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
839	1163	sliderPane.preferredHeight = 1;
840	1164
841		-// mainPanel.setDividerLocation(0.5); //1.0);
842		-// mainPanel.setResizeWeight(0.5);
	1165	+// mainPanel.setDividerLocation(0.1); //1.0);
	1166	+ mainPanel.setResizeWeight(0.4);
843	1167
844	1168	//jList.addListSelectionListener(this);
845	1169	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -847,7 +1171,7 @@
847	1171	//jTree.setEditable(true);
848	1172	oe.jTree.setDragEnabled(true);
849	1173	//jTree.setPreferredSize(new Dimension(10,10));
850		- jSP.setPreferredSize(new Dimension(100,200));
	1174	+ //jSP.setPreferredSize(new Dimension(100,200));
851	1175
852	1176	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
853	1177
..	..	@@ -859,7 +1183,7 @@
859	1183	dgr.addDragGestureListener(this);
860	1184	}catch(Exception e) {}
861	1185	*/
862		- radio.layout = sevenButton;
	1186	+ radio.layout = sixButton; // sevenButton;
863	1187	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
864	1188	}
865	1189
..	..	@@ -910,9 +1234,12 @@
910	1234	smoothCB.setToolTipText("Snapping delay");
911	1235	smoothCB.addItemListener(this);
912	1236
913		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
914		- slowCB.setToolTipText("Smooth interpolation");
915		- slowCB.addItemListener(this);
	1237	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1238	+// slowCB.setToolTipText("Smooth interpolation");
	1239	+// slowCB.addItemListener(this);
	1240	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1241	+ minshaderCB.setToolTipText("Minimal fast shader");
	1242	+ minshaderCB.addItemListener(this);
916	1243
917	1244	// constraints.gridy += 1;
918	1245	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -1001,7 +1328,7 @@
1001	1328	}
1002	1329
1003	1330	radioButton.SetObject(obj);
1004		- radioButton.layout = sevenButton;
	1331	+ radioButton.layout = sixButton; // sevenButton;
1005	1332	radioButton.SetCamera(cameraView.renderCamera, false);
1006	1333	radioButton.addActionListener(this);
1007	1334	radioPanel.add(radioButton);
..	..	@@ -1026,6 +1353,8 @@
1026	1353	cCheckBox localCB;
1027	1354	cCheckBox crowdCB;
1028	1355	cCheckBox smoothCB;
	1356	+ cCheckBox minshaderCB;
	1357	+
1029	1358	cToggleButton fastCB;
1030	1359	cCheckBox slowCB;
1031	1360	cCheckBox boxCB;
..	..	@@ -1096,6 +1425,12 @@
1096	1425	{
1097	1426	cameraView.ToggleInertia();
1098	1427	cameraView.repaint();
	1428	+ }
	1429	+ else if(e.getSource() == minshaderCB)
	1430	+ {
	1431	+ Globals.MINSHADER ^= true;
	1432	+ cameraView.programInitialized = false;
	1433	+ cameraView.repaint();
1099	1434	}
1100	1435	else if(e.getSource() == localCB)
1101	1436	{
..	..	@@ -1681,6 +2016,16 @@
1681	2016	}
1682	2017	}
1683	2018	}
	2019	+
	2020	+ private void EditElement(Object3D elem, boolean newWindow)
	2021	+ {
	2022	+ // if (!(elem instanceof Composite))
	2023	+ // newWindow = false;
	2024	+ listUI.add(elem);
	2025	+ elem.openEditWindow(this, newWindow); //, false);
	2026	+ System.out.println("edit : " + elem);
	2027	+ elem.editWindow.refreshContents(true); // ? new
	2028	+ }
1684	2029
1685	2030	/**
1686	2031	* applyExample
..	..	@@ -2109,6 +2454,23 @@
2109	2454	{
2110	2455	makeSomething(new Light());
2111	2456	} else
	2457	+// if (source == skybox1Button \|\|
	2458	+// source == skybox2Button \|\|
	2459	+// source == skybox3Button \|\|
	2460	+// source == skybox4Button \|\|
	2461	+// source == skybox5Button \|\|
	2462	+// source == skybox6Button \|\|
	2463	+// source == skybox7Button \|\|
	2464	+// source == skybox11Button \|\|
	2465	+// source == skybox12Button \|\|
	2466	+// source == skybox13Button \|\|
	2467	+// source == skybox14Button \|\|
	2468	+// source == skybox15Button \|\|
	2469	+// source == skybox16Button \|\|
	2470	+// source == skybox17Button)
	2471	+// {
	2472	+// ChangeSkybox(source);
	2473	+// } else
2112	2474	if (source == csgItem)
2113	2475	{
2114	2476	group(new CSG());
..	..	@@ -2194,7 +2556,7 @@
2194	2556	if (source == computeAOItem)
2195	2557	{
2196	2558	Globals.drawMode = CameraPane.OCCLUSION;
2197		- Globals.theRenderer.repaint();
	2559	+ cameraView.repaint();
2198	2560	} else
2199	2561	if (source == recompileItem)
2200	2562	{
..	..	@@ -2646,7 +3008,7 @@
2646	3008	{
2647	3009	StepAll();
2648	3010	} else
2649		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3011	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2650	3012	{
2651	3013	//int indices[] = jList.getSelectedIndices();
2652	3014	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -3128,7 +3490,7 @@
3128	3490	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3129	3491	{
3130	3492	obj = (Object3D)e.nextElement();
3131		- obj.SetBumpTexture(null);
	3493	+ obj.ResetBumpTexture();
3132	3494	}
3133	3495
3134	3496	refreshContents();
..	..	@@ -3142,6 +3504,31 @@
3142	3504	obj.SetBumpTexture(obj.GetPigmentTexture());
3143	3505	}
3144	3506
	3507	+ refreshContents();
	3508	+ } else
	3509	+ if (source == embedTexturesItem)
	3510	+ {
	3511	+ Object3D obj;
	3512	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3513	+ {
	3514	+ obj = (Object3D)e.nextElement();
	3515	+ obj.EmbedTextures(true);
	3516	+ }
	3517	+
	3518	+ refreshContents();
	3519	+ } else
	3520	+ if (source == deEmbedTexturesItem)
	3521	+ {
	3522	+ Object3D obj;
	3523	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3524	+ {
	3525	+ obj = (Object3D)e.nextElement();
	3526	+ obj.EmbedTextures(false);
	3527	+ }
	3528	+
	3529	+ CameraPane.texturepigment.clear();
	3530	+ CameraPane.texturebump.clear();
	3531	+
3145	3532	refreshContents();
3146	3533	} else
3147	3534	if (source == flashSelectionButton)
..	..	@@ -3245,8 +3632,8 @@
3245	3632	// centralPanel.setVisible(true);
3246	3633	// XYZPanel.setVisible(true);
3247	3634	bigThree.ClearUI();
	3635	+ bigThree.add(scenePanel);
3248	3636	bigThree.add(centralPanel);
3249		- bigThree.add(XYZPanel);
3250	3637	bigThree.FlushUI();
3251	3638
3252	3639	cameraView.requestFocusInWindow();
..	..	@@ -3326,8 +3713,8 @@
3326	3713	// centralPanel.setVisible(true);
3327	3714	// XYZPanel.setVisible(false);
3328	3715	bigThree.ClearUI();
3329		- bigThree.add(scenePanel);
3330	3716	bigThree.add(centralPanel);
	3717	+ bigThree.add(scenePanel);
3331	3718	bigThree.FlushUI();
3332	3719
3333	3720	cameraView.requestFocusInWindow();
..	..	@@ -3541,8 +3928,10 @@
3541	3928	radio.layout.doClick();
3542	3929
3543	3930	ClearUnpinned();
3544		- SetPinStates(group.selection.size() > 0);
3545		- if (group.selection.size() == 1)
	3931	+ //Grafreed.Assert(group != null);
	3932	+ //Grafreed.Assert(group.selection != null);
	3933	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3934	+ if (group.selection == null \|\| group.selection.size() == 1)
3546	3935	EditSelection(false);
3547	3936	keepparent = group.parent;
3548	3937	// PARENT = NULL or not???
..	..	@@ -4136,7 +4525,7 @@
4136	4525
4137	4526	try
4138	4527	{
4139		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4528	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4140	4529	}
4141	4530	catch (Exception e)
4142	4531	{
..	..	@@ -4613,6 +5002,12 @@
4613	5002
4614	5003	void EditSelection(boolean newWindow)
4615	5004	{
	5005	+ if (group.selection == null)
	5006	+ {
	5007	+ EditElement(group, newWindow); // ? new
	5008	+ return;
	5009	+ }
	5010	+
4616	5011	// aConstraints.gridy = 0;
4617	5012	for (int i=0; i<group.selection.size(); i++)
4618	5013	{
..	..	@@ -4623,12 +5018,7 @@
4623	5018	Object3D elem = (Object3D)group.selection.elementAt(i);
4624	5019	if(elem != group \|\| !newWindow)
4625	5020	{
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
	5021	+ EditElement(elem, newWindow); // ? new
4632	5022	}
4633	5023	}
4634	5024	}
..	..	@@ -4772,7 +5162,7 @@
4772	5162
4773	5163	void refreshContents(boolean cp)
4774	5164	{
4775		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	5165	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4776	5166	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4777	5167	{
4778	5168	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -5618,6 +6008,22 @@
5618	6008	cButton loopButton;
5619	6009	cButton textureButton;
5620	6010
	6011	+ cButton skybox1Button;
	6012	+ cButton skybox2Button;
	6013	+ cButton skybox3Button;
	6014	+ cButton skybox4Button;
	6015	+ cButton skybox5Button;
	6016	+ cButton skybox6Button;
	6017	+ cButton skybox7Button;
	6018	+
	6019	+ cButton skybox11Button;
	6020	+ cButton skybox12Button;
	6021	+ cButton skybox13Button;
	6022	+ cButton skybox14Button;
	6023	+ cButton skybox15Button;
	6024	+ cButton skybox16Button;
	6025	+ cButton skybox17Button;
	6026	+
5621	6027	cButton gridButton;
5622	6028	cButton boxButton;
5623	6029	cButton sphereButton;
..	..	@@ -5681,7 +6087,7 @@
5681	6087	private MenuItem pasteLinkItem;
5682	6088	private MenuItem pasteCloneItem;
5683	6089	private MenuItem pasteExpandItem;
5684		- private MenuItem clearItem;
	6090	+ private MenuItem deleteItem;
5685	6091	private MenuItem clearAllItem;
5686	6092	private MenuItem genUVItem;
5687	6093	private MenuItem genNormalsMESHItem;
..	..	@@ -5765,6 +6171,8 @@
5765	6171	private MenuItem attachBumpItem;
5766	6172	private MenuItem detachBumpItem;
5767	6173	private MenuItem pigmentBumpItem;
	6174	+ private MenuItem embedTexturesItem;
	6175	+ private MenuItem deEmbedTexturesItem;
5768	6176
5769	6177	private MenuItem particleItem;
5770	6178	private MenuItem ragdollItem;