From 7ac1b01c591ed65743676b1181d60eb17c5cb69d Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Wed, 21 Aug 2019 18:58:52 -0400
Subject: [PATCH] U dir and average.
---
CameraPane.java | 63 +++++++++++++++++++++----------
1 files changed, 43 insertions(+), 20 deletions(-)
diff --git a/CameraPane.java b/CameraPane.java
index e8611a1..7370fc9 100644
--- a/CameraPane.java
+++ b/CameraPane.java
@@ -542,7 +542,8 @@
LA.vecSub(pv/*.pos*/, rv/*.pos*/, obj.v1);
LA.vecCross(obj.v0, obj.v1, obj.v2);
LA.vecNormalize(obj.v2);
- gl.glNormal3f((float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
+
+ SetGLNormal(gl, (float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
}
// P
@@ -564,7 +565,7 @@
y += ny * obj.NORMALPUSH;
z += nz * obj.NORMALPUSH;
- gl.glNormal3f(nx, ny, nz);
+ SetGLNormal(gl, nx, ny, nz);
}
gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
SetColor(obj, pv);
@@ -596,7 +597,7 @@
y += ny * obj.NORMALPUSH;
z += nz * obj.NORMALPUSH;
- gl.glNormal3f(nx, ny, nz);
+ SetGLNormal(gl, nx, ny, nz);
}
//System.out.println("vertexq = " + qv.s + ", " + qv.t);
// boolean locked = false;
@@ -644,7 +645,7 @@
y += ny * obj.NORMALPUSH;
z += nz * obj.NORMALPUSH;
- gl.glNormal3f(nx, ny, nz);
+ SetGLNormal(gl, nx, ny, nz);
}
// if ((dot&4) == 0)
@@ -1250,10 +1251,10 @@
{
if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
{
- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
} else
{
- gl.glNormal3f(0, 0, 1);
+ SetGLNormal(gl, 0, 0, 1);
}
if (c != null)
@@ -1277,10 +1278,10 @@
{
if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
{
- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
} else
{
- gl.glNormal3f(0, 0, 1);
+ SetGLNormal(gl, 0, 0, 1);
}
if (c != null)
{
@@ -1305,10 +1306,10 @@
{
if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
{
- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
} else
{
- gl.glNormal3f(0, 0, 1);
+ SetGLNormal(gl, 0, 0, 1);
}
if (c != null)
{
@@ -1490,7 +1491,7 @@
{
if (!selectmode)
{
- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
+ SetGLNormal(gl, (float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
if (flipV)
@@ -2473,6 +2474,18 @@
byte[] bytes = bytebuf.array();
return CreateBim(bytes, width, height);
+ }
+
+ private void SetGLNormal(javax.media.opengl.GL gl, float nx, float ny, float nz)
+ {
+ gl.glNormal3f(nx, ny, nz);
+
+ if (ny > 0.9 || ny < -0.9)
+ // Ground or ceiling
+ gl.glVertexAttrib3f(4, 1, 0, 0);
+ else
+ // Walls
+ gl.glVertexAttrib3f(4, 0, 1, 0);
}
/**/
@@ -12940,13 +12953,17 @@
"MOV normald, normal;" +
"MOV normals, normal;" +
+ "MOV temp, fragment.texcoord[4];" +
+
// UV base
//"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
//"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
//"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
- "DP3 UP.z,state.matrix.texture[7].row[2],Y;" +
+ "DP3 UP.x,state.matrix.texture[7].row[0],temp;" +
+ "DP3 UP.y,state.matrix.texture[7].row[1],temp;" +
+ "DP3 UP.z,state.matrix.texture[7].row[2],temp;" +
+ Normalize("UP") +
+
"XPD V, normal, UP;" +
Normalize("V") +
"XPD U, V, normal;" +
@@ -12978,8 +12995,12 @@
"SUB temp, temp, temp2;" +
- "TEX texSamp, temp, texture[0], 2D;" +
- "POW texSamp.a, texSamp.a, params6.w;" + // punch through
+ "TEX temp, temp, texture[0], 2D;" +
+ "POW temp.a, temp.a, params6.w;" + // punch through
+
+ "ADD texSamp, temp, texSamp;" +
+ "MUL temp.xyz, half, texSamp;" +
+
"MOV alpha, texSamp.aaaa;" +
// parallax mapping
@@ -13936,7 +13957,7 @@
"PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
"PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
"PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
//"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
@@ -13997,7 +14018,7 @@
"DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
"DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
"DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
- //"MOV result.texcoord, vertex.texcoord;" +
+ //"MOV result.texcoord, vertex.fogcoord;" +
"MOV result.texcoord, temp;" +
// border fade
"MOV result.texcoord[3], vertex.texcoord;" +
@@ -14044,7 +14065,9 @@
//"ADD temp.z, temp.z, one;" +
- "MOV result.color, temp;"
+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
+
+ "MOV result.color, temp;" // Normal
: "MOV result.color, vertex.color;") +
((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
: "") +
@@ -16925,7 +16948,7 @@
gl.glScalef(1.0f, -1.0f, 1.0f);
}
- gl.glNormal3f(0.0f, 0.0f, 1.0f);
+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
float step = 2; // 0.1666f; //0.25f;
float stepv = 2; // step * 1652 / 998;
--
Gitblit v1.6.2