~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -187,6 +187,18 @@
187	187	}
188	188
189	189	private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	190	+
	191	+ public void LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	192	+ {
	193	+ try
	194	+ {
	195	+ cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	196	+ } catch (IOException e)
	197	+ {
	198	+ System.out.println("NAME = " + name);
	199	+ e.printStackTrace(); // throw new RuntimeException(e);
	200	+ }
	201	+ }
190	202
191	203	void SetAsGLRenderer(boolean b)
192	204	{
..	..	@@ -1485,6 +1497,8 @@
1485	1497	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1486	1498	}
1487	1499
	1500	+ float[] colorV = new float[4];
	1501	+
1488	1502	void SetColor(Object3D obj, Vertex p0)
1489	1503	{
1490	1504	CameraPane display = this;
..	..	@@ -1552,8 +1566,6 @@
1552	1566	{
1553	1567	return;
1554	1568	}
1555		-
1556		- float[] colorV = new float[3];
1557	1569
1558	1570	if (false) // marked)
1559	1571	{
..	..	@@ -8932,7 +8944,7 @@
8932	8944
8933	8945	if (cubemap == null)
8934	8946	{
8935		- LoadEnvy(5);
	8947	+ //LoadEnvy(1);
8936	8948	}
8937	8949
8938	8950	//cubemap.enable();
..	..	@@ -9219,37 +9231,58 @@
9219	9231	cubemap = null;
9220	9232	return;
9221	9233	case 1:
9222		- name = "cubemaps/box_";
9223		- ext = "png";
	9234	+ name = "cubemaps/rgb/";
	9235	+ ext = "jpg";
9224	9236	reverseUP = false;
9225	9237	break;
9226	9238	case 2:
9227		- name = "cubemaps/uffizi_";
9228		- ext = "png";
9229		- break; // reverseUP = true; break;
	9239	+ name = "cubemaps/uffizi/";
	9240	+ ext = "jpg";
	9241	+ reverseUP = false;
	9242	+ break;
9230	9243	case 3:
9231		- name = "cubemaps/CloudyHills_";
9232		- ext = "tga";
	9244	+ name = "cubemaps/CloudyHills/";
	9245	+ ext = "jpg";
9233	9246	reverseUP = false;
9234	9247	break;
9235	9248	case 4:
9236		- name = "cubemaps/cornell_";
	9249	+ name = "cubemaps/cornell/";
9237	9250	ext = "png";
9238	9251	reverseUP = false;
9239	9252	break;
	9253	+ case 5:
	9254	+ name = "cubemaps/skycube/";
	9255	+ ext = "jpg";
	9256	+ reverseUP = false;
	9257	+ break;
	9258	+ case 6:
	9259	+ name = "cubemaps/SaintLazarusChurch3/";
	9260	+ ext = "jpg";
	9261	+ reverseUP = false;
	9262	+ break;
	9263	+ case 7:
	9264	+ name = "cubemaps/Sodermalmsallen/";
	9265	+ ext = "jpg";
	9266	+ reverseUP = false;
	9267	+ break;
	9268	+ case 8:
	9269	+ name = "cubemaps/Sodermalmsallen2/";
	9270	+ ext = "jpg";
	9271	+ reverseUP = false;
	9272	+ break;
	9273	+ case 9:
	9274	+ name = "cubemaps/UnionSquare/";
	9275	+ ext = "jpg";
	9276	+ reverseUP = false;
	9277	+ break;
9240	9278	default:
9241		- name = "cubemaps/rgb_";
9242		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9279	+ name = "cubemaps/box/";
	9280	+ ext = "png"; /mipmap = true;/
	9281	+ reverseUP = false;
9243	9282	break;
9244	9283	}
9245		-
9246		- try
9247		- {
9248		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9249		- } catch (IOException e)
9250		- {
9251		- throw new RuntimeException(e);
9252		- }
	9284	+
	9285	+ LoadSkybox(name, ext, mipmap);
9253	9286	}
9254	9287
9255	9288	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -9281,8 +9314,12 @@
9281	9314	static double[] model = new double[16];
9282	9315	double[] camera2light = new double[16];
9283	9316	double[] light2camera = new double[16];
9284		- int newenvy = -1;
9285		- boolean envyoff = true; // false;
	9317	+
	9318	+ //int newenvy = -1;
	9319	+ //boolean envyoff = false;
	9320	+
	9321	+ String loadedskyboxname;
	9322	+
9286	9323	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9287	9324	//float[] light0 = { 0,0,0 };
9288	9325	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9762,10 +9799,12 @@
9762	9799	rati = 1 / rati;
9763	9800	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9764	9801	}
9765		- assert (newenvy == -1);
	9802	+
	9803	+ //assert (newenvy == -1);
	9804	+
9766	9805	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9767	9806	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9768		- DrawSkyBox(gl);
	9807	+ DrawSkyBox(gl, (float)rati);
9769	9808	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9770	9809	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9771	9810	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -11018,13 +11057,27 @@
11018	11057	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
11019	11058	}
11020	11059
11021		- if (newenvy > -1)
	11060	+// if (newenvy > -1)
	11061	+// {
	11062	+// LoadEnvy(newenvy);
	11063	+// }
	11064	+//
	11065	+// newenvy = -1;
	11066	+
	11067	+ if (object.skyboxname != null)
11022	11068	{
11023		- LoadEnvy(newenvy);
	11069	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11070	+ {
	11071	+ LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11072	+ loadedskyboxname = object.skyboxname;
	11073	+ }
11024	11074	}
11025		-
11026		- newenvy = -1;
11027		-
	11075	+ else
	11076	+ {
	11077	+ cubemap = null;
	11078	+ loadedskyboxname = null;
	11079	+ }
	11080	+
11028	11081	ratio = ((double) getWidth()) / getHeight();
11029	11082	//System.out.println("ratio = " + ratio);
11030	11083
..	..	@@ -11040,7 +11093,7 @@
11040	11093
11041	11094	if (!IsFrozen() && !ambientOcclusion)
11042	11095	{
11043		- DrawSkyBox(gl);
	11096	+ DrawSkyBox(gl, (float)ratio);
11044	11097	}
11045	11098
11046	11099	//if (selection_view == -1)
..	..	@@ -12400,7 +12453,7 @@
12400	12453
12401	12454	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12402	12455
12403		- String program =
	12456	+ String programmin =
12404	12457	// Min shader
12405	12458	"!!ARBfp1.0\n" +
12406	12459	"PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
..	..	@@ -12451,7 +12504,8 @@
12451	12504	//"SUB ndotl.y, zero123.y, ndotl.y;" +
12452	12505	//"MUL ndotl.y, ndotl.y, pow2.z;" +
12453	12506
12454		- "MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12507	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12508	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
12455	12509
12456	12510	// Pigment
12457	12511	"TEX temp, fragment.texcoord[0], texture[0], 2D;" +
..	..	@@ -12466,7 +12520,7 @@
12466	12520	"MOV result.color, temp;" +
12467	12521	"END";
12468	12522
12469		- String program2 =
	12523	+ String programmax =
12470	12524	"!!ARBfp1.0\n" +
12471	12525
12472	12526	//"OPTION ARB_fragment_program_shadow;" +
..	..	@@ -12991,7 +13045,7 @@
12991	13045	// display shadow only (fakedepth == 0)
12992	13046	"SUB temp.x, half.x, shadow.x;" +
12993	13047	"MOV temp.y, -params5.z;" + // params6.x;" +
12994		- "SLT temp.z, temp.y, -one2048th.x;" +
	13048	+ "SLT temp.z, temp.y, -c256i.x;" +
12995	13049	"SUB temp.y, one.x, temp.z;" +
12996	13050	"MUL temp.x, temp.x, temp.y;" +
12997	13051	"KIL temp.x;" +
..	..	@@ -13322,6 +13376,13 @@
13322	13376	//once = true;
13323	13377	}
13324	13378
	13379	+ String program = programmax;
	13380	+
	13381	+ if (Globals.MINSHADER)
	13382	+ {
	13383	+ program = programmin;
	13384	+ }
	13385	+
13325	13386	System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13326	13387	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13327	13388	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
..	..	@@ -15315,20 +15376,24 @@
15315	15376	OCCLUSION_CULLING ^= true;
15316	15377	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
15317	15378	break;
15318		- case '0': envyoff ^= true; repaint(); break;
	15379	+ //case '0': envyoff ^= true; repaint(); break;
15319	15380	case '1':
15320	15381	case '2':
15321	15382	case '3':
15322	15383	case '4':
15323	15384	case '5':
15324		- newenvy = Character.getNumericValue(key);
15325		- repaint();
15326		- break;
15327	15385	case '6':
15328	15386	case '7':
15329	15387	case '8':
15330	15388	case '9':
15331		- BGcolor = (key - '6')/3.f;
	15389	+ if (true) // envyoff)
	15390	+ {
	15391	+ BGcolor = (key - '1')/8.f;
	15392	+ }
	15393	+ else
	15394	+ {
	15395	+ //newenvy = Character.getNumericValue(key);
	15396	+ }
15332	15397	repaint();
15333	15398	break;
15334	15399	case '!':
..	..	@@ -16033,7 +16098,7 @@
16033	16098	gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
16034	16099	break;
16035	16100	case Object3D.hitScale: gr.setColor(Color.cyan);
16036		- gr.drawLine(X, Y, 0, 0);
	16101	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
16037	16102	break;
16038	16103	}
16039	16104
..	..	@@ -16519,6 +16584,8 @@
16519	16584	private /static/ boolean firstime;
16520	16585	private /static/ cVector newView = new cVector();
16521	16586	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16587	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16588	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
16522	16589	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16523	16590	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16524	16591	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16531,29 +16598,66 @@
16531	16598	{
16532	16599	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16533	16600
	16601	+ int usedsuf = 0;
	16602	+
16534	16603	for (int i = 0; i < suffixes.length; i++)
16535	16604	{
16536		- String resourceName = basename + suffixes[i] + "." + suffix;
16537		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16538		- mipmapped,
16539		- FileUtil.getFileSuffix(resourceName));
16540		- if (data == null)
	16605	+ String[] suffixe = suffixes;
	16606	+ String[] fallback = suffixes2;
	16607	+ String[] fallfallback = suffixes3;
	16608	+
	16609	+ for (int c=usedsuf; --c>=0;)
16541	16610	{
16542		- throw new IOException("Unable to load texture " + resourceName);
	16611	+// String[] temp = suffixe;
	16612	+// suffixe = fallback;
	16613	+// fallback = fallfallback;
	16614	+// fallfallback = temp;
16543	16615	}
	16616	+
	16617	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16618	+ TextureData data;
	16619	+
	16620	+ try
	16621	+ {
	16622	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16623	+ mipmapped,
	16624	+ FileUtil.getFileSuffix(resourceName));
	16625	+ }
	16626	+ catch (Exception e)
	16627	+ {
	16628	+ try
	16629	+ {
	16630	+ resourceName = basename + fallback[i] + "." + suffix;
	16631	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16632	+ mipmapped,
	16633	+ FileUtil.getFileSuffix(resourceName));
	16634	+ }
	16635	+ catch (Exception e2)
	16636	+ {
	16637	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16638	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16639	+ mipmapped,
	16640	+ FileUtil.getFileSuffix(resourceName));
	16641	+ }
	16642	+ }
	16643	+
16544	16644	//System.out.println("Target = " + targets[i]);
16545	16645	cubemap.updateImage(data, targets[i]);
16546	16646	}
16547	16647
16548	16648	return cubemap;
16549	16649	}
	16650	+
16550	16651	int bigsphere = -1;
16551	16652
16552	16653	float BGcolor = 0.5f;
16553	16654
16554		- private void DrawSkyBox(GL gl)
	16655	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16656	+
	16657	+ private void DrawSkyBox(GL gl, float ratio)
16555	16658	{
16556		- if (envyoff \|\| cubemap == null)
	16659	+ if (//envyoff \|\|
	16660	+ cubemap == null)
16557	16661	{
16558	16662	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16559	16663	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -16568,7 +16672,17 @@
16568	16672	// Compensates for ExaminerViewer's modification of modelview matrix
16569	16673	gl.glMatrixMode(GL.GL_MODELVIEW);
16570	16674	gl.glLoadIdentity();
	16675	+ gl.glScalef(1,ratio,1);
16571	16676
	16677	+// colorV[0] = 2;
	16678	+// colorV[1] = 2;
	16679	+// colorV[2] = 2;
	16680	+// colorV[3] = 1;
	16681	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16682	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16683	+//
	16684	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16685	+
16572	16686	//gl.glActiveTexture(GL.GL_TEXTURE1);
16573	16687	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16574	16688
..	..	@@ -16600,6 +16714,7 @@
16600	16714	{
16601	16715	gl.glScalef(1.0f, -1.0f, 1.0f);
16602	16716	}
	16717	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16603	16718	gl.glMultMatrixd(viewrot_1, 0);
16604	16719	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16605	16720	//viewer.updateInverseRotation(gl);
..	..	@@ -16858,7 +16973,7 @@
16858	16973	//new Exception().printStackTrace();
16859	16974	System.out.println("select buffer init");
16860	16975	// Use debug pipeline
16861		- drawable.setGL(new DebugGL(drawable.getGL()));
	16976	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16862	16977
16863	16978	GL gl = drawable.getGL();
16864	16979