~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	{
..	..	@@ -80,18 +376,20 @@
80	376	this.copy = this.group = copy;
81	377	//selectees = this.group.selectees;
82	378
83		- if (copy.versions == null)
84		- {
85		- copy.versions = new byte[100][];
86		- copy.versionindex = -1;
87		- }
88		-
89	379	SetupMenu2(this); //objEditor);
90	380	SetupUI2(objEditor);
91	381	objEditor.SetupUI(true);
92	382	SetupViews(objEditor);
93	383
94	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	+ }
95	393	}
96	394
97	395	void CloneSelection(boolean supports)
..	..	@@ -206,8 +504,8 @@
206	504	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
207	505	// pasteExpandItem.addActionListener(this);
208	506	menu.add("-");
209		- clearItem = menu.add(new MenuItem("Clear"));
210		- clearItem.addActionListener(this);
	507	+ deleteItem = menu.add(new MenuItem("Delete"));
	508	+ deleteItem.addActionListener(this);
211	509
212	510	if (Globals.ADVANCED)
213	511	{
..	..	@@ -433,7 +731,7 @@
433	731	genNormalsMESHItem.addActionListener(this);
434	732	if (Globals.ADVANCED)
435	733	{
436		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	734	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
437	735	genNormalsMINEItem.addActionListener(this);
438	736	}
439	737	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -526,10 +824,15 @@
526	824	attachBumpItem.addActionListener(this);
527	825	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
528	826	pigmentBumpItem.addActionListener(this);
	827	+ //embedTexturesItem
529	828	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
530	829	detachPigmentItem.addActionListener(this);
531	830	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
532	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);
533	836	menu.add("-");
534	837	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
535	838	sortbysizeItem.addActionListener(this);
..	..	@@ -601,7 +904,7 @@
601	904	*/
602	905	cGridBag copyOptionsPanel = new cGridBag();
603	906
604		- copyOptionsPanel.preferredHeight = 1;
	907	+ copyOptionsPanel.preferredHeight = 2;
605	908
606	909	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
607	910
..	..	@@ -629,7 +932,7 @@
629	932	restoreCameraButton.addActionListener(this);
630	933
631	934	copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632		- saveButton.setToolTipText("New version");
	935	+ saveButton.setToolTipText("Duplicate current version");
633	936	saveButton.addActionListener(this);
634	937
635	938	copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -639,12 +942,12 @@
639	942
640	943	cGridBag updown = new cGridBag().setVertical(true);
641	944	updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642		- restoreButton.setToolTipText("Restore current");
	945	+ restoreButton.setToolTipText("Restore current version (undo latest change)");
643	946	restoreButton.addActionListener(this);
644	947	restoreButton.setEnabled(false);
645	948
646	949	updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
647		- replaceButton.setToolTipText("Replace current");
	950	+ replaceButton.setToolTipText("Replace current version (save latest change)");
648	951	replaceButton.addActionListener(this);
649	952	replaceButton.setEnabled(false);
650	953
..	..	@@ -681,31 +984,32 @@
681	984	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682	985	snapobjectButton.addActionListener(this);
683	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");
684	991	}
685	992
686	993	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
687	994
688		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
689		- 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");
690	997	twoButton.addActionListener(this);
691	998	this.fullscreenLayout = twoButton;
692	999
693		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
694		- fourButton.addActionListener(this);
695		- fourButton.setToolTipText("Show left panel only");
696		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
697		- sixButton.setToolTipText("2-column layout left");
698		- sixButton.addActionListener(this);
699		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
700		- 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");
701	1002	threeButton.addActionListener(this);
702		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
703		- sevenButton.setToolTipText("3-column layout");
704		- 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);
705	1009	//
706	1010
707		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
708		- 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");
709	1013	rootButton.addActionListener(this);
710	1014
711	1015	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -714,28 +1018,30 @@
714	1018	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
715	1019	//clearButton.addActionListener(this);
716	1020
	1021	+ cGridBag row1 = new cGridBag();
	1022	+
717	1023	// INSERT
718		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1024	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
719	1025	gridButton.setToolTipText("Create grid");
720	1026	gridButton.addActionListener(this);
721	1027
722		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1028	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
723	1029	boxButton.setToolTipText("Create box");
724	1030	boxButton.addActionListener(this);
725	1031
726		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1032	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
727	1033	sphereButton.setToolTipText("Create sphere");
728	1034	sphereButton.addActionListener(this);
729	1035
730		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1036	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
731	1037	coneButton.setToolTipText("Create cone");
732	1038	coneButton.addActionListener(this);
733	1039
734		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1040	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
735	1041	torusButton.setToolTipText("Create torus");
736	1042	torusButton.addActionListener(this);
737	1043
738		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1044	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
739	1045	superButton.setToolTipText("Create superellipsoid");
740	1046	superButton.addActionListener(this);
741	1047
..	..	@@ -746,51 +1052,57 @@
746	1052	kleinButton.addActionListener(this);
747	1053	}
748	1054
749		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1055	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
750	1056	particlesButton.setToolTipText("Create particle system");
751	1057	particlesButton.addActionListener(this);
752	1058
753		- oe.toolboxPanel.Return();
	1059	+ oe.toolboxPanel.add(row1);
754	1060
755		- 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);
756	1064	groupButton.setToolTipText("Create group");
757	1065	groupButton.addActionListener(this);
758	1066
759		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1067	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
760	1068	compositeButton.setToolTipText("Create composite");
761	1069	compositeButton.addActionListener(this);
762	1070
763		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1071	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
764	1072	switchButton.setToolTipText("Create item switcher");
765	1073	switchButton.addActionListener(this);
766	1074
767		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1075	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
768	1076	loopButton.setToolTipText("Create loop");
769	1077	loopButton.addActionListener(this);
770	1078
771		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1079	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
772	1080	textureButton.setToolTipText("Create texture");
773	1081	textureButton.addActionListener(this);
774	1082
775		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1083	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
776	1084	overlayButton.setToolTipText("Create overlay");
777	1085	overlayButton.addActionListener(this);
778	1086
779		- 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);
780	1088	lightButton.setToolTipText("Create light");
781	1089	lightButton.addActionListener(this);
782	1090
783		- for (int i=6; --i>=0;)
784		- {
785		- oe.toolboxPanel.Return();
786		- oe.toolboxPanel.add(new cGridBag());
787		- oe.toolboxPanel.add(new cGridBag());
788		- oe.toolboxPanel.add(new cGridBag());
789		- oe.toolboxPanel.add(new cGridBag());
790		- oe.toolboxPanel.add(new cGridBag());
791		- oe.toolboxPanel.add(new cGridBag());
792		- oe.toolboxPanel.add(new cGridBag());
793		- }
	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);
794	1106
795	1107	// EDIT panel
796	1108	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -850,8 +1162,8 @@
850	1162	versionSlider = (cNumberSlider)sliderPane.getComponent(1);
851	1163	sliderPane.preferredHeight = 1;
852	1164
853		-// mainPanel.setDividerLocation(0.5); //1.0);
854		-// mainPanel.setResizeWeight(0.5);
	1165	+// mainPanel.setDividerLocation(0.1); //1.0);
	1166	+ mainPanel.setResizeWeight(0.4);
855	1167
856	1168	//jList.addListSelectionListener(this);
857	1169	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -859,7 +1171,7 @@
859	1171	//jTree.setEditable(true);
860	1172	oe.jTree.setDragEnabled(true);
861	1173	//jTree.setPreferredSize(new Dimension(10,10));
862		- jSP.setPreferredSize(new Dimension(100,200));
	1174	+ //jSP.setPreferredSize(new Dimension(100,200));
863	1175
864	1176	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
865	1177
..	..	@@ -871,7 +1183,7 @@
871	1183	dgr.addDragGestureListener(this);
872	1184	}catch(Exception e) {}
873	1185	*/
874		- radio.layout = sevenButton;
	1186	+ radio.layout = threeButton; // sixButton;
875	1187	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
876	1188	}
877	1189
..	..	@@ -922,9 +1234,12 @@
922	1234	smoothCB.setToolTipText("Snapping delay");
923	1235	smoothCB.addItemListener(this);
924	1236
925		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
926		- slowCB.setToolTipText("Smooth interpolation");
927		- 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);
928	1243
929	1244	// constraints.gridy += 1;
930	1245	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -1013,7 +1328,7 @@
1013	1328	}
1014	1329
1015	1330	radioButton.SetObject(obj);
1016		- radioButton.layout = sevenButton;
	1331	+ radioButton.layout = threeButton; // sixButton;
1017	1332	radioButton.SetCamera(cameraView.renderCamera, false);
1018	1333	radioButton.addActionListener(this);
1019	1334	radioPanel.add(radioButton);
..	..	@@ -1038,6 +1353,8 @@
1038	1353	cCheckBox localCB;
1039	1354	cCheckBox crowdCB;
1040	1355	cCheckBox smoothCB;
	1356	+ cCheckBox minshaderCB;
	1357	+
1041	1358	cToggleButton fastCB;
1042	1359	cCheckBox slowCB;
1043	1360	cCheckBox boxCB;
..	..	@@ -1108,6 +1425,12 @@
1108	1425	{
1109	1426	cameraView.ToggleInertia();
1110	1427	cameraView.repaint();
	1428	+ }
	1429	+ else if(e.getSource() == minshaderCB)
	1430	+ {
	1431	+ Globals.MINSHADER ^= true;
	1432	+ cameraView.programInitialized = false;
	1433	+ cameraView.repaint();
1111	1434	}
1112	1435	else if(e.getSource() == localCB)
1113	1436	{
..	..	@@ -1693,6 +2016,16 @@
1693	2016	}
1694	2017	}
1695	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	+ }
1696	2029
1697	2030	/**
1698	2031	* applyExample
..	..	@@ -2121,6 +2454,23 @@
2121	2454	{
2122	2455	makeSomething(new Light());
2123	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
2124	2474	if (source == csgItem)
2125	2475	{
2126	2476	group(new CSG());
..	..	@@ -2206,7 +2556,7 @@
2206	2556	if (source == computeAOItem)
2207	2557	{
2208	2558	Globals.drawMode = CameraPane.OCCLUSION;
2209		- Globals.theRenderer.repaint();
	2559	+ cameraView.repaint();
2210	2560	} else
2211	2561	if (source == recompileItem)
2212	2562	{
..	..	@@ -2658,7 +3008,7 @@
2658	3008	{
2659	3009	StepAll();
2660	3010	} else
2661		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3011	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2662	3012	{
2663	3013	//int indices[] = jList.getSelectedIndices();
2664	3014	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -3140,7 +3490,7 @@
3140	3490	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3141	3491	{
3142	3492	obj = (Object3D)e.nextElement();
3143		- obj.SetBumpTexture(null);
	3493	+ obj.ResetBumpTexture();
3144	3494	}
3145	3495
3146	3496	refreshContents();
..	..	@@ -3154,6 +3504,31 @@
3154	3504	obj.SetBumpTexture(obj.GetPigmentTexture());
3155	3505	}
3156	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	+
3157	3532	refreshContents();
3158	3533	} else
3159	3534	if (source == flashSelectionButton)
..	..	@@ -3257,8 +3632,8 @@
3257	3632	// centralPanel.setVisible(true);
3258	3633	// XYZPanel.setVisible(true);
3259	3634	bigThree.ClearUI();
	3635	+ bigThree.add(scenePanel);
3260	3636	bigThree.add(centralPanel);
3261		- bigThree.add(XYZPanel);
3262	3637	bigThree.FlushUI();
3263	3638
3264	3639	cameraView.requestFocusInWindow();
..	..	@@ -3338,8 +3713,8 @@
3338	3713	// centralPanel.setVisible(true);
3339	3714	// XYZPanel.setVisible(false);
3340	3715	bigThree.ClearUI();
3341		- bigThree.add(scenePanel);
3342	3716	bigThree.add(centralPanel);
	3717	+ bigThree.add(scenePanel);
3343	3718	bigThree.FlushUI();
3344	3719
3345	3720	cameraView.requestFocusInWindow();
..	..	@@ -3553,10 +3928,10 @@
3553	3928	radio.layout.doClick();
3554	3929
3555	3930	ClearUnpinned();
3556		- Grafreed.Assert(group != null);
3557		- Grafreed.Assert(group.selection != null);
3558		- SetPinStates(group.selection.size() > 0);
3559		- 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)
3560	3935	EditSelection(false);
3561	3936	keepparent = group.parent;
3562	3937	// PARENT = NULL or not???
..	..	@@ -3569,11 +3944,13 @@
3569	3944	} else if (event.getSource() == editCameraItem)
3570	3945	{
3571	3946	cameraView.ProtectCamera();
	3947	+ cameraView.requestFocusInWindow();
3572	3948	cameraView.repaint();
3573	3949	return;
3574	3950	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3575	3951	{
3576	3952	cameraView.RevertCamera();
	3953	+ cameraView.requestFocusInWindow();
3577	3954	cameraView.repaint();
3578	3955	return;
3579	3956	// } else if (event.getSource() == textureButton)
..	..	@@ -4150,7 +4527,7 @@
4150	4527
4151	4528	try
4152	4529	{
4153		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4530	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4154	4531	}
4155	4532	catch (Exception e)
4156	4533	{
..	..	@@ -4627,6 +5004,12 @@
4627	5004
4628	5005	void EditSelection(boolean newWindow)
4629	5006	{
	5007	+ if (group.selection == null)
	5008	+ {
	5009	+ EditElement(group, newWindow); // ? new
	5010	+ return;
	5011	+ }
	5012	+
4630	5013	// aConstraints.gridy = 0;
4631	5014	for (int i=0; i<group.selection.size(); i++)
4632	5015	{
..	..	@@ -4637,12 +5020,7 @@
4637	5020	Object3D elem = (Object3D)group.selection.elementAt(i);
4638	5021	if(elem != group \|\| !newWindow)
4639	5022	{
4640		- // if (!(elem instanceof Composite))
4641		- // newWindow = false;
4642		- listUI.add(elem);
4643		- elem.openEditWindow(this, newWindow); //, false);
4644		- System.out.println("edit : " + elem);
4645		- elem.editWindow.refreshContents(true); // ? new
	5023	+ EditElement(elem, newWindow); // ? new
4646	5024	}
4647	5025	}
4648	5026	}
..	..	@@ -4786,7 +5164,7 @@
4786	5164
4787	5165	void refreshContents(boolean cp)
4788	5166	{
4789		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	5167	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4790	5168	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4791	5169	{
4792	5170	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -5632,6 +6010,22 @@
5632	6010	cButton loopButton;
5633	6011	cButton textureButton;
5634	6012
	6013	+ cButton skybox1Button;
	6014	+ cButton skybox2Button;
	6015	+ cButton skybox3Button;
	6016	+ cButton skybox4Button;
	6017	+ cButton skybox5Button;
	6018	+ cButton skybox6Button;
	6019	+ cButton skybox7Button;
	6020	+
	6021	+ cButton skybox11Button;
	6022	+ cButton skybox12Button;
	6023	+ cButton skybox13Button;
	6024	+ cButton skybox14Button;
	6025	+ cButton skybox15Button;
	6026	+ cButton skybox16Button;
	6027	+ cButton skybox17Button;
	6028	+
5635	6029	cButton gridButton;
5636	6030	cButton boxButton;
5637	6031	cButton sphereButton;
..	..	@@ -5695,7 +6089,7 @@
5695	6089	private MenuItem pasteLinkItem;
5696	6090	private MenuItem pasteCloneItem;
5697	6091	private MenuItem pasteExpandItem;
5698		- private MenuItem clearItem;
	6092	+ private MenuItem deleteItem;
5699	6093	private MenuItem clearAllItem;
5700	6094	private MenuItem genUVItem;
5701	6095	private MenuItem genNormalsMESHItem;
..	..	@@ -5779,6 +6173,8 @@
5779	6173	private MenuItem attachBumpItem;
5780	6174	private MenuItem detachBumpItem;
5781	6175	private MenuItem pigmentBumpItem;
	6176	+ private MenuItem embedTexturesItem;
	6177	+ private MenuItem deEmbedTexturesItem;
5782	6178
5783	6179	private MenuItem particleItem;
5784	6180	private MenuItem ragdollItem;