~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -110,7 +110,11 @@
110	110	//private Mat4f spotlightTransform = new Mat4f();
111	111	//private Mat4f spotlightInverseTransform = new Mat4f();
112	112	static GLContext glcontext = null;
113		- /static/ com.sun.opengl.util.texture.Texture cubemap;
	113	+ /static/ com.sun.opengl.util.texture.Texture cubemap; // Either custom or rgb
	114	+ /static/ com.sun.opengl.util.texture.Texture cubemapcustom;
	115	+ /static/ com.sun.opengl.util.texture.Texture cubemaprgb;
	116	+ boolean transformMode;
	117	+
114	118	boolean reverseUP = false;
115	119	static boolean frozen = false;
116	120	boolean enablebackspace = false; // patch for back buffer refresh
..	..	@@ -164,7 +168,7 @@
164	168
165	169
166	170	// OPTIONS
167		- boolean Skinshader = true;
	171	+ boolean Skinshader = false; // true;
168	172	boolean cameraLight = false;
169	173	boolean UVdebug = false;
170	174	boolean Udebug = false;
..	..	@@ -173,7 +177,7 @@
173	177	static boolean doublesided = false; // true; // reversed normals are awful for conformance
174	178	boolean anisotropy = true;
175	179	boolean softshadow = true; // slower but better false;
176		- boolean opacityhalo = false;
	180	+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
177	181
178	182	boolean macromode = false;
179	183
..	..	@@ -188,15 +192,16 @@
188	192
189	193	private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
190	194
191		- public void LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	195	+ public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
192	196	{
193	197	try
194	198	{
195		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	199	+ return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
196	200	} catch (IOException e)
197	201	{
198	202	System.out.println("NAME = " + name);
199	203	e.printStackTrace(); // throw new RuntimeException(e);
	204	+ return null;
200	205	}
201	206	}
202	207
..	..	@@ -537,7 +542,8 @@
537	542	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
538	543	LA.vecCross(obj.v0, obj.v1, obj.v2);
539	544	LA.vecNormalize(obj.v2);
540		- gl.glNormal3f((float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
	545	+
	546	+ SetGLNormal(gl, (float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
541	547	}
542	548
543	549	// P
..	..	@@ -559,7 +565,7 @@
559	565	y += ny * obj.NORMALPUSH;
560	566	z += nz * obj.NORMALPUSH;
561	567
562		- gl.glNormal3f(nx, ny, nz);
	568	+ SetGLNormal(gl, nx, ny, nz);
563	569	}
564	570	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
565	571	SetColor(obj, pv);
..	..	@@ -591,7 +597,7 @@
591	597	y += ny * obj.NORMALPUSH;
592	598	z += nz * obj.NORMALPUSH;
593	599
594		- gl.glNormal3f(nx, ny, nz);
	600	+ SetGLNormal(gl, nx, ny, nz);
595	601	}
596	602	//System.out.println("vertexq = " + qv.s + ", " + qv.t);
597	603	// boolean locked = false;
..	..	@@ -639,7 +645,7 @@
639	645	y += ny * obj.NORMALPUSH;
640	646	z += nz * obj.NORMALPUSH;
641	647
642		- gl.glNormal3f(nx, ny, nz);
	648	+ SetGLNormal(gl, nx, ny, nz);
643	649	}
644	650
645	651	// if ((dot&4) == 0)
..	..	@@ -1245,10 +1251,10 @@
1245	1251	{
1246	1252	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1247	1253	{
1248		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1254	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1249	1255	} else
1250	1256	{
1251		- gl.glNormal3f(0, 0, 1);
	1257	+ SetGLNormal(gl, 0, 0, 1);
1252	1258	}
1253	1259
1254	1260	if (c != null)
..	..	@@ -1272,10 +1278,10 @@
1272	1278	{
1273	1279	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1274	1280	{
1275		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1281	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1276	1282	} else
1277	1283	{
1278		- gl.glNormal3f(0, 0, 1);
	1284	+ SetGLNormal(gl, 0, 0, 1);
1279	1285	}
1280	1286	if (c != null)
1281	1287	{
..	..	@@ -1300,10 +1306,10 @@
1300	1306	{
1301	1307	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1302	1308	{
1303		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1309	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1304	1310	} else
1305	1311	{
1306		- gl.glNormal3f(0, 0, 1);
	1312	+ SetGLNormal(gl, 0, 0, 1);
1307	1313	}
1308	1314	if (c != null)
1309	1315	{
..	..	@@ -1485,7 +1491,7 @@
1485	1491	{
1486	1492	if (!selectmode)
1487	1493	{
1488		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1494	+ SetGLNormal(gl, (float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
1489	1495	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
1490	1496
1491	1497	if (flipV)
..	..	@@ -1814,7 +1820,7 @@
1814	1820
1815	1821	display.modelParams7[0] = 0;
1816	1822	display.modelParams7[1] = 1000;
1817		- display.modelParams7[2] = 0;
	1823	+ display.modelParams7[2] = material.parallax;
1818	1824	display.modelParams7[3] = 0;
1819	1825
1820	1826	//display.modelParams6[0] = 100; // criss de bug de bump
..	..	@@ -2047,9 +2053,9 @@
2047	2053	switch(viewcode)
2048	2054	{
2049	2055	case 0: return "main";
2050		- case 1: return "one";
2051		- case 2: return "two";
2052		- case 3: return "three";
	2056	+ case 1: return "Red";
	2057	+ case 2: return "Green";
	2058	+ case 3: return "Blue";
2053	2059	case 4: return "light";
2054	2060	}
2055	2061
..	..	@@ -2470,6 +2476,18 @@
2470	2476	return CreateBim(bytes, width, height);
2471	2477	}
2472	2478
	2479	+ private void SetGLNormal(javax.media.opengl.GL gl, float nx, float ny, float nz)
	2480	+ {
	2481	+ gl.glNormal3f(nx, ny, nz);
	2482	+
	2483	+ if (ny > 0.9 \|\| ny < -0.9)
	2484	+ // Ground or ceiling
	2485	+ gl.glVertexAttrib3f(4, 1, 0, 0);
	2486	+ else
	2487	+ // Walls
	2488	+ gl.glVertexAttrib3f(4, 0, 1, 0);
	2489	+ }
	2490	+
2473	2491	/**/
2474	2492	class CacheTexture
2475	2493	{
..	..	@@ -2512,7 +2530,7 @@
2512	2530	com.sun.opengl.util.texture.TextureIO.newTextureData(
2513	2531	getClass().getClassLoader().getResourceAsStream(name),
2514	2532	true,
2515		- com.sun.opengl.util.texture.TextureIO.PNG);
	2533	+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
2516	2534	} catch (java.io.IOException e)
2517	2535	{
2518	2536	throw new javax.media.opengl.GLException(e);
..	..	@@ -8358,7 +8376,7 @@
8358	8376	// else
8359	8377	// if (!texname.startsWith("/"))
8360	8378	// texname = "/Users/nbriere/Textures/" + texname;
8361		- if (!FileExists(texname))
	8379	+ if (!FileExists(texname) && !texname.startsWith("@"))
8362	8380	{
8363	8381	texname = fallbackTextureName;
8364	8382	}
..	..	@@ -8441,6 +8459,15 @@
8441	8459	new Exception().printStackTrace();
8442	8460	} else
8443	8461	{
	8462	+ if (texname.startsWith("@"))
	8463	+ {
	8464	+ // texturecache = textures.get(texname); // suspicious
	8465	+ if (texturecache == null)
	8466	+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
	8467	+ else
	8468	+ new Exception().printStackTrace();
	8469	+ } else
	8470	+ {
8444	8471	if (textureon)
8445	8472	{
8446	8473	String cachename = texname;
..	..	@@ -8500,6 +8527,7 @@
8500	8527	texturecache = new CacheTexture(texturedata,resolution);
8501	8528	//texture = GetTexture(tex, bump);
8502	8529	}
	8530	+ }
8503	8531	}
8504	8532	//}
8505	8533	}
..	..	@@ -8768,10 +8796,12 @@
8768	8796
8769	8797	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8770	8798	MAXSTACK = temp[0];
8771		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8772	8801	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8773	8802	MAXSTACK = temp[0];
8774		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8803	+ if (Globals.DEBUG)
	8804	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8775	8805
8776	8806	// Use debug pipeline
8777	8807	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8779,7 +8809,8 @@
8779	8809	gl = drawable.getGL(); //
8780	8810
8781	8811	GL gl3 = getGL();
8782		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8812	+ if (Globals.DEBUG)
	8813	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8783	8814
8784	8815
8785	8816	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -9220,6 +9251,8 @@
9220	9251
9221	9252	void LoadEnvy(int which)
9222	9253	{
	9254	+ assert(false);
	9255	+
9223	9256	String name;
9224	9257	String ext;
9225	9258
..	..	@@ -9316,10 +9349,9 @@
9316	9349	double[] light2camera = new double[16];
9317	9350
9318	9351	//int newenvy = -1;
9319		- boolean envyoff = true; // false;
9320		- String skyboxname = "";
9321		- String skyboxext;
9322		- String loadedskyboxname = "";
	9352	+ //boolean envyoff = false;
	9353	+
	9354	+ String loadedskyboxname;
9323	9355
9324	9356	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9325	9357	//float[] light0 = { 0,0,0 };
..	..	@@ -10671,9 +10703,18 @@
10671	10703	static boolean init = false;
10672	10704
10673	10705	double[][] matrix = LA.newMatrix();
	10706	+
	10707	+ // This is to refresh the UI of the material panel.
	10708	+ ObjEditor patchMaterial;
10674	10709
10675	10710	public void display(GLAutoDrawable drawable)
10676	10711	{
	10712	+ if (patchMaterial.patchMaterial)
	10713	+ {
	10714	+ patchMaterial.patchMaterial = false;
	10715	+ patchMaterial.objectPanel.setSelectedIndex(1);
	10716	+ }
	10717	+
10677	10718	if (Grafreed.savesound && Grafreed.hassound)
10678	10719	{
10679	10720	Grafreed.wav.save();
..	..	@@ -10842,7 +10883,7 @@
10842	10883
10843	10884	if (wait)
10844	10885	{
10845		- Sleep(500);
	10886	+ Sleep(200); // blocks everything
10846	10887
10847	10888	wait = false;
10848	10889	}
..	..	@@ -11065,10 +11106,34 @@
11065	11106	//
11066	11107	// newenvy = -1;
11067	11108
11068		- if (!skyboxname.equals(this.loadedskyboxname))
	11109	+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
11069	11110	{
11070		- LoadSkybox(skyboxname + "/", skyboxext, false);
11071		- loadedskyboxname = skyboxname;
	11111	+ if (cubemaprgb == null)
	11112	+ {
	11113	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11114	+ }
	11115	+
	11116	+ cubemap = cubemaprgb;
	11117	+ }
	11118	+ else
	11119	+ {
	11120	+ if (object.skyboxname != null)
	11121	+ {
	11122	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11123	+ {
	11124	+ if (cubemap != null && cubemap != cubemaprgb)
	11125	+ cubemap.dispose();
	11126	+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11127	+ loadedskyboxname = object.skyboxname;
	11128	+ }
	11129	+ }
	11130	+ else
	11131	+ {
	11132	+ cubemapcustom = null;
	11133	+ loadedskyboxname = null;
	11134	+ }
	11135	+
	11136	+ cubemap = cubemapcustom;
11072	11137	}
11073	11138
11074	11139	ratio = ((double) getWidth()) / getHeight();
..	..	@@ -11372,7 +11437,7 @@
11372	11437
11373	11438	// if (cam != lightCamera)
11374	11439	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11375		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11440	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
11376	11441	}
11377	11442
11378	11443	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -12446,7 +12511,7 @@
12446	12511
12447	12512	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12448	12513
12449		- String program0 =
	12514	+ String programmin =
12450	12515	// Min shader
12451	12516	"!!ARBfp1.0\n" +
12452	12517	"PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
..	..	@@ -12513,7 +12578,7 @@
12513	12578	"MOV result.color, temp;" +
12514	12579	"END";
12515	12580
12516		- String program =
	12581	+ String programmax =
12517	12582	"!!ARBfp1.0\n" +
12518	12583
12519	12584	//"OPTION ARB_fragment_program_shadow;" +
..	..	@@ -12541,7 +12606,7 @@
12541	12606	"PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
12542	12607	"PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
12543	12608	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12544		- "PARAM params7 = program.env[7];" + // noise power, opacity power
	12609	+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
12545	12610	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
12546	12611	"PARAM options1 = program.env[62];" + // fog rgb color
12547	12612	"PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
..	..	@@ -12786,7 +12851,7 @@
12786	12851	"POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
12787	12852	// mar 2013 ??? "KIL alpha.a;" +
12788	12853	"MOV alpha, texSamp.aaaa;" + // y;" +
12789		- "KIL alpha.a;" +
	12854	+ "KIL alpha.a;" + // not sure with parallax mapping
12790	12855	/*
12791	12856	"MUL temp.xy, temp, two;" +
12792	12857	"TXB bump, temp, texture[0], 2D;" +
..	..	@@ -12872,11 +12937,6 @@
12872	12937	"SUB bump0, bump0, half;" +
12873	12938	"ADD bump, bump, bump0;" +
12874	12939
12875		- "MOV temp.x, texSamp.a;" +
12876		- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12877		- //"LRP texSamp0, params5.x, texSamp0, one;" +
12878		- "MOV texSamp.a, temp.x;" +
12879		-
12880	12940	// double-sided
12881	12941	/**/
12882	12942	(doublesided?"DP3 temp.z, normal, eye;" +
..	..	@@ -12893,19 +12953,62 @@
12893	12953	"MOV normald, normal;" +
12894	12954	"MOV normals, normal;" +
12895	12955
	12956	+ "MOV temp, fragment.texcoord[4];" +
	12957	+
12896	12958	// UV base
12897	12959	//"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
12898	12960	//"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
12899	12961	//"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
12900		- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
12901		- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
12902		- "DP3 UP.z,state.matrix.texture[7].row[2],Y;" +
	12962	+ "DP3 UP.x,state.matrix.texture[7].row[0],temp;" +
	12963	+ "DP3 UP.y,state.matrix.texture[7].row[1],temp;" +
	12964	+ "DP3 UP.z,state.matrix.texture[7].row[2],temp;" +
	12965	+ Normalize("UP") +
	12966	+
12903	12967	"XPD V, normal, UP;" +
12904	12968	Normalize("V") +
12905	12969	"XPD U, V, normal;" +
12906	12970	Normalize("U") +
12907	12971
12908	12972	// parallax mapping
	12973	+
	12974	+ "DP3 temp2.x, V, eye;" +
	12975	+ "DP3 temp2.y, U, eye;" +
	12976	+ "DP3 temp2.z, normal, eye;" +
	12977	+ "RCP temp2.z, temp2.z;" +
	12978	+
	12979	+ "DP3 temp2.w, texSamp, texSamp;" + // Height
	12980	+ "RSQ temp2.w, temp2.w;" +
	12981	+ "RCP temp2.w, temp2.w;" +
	12982	+
	12983	+ "SUB temp2.w, temp2.w, half;" +
	12984	+// "SGE temp.x, temp2.w, eps.x;" +
	12985	+// "MUL temp2.w, temp2.w, temp.x;" +
	12986	+
	12987	+ //"MOV texSamp, U;" +
	12988	+
	12989	+ "MUL temp2.z, temp2.z, temp2.w;" +
	12990	+ "MUL temp2.z, temp2.z, params7.z;" + // parallax
	12991	+
	12992	+ "MUL temp2, temp2, temp2.z;" +
	12993	+
	12994	+ "MOV temp, fragment.texcoord[0];" +
	12995	+
	12996	+ "SUB temp, temp, temp2;" +
	12997	+
	12998	+ "TEX temp, temp, texture[0], 2D;" +
	12999	+ "POW temp.a, temp.a, params6.w;" + // punch through
	13000	+
	13001	+ "ADD texSamp, temp, texSamp;" +
	13002	+ "MUL texSamp.xyz, half, texSamp;" +
	13003	+
	13004	+ "MOV alpha, texSamp.aaaa;" +
	13005	+
	13006	+// parallax mapping
	13007	+
	13008	+ "MOV temp.x, texSamp.a;" +
	13009	+ "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
	13010	+ //"LRP texSamp0, params5.x, texSamp0, one;" +
	13011	+ "MOV texSamp.a, temp.x;" +
12909	13012
12910	13013	//"MOV temp, fragment.texcoord[0];" +
12911	13014	//
..	..	@@ -13369,8 +13472,19 @@
13369	13472	//once = true;
13370	13473	}
13371	13474
13372		- System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13373		- System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13475	+ String program = programmax;
	13476	+
	13477	+ if (Globals.MINSHADER)
	13478	+ {
	13479	+ program = programmin;
	13480	+ }
	13481	+
	13482	+ if (Globals.DEBUG)
	13483	+ {
	13484	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
	13485	+ System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13486	+ }
	13487	+
13374	13488	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13375	13489
13376	13490	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13417,7 +13531,8 @@
13417	13531	"\n" +
13418	13532	"END\n";
13419	13533
13420		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13534	+ if (Globals.DEBUG)
	13535	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13421	13536	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13422	13537
13423	13538	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13675,7 +13790,7 @@
13675	13790	/static/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
13676	13791	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13677	13792	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13678		- /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
	13793	+ /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
13679	13794
13680	13795	//Object3D.cVector2[] vector2buffer;
13681	13796
..	..	@@ -13842,7 +13957,7 @@
13842	13957	"PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
13843	13958	"PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
13844	13959	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
13845		- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
	13960	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
13846	13961	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
13847	13962	"PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
13848	13963	//"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
..	..	@@ -13903,7 +14018,7 @@
13903	14018	"DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
13904	14019	"DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
13905	14020	"DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13906		- //"MOV result.texcoord, vertex.texcoord;" +
	14021	+ //"MOV result.texcoord, vertex.fogcoord;" +
13907	14022	"MOV result.texcoord, temp;" +
13908	14023	// border fade
13909	14024	"MOV result.texcoord[3], vertex.texcoord;" +
..	..	@@ -13950,7 +14065,9 @@
13950	14065
13951	14066	//"ADD temp.z, temp.z, one;" +
13952	14067
13953		- "MOV result.color, temp;"
	14068	+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
	14069	+
	14070	+ "MOV result.color, temp;" // Normal
13954	14071	: "MOV result.color, vertex.color;") +
13955	14072	((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
13956	14073	: "") +
..	..	@@ -14616,11 +14733,17 @@
14616	14733	void GoDown(int mod)
14617	14734	{
14618	14735	MODIFIERS \|= COMMAND;
	14736	+ boolean isVR = (mouseMode&VR)!=0;
14619	14737	/**/
14620	14738	if((mod&SHIFT) == SHIFT)
14621		- manipCamera.RotatePosition(0, -speed);
	14739	+ {
	14740	+ if (isVR)
	14741	+ manipCamera.RotateInterest(0, -speed);
	14742	+ else
	14743	+ manipCamera.RotatePosition(0, -speed);
	14744	+ }
14622	14745	else
14623		- manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14746	+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
14624	14747	/**/
14625	14748	if ((mod & SHIFT) == SHIFT)
14626	14749	{
..	..	@@ -14630,6 +14753,8 @@
14630	14753	mouseMode \|= BACKFORTH;
14631	14754	}
14632	14755
	14756	+ targetLookAt.set(manipCamera.lookAt);
	14757	+
14633	14758	//prevX = X = anchorX;
14634	14759	prevY = Y = anchorY - (int) (renderCamera.Distance());
14635	14760	}
..	..	@@ -14638,10 +14763,17 @@
14638	14763	{
14639	14764	MODIFIERS \|= COMMAND;
14640	14765	/**/
	14766	+ boolean isVR = (mouseMode&VR)!=0;
	14767	+
14641	14768	if((mod&SHIFT) == SHIFT)
14642		- manipCamera.RotatePosition(0, speed);
	14769	+ {
	14770	+ if (isVR)
	14771	+ manipCamera.RotateInterest(0, speed);
	14772	+ else
	14773	+ manipCamera.RotatePosition(0, speed);
	14774	+ }
14643	14775	else
14644		- manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14776	+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
14645	14777	/**/
14646	14778	if ((mod & SHIFT) == SHIFT)
14647	14779	{
..	..	@@ -14651,6 +14783,8 @@
14651	14783	mouseMode \|= BACKFORTH;
14652	14784	}
14653	14785
	14786	+ targetLookAt.set(manipCamera.lookAt);
	14787	+
14654	14788	//prevX = X = anchorX;
14655	14789	prevY = Y = anchorY + (int) (renderCamera.Distance());
14656	14790	}
..	..	@@ -14660,9 +14794,14 @@
14660	14794	MODIFIERS \|= COMMAND;
14661	14795	/**/
14662	14796	if((mod&SHIFT) == SHIFT)
14663		- manipCamera.Translate(speed*delta, 0, getWidth());
	14797	+ manipCamera.Translate(speed*delta, 0, getWidth());
14664	14798	else
14665		- manipCamera.RotatePosition(speed, 0);
	14799	+ {
	14800	+ if ((mouseMode&VR)!=0)
	14801	+ manipCamera.RotateInterest(-speed, 0);
	14802	+ else
	14803	+ manipCamera.RotatePosition(speed, 0);
	14804	+ }
14666	14805	/**/
14667	14806	if ((mod & SHIFT) == SHIFT)
14668	14807	{
..	..	@@ -14672,6 +14811,8 @@
14672	14811	mouseMode \|= ROTATE;
14673	14812	} // TRANSLATE;
14674	14813
	14814	+ targetLookAt.set(manipCamera.lookAt);
	14815	+
14675	14816	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
14676	14817	prevY = Y = anchorY;
14677	14818	}
..	..	@@ -14681,9 +14822,15 @@
14681	14822	MODIFIERS \|= COMMAND;
14682	14823	/**/
14683	14824	if((mod&SHIFT) == SHIFT)
14684		- manipCamera.Translate(-speed*delta, 0, getWidth());
	14825	+ manipCamera.Translate(-speed*delta, 0, getWidth());
14685	14826	else
14686		- manipCamera.RotatePosition(-speed, 0);
	14827	+ {
	14828	+ if ((mouseMode&VR)!=0)
	14829	+ manipCamera.RotateInterest(speed, 0);
	14830	+ else
	14831	+ manipCamera.RotatePosition(-speed, 0);
	14832	+ }
	14833	+
14687	14834	/**/
14688	14835	if ((mod & SHIFT) == SHIFT)
14689	14836	{
..	..	@@ -14693,6 +14840,8 @@
14693	14840	mouseMode \|= ROTATE;
14694	14841	} // TRANSLATE;
14695	14842
	14843	+ targetLookAt.set(manipCamera.lookAt);
	14844	+
14696	14845	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
14697	14846	prevY = Y = anchorY;
14698	14847	}
..	..	@@ -15195,8 +15344,8 @@
15195	15344	case 'K':
15196	15345	KOMPACTTEXTURE ^= true;
15197	15346	//textures.clear();
15198		- break;
15199		- case 'P': // Texture Projection macros
	15347	+ // break;
	15348	+ //case 'P': // Texture Projection macros
15200	15349	// SAVETEXTURE ^= true;
15201	15350	macromode = true;
15202	15351	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -15317,7 +15466,7 @@
15317	15466	targetLookAt.set(manipCamera.lookAt);
15318	15467	repaint();
15319	15468	break;
15320		- case 'p':
	15469	+ case 'P': // p':
15321	15470	// c'est quoi ca au juste? spherical ^= true;
15322	15471	Skinshader ^= true; programInitialized = false;
15323	15472	repaint();
..	..	@@ -15362,7 +15511,7 @@
15362	15511	OCCLUSION_CULLING ^= true;
15363	15512	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
15364	15513	break;
15365		- case '0': envyoff ^= true; repaint(); break;
	15514	+ //case '0': envyoff ^= true; repaint(); break;
15366	15515	case '1':
15367	15516	case '2':
15368	15517	case '3':
..	..	@@ -15372,7 +15521,7 @@
15372	15521	case '7':
15373	15522	case '8':
15374	15523	case '9':
15375		- if (envyoff)
	15524	+ if (true) // envyoff)
15376	15525	{
15377	15526	BGcolor = (key - '1')/8.f;
15378	15527	}
..	..	@@ -16077,14 +16226,14 @@
16077	16226	{
16078	16227	switch (hitSomething)
16079	16228	{
16080		- case Object3D.hitCenter: gr.setColor(Color.pink);
	16229	+ case Object3D.hitCenter: gr.setColor(Color.white);
16081	16230	gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
16082	16231	break;
16083	16232	case Object3D.hitRotate: gr.setColor(Color.yellow);
16084	16233	gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
16085	16234	break;
16086	16235	case Object3D.hitScale: gr.setColor(Color.cyan);
16087		- gr.drawLine(X, Y, 0, 0);
	16236	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
16088	16237	break;
16089	16238	}
16090	16239
..	..	@@ -16103,7 +16252,7 @@
16103	16252	if (hasMarquee)
16104	16253	{
16105	16254	gr.setXORMode(Color.white);
16106		- gr.setColor(Color.red);
	16255	+ gr.setColor(Color.white);
16107	16256	if (!firstime)
16108	16257	{
16109	16258	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -16570,6 +16719,8 @@
16570	16719	private /static/ boolean firstime;
16571	16720	private /static/ cVector newView = new cVector();
16572	16721	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16722	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16723	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
16573	16724	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16574	16725	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16575	16726	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16582,22 +16733,56 @@
16582	16733	{
16583	16734	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16584	16735
	16736	+ int usedsuf = 0;
	16737	+
16585	16738	for (int i = 0; i < suffixes.length; i++)
16586	16739	{
16587		- String resourceName = basename + suffixes[i] + "." + suffix;
16588		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16589		- mipmapped,
16590		- FileUtil.getFileSuffix(resourceName));
16591		- if (data == null)
	16740	+ String[] suffixe = suffixes;
	16741	+ String[] fallback = suffixes2;
	16742	+ String[] fallfallback = suffixes3;
	16743	+
	16744	+ for (int c=usedsuf; --c>=0;)
16592	16745	{
16593		- throw new IOException("Unable to load texture " + resourceName);
	16746	+// String[] temp = suffixe;
	16747	+// suffixe = fallback;
	16748	+// fallback = fallfallback;
	16749	+// fallfallback = temp;
16594	16750	}
	16751	+
	16752	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16753	+ TextureData data;
	16754	+
	16755	+ try
	16756	+ {
	16757	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16758	+ mipmapped,
	16759	+ FileUtil.getFileSuffix(resourceName));
	16760	+ }
	16761	+ catch (Exception e)
	16762	+ {
	16763	+ try
	16764	+ {
	16765	+ resourceName = basename + fallback[i] + "." + suffix;
	16766	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16767	+ mipmapped,
	16768	+ FileUtil.getFileSuffix(resourceName));
	16769	+ }
	16770	+ catch (Exception e2)
	16771	+ {
	16772	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16773	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16774	+ mipmapped,
	16775	+ FileUtil.getFileSuffix(resourceName));
	16776	+ }
	16777	+ }
	16778	+
16595	16779	//System.out.println("Target = " + targets[i]);
16596	16780	cubemap.updateImage(data, targets[i]);
16597	16781	}
16598	16782
16599	16783	return cubemap;
16600	16784	}
	16785	+
16601	16786	int bigsphere = -1;
16602	16787
16603	16788	float BGcolor = 0.5f;
..	..	@@ -16606,7 +16791,9 @@
16606	16791
16607	16792	private void DrawSkyBox(GL gl, float ratio)
16608	16793	{
16609		- if (envyoff \|\| cubemap == null)
	16794	+ if (//envyoff \|\|
	16795	+ WIREFRAME \|\|
	16796	+ cubemap == null)
16610	16797	{
16611	16798	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16612	16799	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -16623,14 +16810,14 @@
16623	16810	gl.glLoadIdentity();
16624	16811	gl.glScalef(1,ratio,1);
16625	16812
16626		- colorV[0] = 2;
16627		- colorV[1] = 2;
16628		- colorV[2] = 2;
16629		- colorV[3] = 1;
16630		- gl.glDisable(gl.GL_COLOR_MATERIAL);
16631		- gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
16632		-
16633		- gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16813	+// colorV[0] = 2;
	16814	+// colorV[1] = 2;
	16815	+// colorV[2] = 2;
	16816	+// colorV[3] = 1;
	16817	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16818	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16819	+//
	16820	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
16634	16821
16635	16822	//gl.glActiveTexture(GL.GL_TEXTURE1);
16636	16823	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
..	..	@@ -16644,7 +16831,7 @@
16644	16831	// GL_NORMAL_MAP texgen mode. Temporarily enabling lighting
16645	16832	// causes the normals to be sent down. Thanks to Ken Dyke.
16646	16833	//gl.glEnable(GL.GL_LIGHTING);
16647		- gl.glEnable(GL.GL_LIGHTING);
	16834	+ gl.glDisable(GL.GL_LIGHTING);
16648	16835
16649	16836	gl.glTexGeni(GL.GL_S, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
16650	16837	gl.glTexGeni(GL.GL_T, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
..	..	@@ -16663,6 +16850,7 @@
16663	16850	{
16664	16851	gl.glScalef(1.0f, -1.0f, 1.0f);
16665	16852	}
	16853	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16666	16854	gl.glMultMatrixd(viewrot_1, 0);
16667	16855	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16668	16856	//viewer.updateInverseRotation(gl);
..	..	@@ -16703,7 +16891,8 @@
16703	16891	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16704	16892
16705	16893	cubemap.disable();
16706		- ////cubemap.unbind();
	16894	+ //cubemap.dispose();
	16895	+
16707	16896	if (CULLFACE)
16708	16897	{
16709	16898	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16759,7 +16948,7 @@
16759	16948	gl.glScalef(1.0f, -1.0f, 1.0f);
16760	16949	}
16761	16950
16762		- gl.glNormal3f(0.0f, 0.0f, 1.0f);
	16951	+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
16763	16952
16764	16953	float step = 2; // 0.1666f; //0.25f;
16765	16954	float stepv = 2; // step * 1652 / 998;
..	..	@@ -17239,6 +17428,7 @@
17239	17428
17240	17429	public void init(GLAutoDrawable drawable)
17241	17430	{
	17431	+ if (Globals.DEBUG)
17242	17432	System.out.println("shadow buffer init");
17243	17433
17244	17434	GL gl = drawable.getGL();
..	..	@@ -17467,10 +17657,14 @@
17467	17657	gl.glFlush();
17468	17658
17469	17659	/**/
17470		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
	17660	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
17471	17661
17472		- float[] pixels = occlusionsizebuffer.array();
	17662	+ float[] depths = occlusiondepthbuffer.array();
17473	17663
	17664	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	17665	+
	17666	+ int[] pixels = selectsizebuffer.array();
	17667	+
17474	17668	double r = 0, g = 0, b = 0;
17475	17669
17476	17670	double count = 0;
..	..	@@ -17481,7 +17675,7 @@
17481	17675
17482	17676	double FACTOR = 1;
17483	17677
17484		- for (int i = 0; i < pixels.length; i++)
	17678	+ for (int i = 0; i < depths.length; i++)
17485	17679	{
17486	17680	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
17487	17681	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -17564,7 +17758,7 @@
17564	17758
17565	17759	double scale = ray.z; // 1; // cos
17566	17760
17567		- float depth = pixels[newindex];
	17761	+ float depth = depths[newindex];
17568	17762
17569	17763	/*
17570	17764	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17761,11 +17955,14 @@
17761	17955	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17762	17956	static IntBuffer bigAAbuffer;
17763	17957	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17764		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	17958	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17765	17959	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17766	17960	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17767	17961	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17768		- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17962	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17963	+
	17964	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17965	+
17769	17966	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17770	17967	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17771	17968	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();