~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -23,6 +23,31 @@
23	23	DragGestureListener, DragSourceListener, DropTargetListener,
24	24	ItemListener // ListSelectionListener
25	25	{
	26	+
	27	+ public void AddSkyboxButton(String f, String s, cGridBag row3)
	28	+ {
	29	+ cButton skyboxButton;
	30	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	31	+ row3.add(skyboxButton = GetButton(path + "/" + s + ".jpg", !Grafreed.NIMBUSLAF));
	32	+ skyboxButton.setToolTipText(s);
	33	+ skyboxButton.addActionListener(new ActionListener()
	34	+ {
	35	+ @Override
	36	+ public void actionPerformed(ActionEvent e)
	37	+ {
	38	+ ChangeSkybox(path);
	39	+ }
	40	+ });
	41	+ }
	42	+
	43	+ public void ChangeSkybox(String name)
	44	+ {
	45	+ cameraView.envyoff = false;
	46	+ cameraView.skyboxname = name;
	47	+ cameraView.skyboxext = "jpg";
	48	+ cameraView.repaint();
	49	+ }
	50	+
26	51	//ObjEditor objEditor;
27	52	public void closeUI2()
28	53	{
..	..	@@ -528,10 +553,15 @@
528	553	attachBumpItem.addActionListener(this);
529	554	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
530	555	pigmentBumpItem.addActionListener(this);
	556	+ //embedTexturesItem
531	557	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
532	558	detachPigmentItem.addActionListener(this);
533	559	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
534	560	detachBumpItem.addActionListener(this);
	561	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	562	+ embedTexturesItem.addActionListener(this);
	563	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	564	+ deEmbedTexturesItem.addActionListener(this);
535	565	menu.add("-");
536	566	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
537	567	sortbysizeItem.addActionListener(this);
..	..	@@ -603,7 +633,7 @@
603	633	*/
604	634	cGridBag copyOptionsPanel = new cGridBag();
605	635
606		- copyOptionsPanel.preferredHeight = 1;
	636	+ copyOptionsPanel.preferredHeight = 2;
607	637
608	638	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
609	639
..	..	@@ -683,25 +713,25 @@
683	713	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
684	714	snapobjectButton.addActionListener(this);
685	715	snapobjectButton.setToolTipText("Snap Object");
	716	+
	717	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	718	+ fourButton.addActionListener(this);
	719	+ fourButton.setToolTipText("Show control panel only");
686	720	}
687	721
688	722	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
689	723
690		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
691		- fourButton.addActionListener(this);
692		- fourButton.setToolTipText("Show left panel only");
693		-
694		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
695		- twoButton.setToolTipText("Show right view only");
	724	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	725	+ twoButton.setToolTipText("Show 3D view only");
696	726	twoButton.addActionListener(this);
697	727	this.fullscreenLayout = twoButton;
698	728
699		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
700		- sixButton.setToolTipText("Show left and right");
	729	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	730	+ threeButton.setToolTipText("Show controls and 3D view");
	731	+ threeButton.addActionListener(this);
	732	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	733	+ sixButton.setToolTipText("Show 3D view and controls");
701	734	sixButton.addActionListener(this);
702		-// oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
703		-// threeButton.setToolTipText("2-column layout right");
704		-// threeButton.addActionListener(this);
705	735	// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
706	736	// sevenButton.setToolTipText("3-column layout");
707	737	// sevenButton.addActionListener(this);
..	..	@@ -717,28 +747,30 @@
717	747	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
718	748	//clearButton.addActionListener(this);
719	749
	750	+ cGridBag row1 = new cGridBag();
	751	+
720	752	// INSERT
721		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	753	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
722	754	gridButton.setToolTipText("Create grid");
723	755	gridButton.addActionListener(this);
724	756
725		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	757	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
726	758	boxButton.setToolTipText("Create box");
727	759	boxButton.addActionListener(this);
728	760
729		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	761	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
730	762	sphereButton.setToolTipText("Create sphere");
731	763	sphereButton.addActionListener(this);
732	764
733		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	765	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
734	766	coneButton.setToolTipText("Create cone");
735	767	coneButton.addActionListener(this);
736	768
737		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	769	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
738	770	torusButton.setToolTipText("Create torus");
739	771	torusButton.addActionListener(this);
740	772
741		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	773	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
742	774	superButton.setToolTipText("Create superellipsoid");
743	775	superButton.addActionListener(this);
744	776
..	..	@@ -749,50 +781,144 @@
749	781	kleinButton.addActionListener(this);
750	782	}
751	783
752		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	784	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
753	785	particlesButton.setToolTipText("Create particle system");
754	786	particlesButton.addActionListener(this);
755	787
756		- oe.toolboxPanel.Return();
	788	+ oe.toolboxPanel.add(row1);
757	789
758		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	790	+ cGridBag row2 = new cGridBag();
	791	+
	792	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
759	793	groupButton.setToolTipText("Create group");
760	794	groupButton.addActionListener(this);
761	795
762		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	796	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
763	797	compositeButton.setToolTipText("Create composite");
764	798	compositeButton.addActionListener(this);
765	799
766		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	800	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
767	801	switchButton.setToolTipText("Create item switcher");
768	802	switchButton.addActionListener(this);
769	803
770		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	804	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
771	805	loopButton.setToolTipText("Create loop");
772	806	loopButton.addActionListener(this);
773	807
774		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	808	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
775	809	textureButton.setToolTipText("Create texture");
776	810	textureButton.addActionListener(this);
777	811
778		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	812	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
779	813	overlayButton.setToolTipText("Create overlay");
780	814	overlayButton.addActionListener(this);
781	815
782		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	816	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
783	817	lightButton.setToolTipText("Create light");
784	818	lightButton.addActionListener(this);
785	819
786		- for (int i=6; --i>=0;)
	820	+ oe.toolboxPanel.add(row2);
	821	+
	822	+ // ENVYMAPS
	823	+ cGridBag row3 = new cGridBag();
	824	+ row3.preferredHeight = 20;
	825	+
	826	+ AddSkyboxButton("default", "rgb", row3);
	827	+ AddSkyboxButton("default", "cornell", row3);
	828	+ AddSkyboxButton("default", "uffizi", row3);
	829	+ AddSkyboxButton("default", "CloudyHills", row3);
	830	+ AddSkyboxButton("default", "skycube", row3);
	831	+
	832	+ oe.toolboxPanel.add(row3);
	833	+
	834	+ cGridBag row4 = new cGridBag();
	835	+ row4.preferredHeight = 20;
	836	+
	837	+ AddSkyboxButton("bridge", "Bridge2", row4);
	838	+ AddSkyboxButton("urban", "GamlaStan2", row4);
	839	+ AddSkyboxButton("urban", "Parliament", row4);
	840	+ AddSkyboxButton("urban", "Roundabout", row4);
	841	+
	842	+ oe.toolboxPanel.add(row4);
	843	+
	844	+ cGridBag row5 = new cGridBag();
	845	+ row5.preferredHeight = 20;
	846	+
	847	+ AddSkyboxButton("urban", "SaintLazarusChurch", row5);
	848	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row5);
	849	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row5);
	850	+ AddSkyboxButton("urban", "UnionSquare", row5);
	851	+
	852	+ oe.toolboxPanel.add(row5);
	853	+
	854	+ cGridBag row6 = new cGridBag();
	855	+ row6.preferredHeight = 20;
	856	+
	857	+ AddSkyboxButton("park", "BerzeliiPark", row6);
	858	+ AddSkyboxButton("park", "Buddha", row6);
	859	+ AddSkyboxButton("park", "CNTower2", row6);
	860	+ //AddSkyboxButton("park", "Fatbursparken", row6);
	861	+ AddSkyboxButton("park", "NiagaraFalls1", row6);
	862	+
	863	+ oe.toolboxPanel.add(row6);
	864	+
	865	+ cGridBag row7 = new cGridBag();
	866	+ row7.preferredHeight = 20;
	867	+
	868	+ AddSkyboxButton("park", "NiagaraFalls3", row7);
	869	+ AddSkyboxButton("park", "Park", row7);
	870	+ //AddSkyboxButton("park", "Park2", row6);
	871	+ //AddSkyboxButton("park", "Path", row6);
	872	+ AddSkyboxButton("park", "Pond", row7);
	873	+ AddSkyboxButton("park", "Skansen", row7);
	874	+
	875	+ oe.toolboxPanel.add(row7);
	876	+
	877	+ cGridBag row8 = new cGridBag();
	878	+ row8.preferredHeight = 20;
	879	+
	880	+ AddSkyboxButton("park", "Skansen2", row8);
	881	+ AddSkyboxButton("park", "Skansen3", row8);
	882	+ AddSkyboxButton("park", "Skansen4", row8);
	883	+ AddSkyboxButton("park", "Skansen5", row8);
	884	+
	885	+ oe.toolboxPanel.add(row8);
	886	+
	887	+ cGridBag row9 = new cGridBag();
	888	+ row9.preferredHeight = 20;
	889	+
	890	+ AddSkyboxButton("park", "Stairs", row9);
	891	+ //AddSkyboxButton("park", "Tantolunden", row6);
	892	+ //AddSkyboxButton("park", "Tantolunden3", row6);
	893	+ AddSkyboxButton("park", "Tantolunden4", row9);
	894	+
	895	+ oe.toolboxPanel.add(row9);
	896	+/*
	897	+BerzeliiPark
	898	+Buddha
	899	+CNTower2
	900	+Fatbursparken
	901	+NiagaraFalls1
	902	+NiagaraFalls3
	903	+Park
	904	+Park2
	905	+Path
	906	+Pond
	907	+Skansen
	908	+Skansen2
	909	+Skansen3
	910	+Skansen4
	911	+Skansen5
	912	+Stairs
	913	+Tantolunden
	914	+Tantolunden3
	915	+Tantolunden4
	916	+ */
	917	+
	918	+ for (int i=1; --i>=0;)
787	919	{
788		- oe.toolboxPanel.Return();
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		- oe.toolboxPanel.add(new cGridBag());
794		- oe.toolboxPanel.add(new cGridBag());
795		- oe.toolboxPanel.add(new cGridBag());
	920	+ //oe.toolboxPanel.Return();
	921	+ oe.toolboxPanel.add(new cGridBag());
796	922	}
797	923
798	924	// EDIT panel
..	..	@@ -853,8 +979,8 @@
853	979	versionSlider = (cNumberSlider)sliderPane.getComponent(1);
854	980	sliderPane.preferredHeight = 1;
855	981
856		-// mainPanel.setDividerLocation(0.5); //1.0);
857		-// mainPanel.setResizeWeight(0.5);
	982	+// mainPanel.setDividerLocation(0.1); //1.0);
	983	+ mainPanel.setResizeWeight(0.4);
858	984
859	985	//jList.addListSelectionListener(this);
860	986	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -862,7 +988,7 @@
862	988	//jTree.setEditable(true);
863	989	oe.jTree.setDragEnabled(true);
864	990	//jTree.setPreferredSize(new Dimension(10,10));
865		- jSP.setPreferredSize(new Dimension(100,200));
	991	+ //jSP.setPreferredSize(new Dimension(100,200));
866	992
867	993	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
868	994
..	..	@@ -2134,6 +2260,23 @@
2134	2260	{
2135	2261	makeSomething(new Light());
2136	2262	} else
	2263	+// if (source == skybox1Button \|\|
	2264	+// source == skybox2Button \|\|
	2265	+// source == skybox3Button \|\|
	2266	+// source == skybox4Button \|\|
	2267	+// source == skybox5Button \|\|
	2268	+// source == skybox6Button \|\|
	2269	+// source == skybox7Button \|\|
	2270	+// source == skybox11Button \|\|
	2271	+// source == skybox12Button \|\|
	2272	+// source == skybox13Button \|\|
	2273	+// source == skybox14Button \|\|
	2274	+// source == skybox15Button \|\|
	2275	+// source == skybox16Button \|\|
	2276	+// source == skybox17Button)
	2277	+// {
	2278	+// ChangeSkybox(source);
	2279	+// } else
2137	2280	if (source == csgItem)
2138	2281	{
2139	2282	group(new CSG());
..	..	@@ -2219,7 +2362,7 @@
2219	2362	if (source == computeAOItem)
2220	2363	{
2221	2364	Globals.drawMode = CameraPane.OCCLUSION;
2222		- Globals.theRenderer.repaint();
	2365	+ cameraView.repaint();
2223	2366	} else
2224	2367	if (source == recompileItem)
2225	2368	{
..	..	@@ -3169,6 +3312,31 @@
3169	3312
3170	3313	refreshContents();
3171	3314	} else
	3315	+ if (source == embedTexturesItem)
	3316	+ {
	3317	+ Object3D obj;
	3318	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3319	+ {
	3320	+ obj = (Object3D)e.nextElement();
	3321	+ obj.EmbedTextures(true);
	3322	+ }
	3323	+
	3324	+ refreshContents();
	3325	+ } else
	3326	+ if (source == deEmbedTexturesItem)
	3327	+ {
	3328	+ Object3D obj;
	3329	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3330	+ {
	3331	+ obj = (Object3D)e.nextElement();
	3332	+ obj.EmbedTextures(false);
	3333	+ }
	3334	+
	3335	+ CameraPane.texturepigment.clear();
	3336	+ CameraPane.texturebump.clear();
	3337	+
	3338	+ refreshContents();
	3339	+ } else
3172	3340	if (source == flashSelectionButton)
3173	3341	{
3174	3342	CameraPane.flash = true;
..	..	@@ -3270,8 +3438,8 @@
3270	3438	// centralPanel.setVisible(true);
3271	3439	// XYZPanel.setVisible(true);
3272	3440	bigThree.ClearUI();
	3441	+ bigThree.add(scenePanel);
3273	3442	bigThree.add(centralPanel);
3274		- bigThree.add(XYZPanel);
3275	3443	bigThree.FlushUI();
3276	3444
3277	3445	cameraView.requestFocusInWindow();
..	..	@@ -3351,8 +3519,8 @@
3351	3519	// centralPanel.setVisible(true);
3352	3520	// XYZPanel.setVisible(false);
3353	3521	bigThree.ClearUI();
3354		- bigThree.add(scenePanel);
3355	3522	bigThree.add(centralPanel);
	3523	+ bigThree.add(scenePanel);
3356	3524	bigThree.FlushUI();
3357	3525
3358	3526	cameraView.requestFocusInWindow();
..	..	@@ -4163,7 +4331,7 @@
4163	4331
4164	4332	try
4165	4333	{
4166		- texturedata = Globals.theRenderer.GetTextureData(tex.pigmenttexture, pigment, false, node.texres);
	4334	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4167	4335	}
4168	4336	catch (Exception e)
4169	4337	{
..	..	@@ -5646,6 +5814,22 @@
5646	5814	cButton loopButton;
5647	5815	cButton textureButton;
5648	5816
	5817	+ cButton skybox1Button;
	5818	+ cButton skybox2Button;
	5819	+ cButton skybox3Button;
	5820	+ cButton skybox4Button;
	5821	+ cButton skybox5Button;
	5822	+ cButton skybox6Button;
	5823	+ cButton skybox7Button;
	5824	+
	5825	+ cButton skybox11Button;
	5826	+ cButton skybox12Button;
	5827	+ cButton skybox13Button;
	5828	+ cButton skybox14Button;
	5829	+ cButton skybox15Button;
	5830	+ cButton skybox16Button;
	5831	+ cButton skybox17Button;
	5832	+
5649	5833	cButton gridButton;
5650	5834	cButton boxButton;
5651	5835	cButton sphereButton;
..	..	@@ -5793,6 +5977,8 @@
5793	5977	private MenuItem attachBumpItem;
5794	5978	private MenuItem detachBumpItem;
5795	5979	private MenuItem pigmentBumpItem;
	5980	+ private MenuItem embedTexturesItem;
	5981	+ private MenuItem deEmbedTexturesItem;
5796	5982
5797	5983	private MenuItem particleItem;
5798	5984	private MenuItem ragdollItem;