~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -542,7 +542,8 @@
542	542	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
543	543	LA.vecCross(obj.v0, obj.v1, obj.v2);
544	544	LA.vecNormalize(obj.v2);
545		- 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);
546	547	}
547	548
548	549	// P
..	..	@@ -564,7 +565,7 @@
564	565	y += ny * obj.NORMALPUSH;
565	566	z += nz * obj.NORMALPUSH;
566	567
567		- gl.glNormal3f(nx, ny, nz);
	568	+ SetGLNormal(gl, nx, ny, nz);
568	569	}
569	570	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
570	571	SetColor(obj, pv);
..	..	@@ -596,7 +597,7 @@
596	597	y += ny * obj.NORMALPUSH;
597	598	z += nz * obj.NORMALPUSH;
598	599
599		- gl.glNormal3f(nx, ny, nz);
	600	+ SetGLNormal(gl, nx, ny, nz);
600	601	}
601	602	//System.out.println("vertexq = " + qv.s + ", " + qv.t);
602	603	// boolean locked = false;
..	..	@@ -644,7 +645,7 @@
644	645	y += ny * obj.NORMALPUSH;
645	646	z += nz * obj.NORMALPUSH;
646	647
647		- gl.glNormal3f(nx, ny, nz);
	648	+ SetGLNormal(gl, nx, ny, nz);
648	649	}
649	650
650	651	// if ((dot&4) == 0)
..	..	@@ -880,7 +881,7 @@
880	881	//// tris.postdraw(this);
881	882	}
882	883
883		- static Camera localcamera = new Camera();
	884	+ static Camera localAOcamera = new Camera();
884	885	static cVector from = new cVector();
885	886	static cVector to = new cVector();
886	887
..	..	@@ -889,7 +890,7 @@
889	890	CameraPane cp = this;
890	891
891	892	Camera keep = cp.RenderCamera();
892		- cp.renderCamera = localcamera;
	893	+ cp.renderCamera = localAOcamera;
893	894
894	895	if (br.trimmed)
895	896	{
..	..	@@ -907,7 +908,7 @@
907	908	br.positions[i3 + 2] + br.normals[i3 + 2]);
908	909	LA.xformPos(from, transform, from);
909	910	LA.xformPos(to, transform, to); // RIGID ONLY
910		- localcamera.setAim(from, to);
	911	+ localAOcamera.setAim(from, to);
911	912
912	913	CameraPane.occlusionbuffer.display();
913	914
..	..	@@ -941,7 +942,7 @@
941	942	to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
942	943	LA.xformPos(from, transform, from);
943	944	LA.xformPos(to, transform, to); // RIGID ONLY
944		- localcamera.setAim(from, to);
	945	+ localAOcamera.setAim(from, to);
945	946
946	947	CameraPane.occlusionbuffer.display();
947	948
..	..	@@ -1250,10 +1251,10 @@
1250	1251	{
1251	1252	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1252	1253	{
1253		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1254	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1254	1255	} else
1255	1256	{
1256		- gl.glNormal3f(0, 0, 1);
	1257	+ SetGLNormal(gl, 0, 0, 1);
1257	1258	}
1258	1259
1259	1260	if (c != null)
..	..	@@ -1277,10 +1278,10 @@
1277	1278	{
1278	1279	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1279	1280	{
1280		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1281	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1281	1282	} else
1282	1283	{
1283		- gl.glNormal3f(0, 0, 1);
	1284	+ SetGLNormal(gl, 0, 0, 1);
1284	1285	}
1285	1286	if (c != null)
1286	1287	{
..	..	@@ -1305,10 +1306,10 @@
1305	1306	{
1306	1307	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1307	1308	{
1308		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1309	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1309	1310	} else
1310	1311	{
1311		- gl.glNormal3f(0, 0, 1);
	1312	+ SetGLNormal(gl, 0, 0, 1);
1312	1313	}
1313	1314	if (c != null)
1314	1315	{
..	..	@@ -1490,7 +1491,7 @@
1490	1491	{
1491	1492	if (!selectmode)
1492	1493	{
1493		- 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);
1494	1495	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
1495	1496
1496	1497	if (flipV)
..	..	@@ -2473,6 +2474,18 @@
2473	2474	byte[] bytes = bytebuf.array();
2474	2475
2475	2476	return CreateBim(bytes, width, height);
	2477	+ }
	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);
2476	2489	}
2477	2490
2478	2491	/**/
..	..	@@ -12501,8 +12514,9 @@
12501	12514	String programmin =
12502	12515	// Min shader
12503	12516	"!!ARBfp1.0\n" +
12504		- "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
12505		- "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12517	+ "PARAM zero12t = { 0.0, 1.0, 2, 1.25 };" +
	12518	+ "PARAM pow_2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12519	+ "PARAM pow2 = { 2, 4, 8, 0.0 };" +
12506	12520	"PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
12507	12521	"PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
12508	12522	"PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
..	..	@@ -12517,10 +12531,11 @@
12517	12531	"TEMP eye;" +
12518	12532	"TEMP pos;" +
12519	12533
12520		- "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12534	+ "MAD normal, fragment.color, zero12t.z, -zero12t.y;" +
12521	12535	Normalize("normal") +
12522	12536	"MOV light, state.light[0].position;" +
12523	12537	"DP3 ndotl.x, light, normal;" +
	12538	+ "MAX ndotl.x, ndotl.x, zero12t.x;" +
12524	12539
12525	12540	// shadow
12526	12541	"MOV pos, fragment.texcoord[1];" +
..	..	@@ -12536,7 +12551,7 @@
12536	12551	"MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
12537	12552
12538	12553	// Backlit
12539		- "MOV pos.w, zero123.y;" +
	12554	+ "MOV pos.w, zero12t.y;" + // one
12540	12555	"DP4 eye.x, pos, light2cam0;" +
12541	12556	"DP4 eye.y, pos, light2cam1;" +
12542	12557	"DP4 eye.z, pos, light2cam2;" +
..	..	@@ -12544,24 +12559,28 @@
12544	12559
12545	12560	"DP3 ndotl.y, -eye, normal;" +
12546	12561	//"MUL ndotl.y, ndotl.y, pow2.x;" +
12547		- "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
12548		- "SUB ndotl.y, zero123.y, ndotl.y;" +
	12562	+ "POW ndotl.y, ndotl.y, pow2.x;" + // backlit
	12563	+ "SUB ndotl.y, zero12t.y, ndotl.y;" + // 1 - y
	12564	+ //"POW ndotl.y, ndotl.y, pow2.z;" + // backlit
12549	12565	//"SUB ndotl.y, zero123.y, ndotl.y;" +
12550	12566	//"MUL ndotl.y, ndotl.y, pow2.z;" +
	12567	+ "ADD ndotl.y, ndotl.y, one.x;" +
	12568	+ "MUL ndotl.y, ndotl.y, pow_2.x;" +
12551	12569
12552	12570	//"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
12553	12571	//"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
12554	12572
12555	12573	// Pigment
12556	12574	"TEX temp, fragment.texcoord[0], texture[0], 2D;" +
12557		- "LRP temp, zero123.w, temp, one;" + // texture proportion
12558		- "MUL temp, temp, ndotl.x;" +
12559		-
12560		- "MUL temp, temp, zero123.z;" +
	12575	+ "LRP temp, zero12t.w, temp, one;" + // texture proportion
	12576	+ "MUL temp, temp, zero12t.w;" + // Times x
12561	12577
12562	12578	//"MUL temp, temp, ndotl.y;" +
	12579	+ "MAD ndotl.x, pow_2.xxxx, ndotl.yyyy, ndotl.x;" +
12563	12580
12564		- "MOV temp.w, zero123.y;" + // reset alpha
	12581	+ "MUL temp, temp, ndotl.x;" + // lambert
	12582	+
	12583	+ "MOV temp.w, zero12t.y;" + // reset alpha
12565	12584	"MOV result.color, temp;" +
12566	12585	"END";
12567	12586
..	..	@@ -12940,13 +12959,17 @@
12940	12959	"MOV normald, normal;" +
12941	12960	"MOV normals, normal;" +
12942	12961
	12962	+ "MOV temp, fragment.texcoord[4];" +
	12963	+
12943	12964	// UV base
12944	12965	//"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
12945	12966	//"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
12946	12967	//"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
12947		- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
12948		- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
12949		- "DP3 UP.z,state.matrix.texture[7].row[2],Y;" +
	12968	+ "DP3 UP.x,state.matrix.texture[7].row[0],temp;" +
	12969	+ "DP3 UP.y,state.matrix.texture[7].row[1],temp;" +
	12970	+ "DP3 UP.z,state.matrix.texture[7].row[2],temp;" +
	12971	+ Normalize("UP") +
	12972	+
12950	12973	"XPD V, normal, UP;" +
12951	12974	Normalize("V") +
12952	12975	"XPD U, V, normal;" +
..	..	@@ -12978,8 +13001,12 @@
12978	13001
12979	13002	"SUB temp, temp, temp2;" +
12980	13003
12981		- "TEX texSamp, temp, texture[0], 2D;" +
12982		- "POW texSamp.a, texSamp.a, params6.w;" + // punch through
	13004	+ "TEX temp, temp, texture[0], 2D;" +
	13005	+ "POW temp.a, temp.a, params6.w;" + // punch through
	13006	+
	13007	+ "ADD texSamp, temp, texSamp;" +
	13008	+ "MUL texSamp.xyz, half, texSamp;" +
	13009	+
12983	13010	"MOV alpha, texSamp.aaaa;" +
12984	13011
12985	13012	// parallax mapping
..	..	@@ -13936,7 +13963,7 @@
13936	13963	"PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
13937	13964	"PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
13938	13965	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
13939		- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
	13966	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
13940	13967	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
13941	13968	"PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
13942	13969	//"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
..	..	@@ -13997,7 +14024,7 @@
13997	14024	"DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
13998	14025	"DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
13999	14026	"DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
14000		- //"MOV result.texcoord, vertex.texcoord;" +
	14027	+ //"MOV result.texcoord, vertex.fogcoord;" +
14001	14028	"MOV result.texcoord, temp;" +
14002	14029	// border fade
14003	14030	"MOV result.texcoord[3], vertex.texcoord;" +
..	..	@@ -14044,7 +14071,9 @@
14044	14071
14045	14072	//"ADD temp.z, temp.z, one;" +
14046	14073
14047		- "MOV result.color, temp;"
	14074	+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
	14075	+
	14076	+ "MOV result.color, temp;" // Normal
14048	14077	: "MOV result.color, vertex.color;") +
14049	14078	((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
14050	14079	: "") +
..	..	@@ -15481,7 +15510,7 @@
15481	15510	repaint();
15482	15511	break;
15483	15512	case 'O':
15484		- Globals.drawMode = OCCLUSION; // WARNING
	15513	+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
15485	15514	repaint();
15486	15515	break;
15487	15516	case 'o':
..	..	@@ -16925,7 +16954,7 @@
16925	16954	gl.glScalef(1.0f, -1.0f, 1.0f);
16926	16955	}
16927	16956
16928		- gl.glNormal3f(0.0f, 0.0f, 1.0f);
	16957	+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
16929	16958
16930	16959	float step = 2; // 0.1666f; //0.25f;
16931	16960	float stepv = 2; // step * 1652 / 998;