From 6266c8a4b2485b29a7d5bcb217460d7aad3e1c4a Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 25 Aug 2019 20:58:10 -0400
Subject: [PATCH] Proto version slider.
---
CameraPane.java | 131 +++++++++++++++++++++++++++----------------
1 files changed, 82 insertions(+), 49 deletions(-)
diff --git a/CameraPane.java b/CameraPane.java
index e8611a1..b983dd6 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)
@@ -880,7 +881,7 @@
//// tris.postdraw(this);
}
- static Camera localcamera = new Camera();
+ static Camera localAOcamera = new Camera();
static cVector from = new cVector();
static cVector to = new cVector();
@@ -889,7 +890,7 @@
CameraPane cp = this;
Camera keep = cp.RenderCamera();
- cp.renderCamera = localcamera;
+ cp.renderCamera = localAOcamera;
if (br.trimmed)
{
@@ -907,7 +908,7 @@
br.positions[i3 + 2] + br.normals[i3 + 2]);
LA.xformPos(from, transform, from);
LA.xformPos(to, transform, to); // RIGID ONLY
- localcamera.setAim(from, to);
+ localAOcamera.setAim(from, to);
CameraPane.occlusionbuffer.display();
@@ -941,7 +942,7 @@
to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
LA.xformPos(from, transform, from);
LA.xformPos(to, transform, to); // RIGID ONLY
- localcamera.setAim(from, to);
+ localAOcamera.setAim(from, to);
CameraPane.occlusionbuffer.display();
@@ -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);
}
/**/
@@ -12501,8 +12514,9 @@
String programmin =
// Min shader
"!!ARBfp1.0\n" +
- "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
- "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
+ "PARAM zero12t = { 0.0, 1.0, 2, 1.25 };" +
+ "PARAM pow_2 = { 0.5, 0.25, 0.125, 0.0 };" +
+ "PARAM pow2 = { 2, 4, 8, 0.0 };" +
"PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
"PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
"PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
@@ -12517,10 +12531,11 @@
"TEMP eye;" +
"TEMP pos;" +
- "MAD normal, fragment.color, zero123.z, -zero123.y;" +
+ "MAD normal, fragment.color, zero12t.z, -zero12t.y;" +
Normalize("normal") +
"MOV light, state.light[0].position;" +
"DP3 ndotl.x, light, normal;" +
+ "MAX ndotl.x, ndotl.x, zero12t.x;" +
// shadow
"MOV pos, fragment.texcoord[1];" +
@@ -12536,7 +12551,7 @@
"MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
// Backlit
- "MOV pos.w, zero123.y;" +
+ "MOV pos.w, zero12t.y;" + // one
"DP4 eye.x, pos, light2cam0;" +
"DP4 eye.y, pos, light2cam1;" +
"DP4 eye.z, pos, light2cam2;" +
@@ -12544,24 +12559,28 @@
"DP3 ndotl.y, -eye, normal;" +
//"MUL ndotl.y, ndotl.y, pow2.x;" +
- "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
- "SUB ndotl.y, zero123.y, ndotl.y;" +
+ "POW ndotl.y, ndotl.y, pow2.x;" + // backlit
+ "SUB ndotl.y, zero12t.y, ndotl.y;" + // 1 - y
+ //"POW ndotl.y, ndotl.y, pow2.z;" + // backlit
//"SUB ndotl.y, zero123.y, ndotl.y;" +
//"MUL ndotl.y, ndotl.y, pow2.z;" +
+ "ADD ndotl.y, ndotl.y, one.x;" +
+ "MUL ndotl.y, ndotl.y, pow_2.x;" +
//"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
//"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
// Pigment
"TEX temp, fragment.texcoord[0], texture[0], 2D;" +
- "LRP temp, zero123.w, temp, one;" + // texture proportion
- "MUL temp, temp, ndotl.x;" +
-
- "MUL temp, temp, zero123.z;" +
+ "LRP temp, zero12t.w, temp, one;" + // texture proportion
+ "MUL temp, temp, zero12t.w;" + // Times x
//"MUL temp, temp, ndotl.y;" +
+ "MAD ndotl.x, pow_2.xxxx, ndotl.yyyy, ndotl.x;" +
- "MOV temp.w, zero123.y;" + // reset alpha
+ "MUL temp, temp, ndotl.x;" + // lambert
+
+ "MOV temp.w, zero12t.y;" + // reset alpha
"MOV result.color, temp;" +
"END";
@@ -12933,24 +12952,34 @@
"ADD temp.x, temp.x, one.x;" +
"MUL normal, normal, temp.xxxx;":""
) +
- /**/
-//// Normalize("normal") +
-//// "MAX normal.z, eps.x, normal.z;" +
-// Normalize("normal") +
- "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;" +
Normalize("U") +
+
+ "MOV temp, fragment.texcoord[0];" +
+
+// "MAD normal, -temp.x, U, normal;" +
+// "MAD normal, -temp.y, V, normal;" +
+// Normalize("normal") +
+
+//// "MAX normal.z, eps.x, normal.z;" +
+// Normalize("normal") +
+ "MOV normald, normal;" +
+ "MOV normals, normal;" +
// parallax mapping
@@ -12964,22 +12993,24 @@
"RCP temp2.w, temp2.w;" +
"SUB temp2.w, temp2.w, half;" +
-// "SGE temp.x, temp2.w, eps.x;" +
-// "MUL temp2.w, temp2.w, temp.x;" +
+ // "SGE temp.x, temp2.w, eps.x;" +
+ // "MUL temp2.w, temp2.w, temp.x;" +
- //"MOV texSamp, U;" +
+ // "MOV texSamp, U;" +
"MUL temp2.z, temp2.z, temp2.w;" +
"MUL temp2.z, temp2.z, params7.z;" + // parallax
"MUL temp2, temp2, temp2.z;" +
- "MOV temp, fragment.texcoord[0];" +
-
"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 texSamp.xyz, half, texSamp;" +
+
"MOV alpha, texSamp.aaaa;" +
// parallax mapping
@@ -13936,7 +13967,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 +14028,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 +14075,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;"
: "") +
@@ -14703,8 +14736,8 @@
}
}
PingThread pingthread = new PingThread();
- int delta = 5;
- int speed = 5;
+ int delta = 2;
+ int speed = 10;
boolean autorepeat = false;
void GoDown(int mod)
@@ -15481,7 +15514,7 @@
repaint();
break;
case 'O':
- Globals.drawMode = OCCLUSION; // WARNING
+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
repaint();
break;
case 'o':
@@ -16925,7 +16958,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