reenable per-triangle shadowing

Author: Try

shader/materials/main.frag

@@ -56,10 +56,11 @@ float calcShadow() {
   // vec4  pos4 = scene.viewProjectInv * scr;
 
   vec4 shadowPos[2];
-  // shadowPos[0] = scene.viewShadow[0]*vec4(pos4);
-  // shadowPos[1] = scene.viewShadow[1]*vec4(pos4);
-  shadowPos[0] = shInp.shadowPos[0];
-  shadowPos[1] = shInp.shadowPos[1];
+  vec4 pos4 = vec4(shInp.pos,1);
+  shadowPos[0] = scene.viewShadow[0]*vec4(pos4);
+  shadowPos[1] = scene.viewShadow[1]*vec4(pos4);
+  // shadowPos[0] = shInp.shadowPos[0];
+  // shadowPos[1] = shInp.shadowPos[1];
 
   vec3 shPos0  = (shadowPos[0].xyz)/shadowPos[0].w;
   vec3 shPos1  = (shadowPos[1].xyz)/shadowPos[1].w;
@@ -75,11 +76,12 @@ vec4 dbgLambert() {
   }
 
 vec3 flatNormal() {
-  const vec2  fragCoord = (gl_FragCoord.xy*scene.screenResInv)*2.0-vec2(1.0);
-  const vec4  scr       = vec4(fragCoord.x, fragCoord.y, gl_FragCoord.z, 1.0)/gl_FragCoord.w;
-  const vec4  pos4      = scene.viewProjectInv * scr;
+  // const vec2  fragCoord = (gl_FragCoord.xy*scene.screenResInv)*2.0-vec2(1.0);
+  // const vec4  scr       = vec4(fragCoord.x, fragCoord.y, gl_FragCoord.z, 1.0)/gl_FragCoord.w;
+  // const vec4  pos4      = scene.viewProjectInv * scr;
+  // vec3 pos = pos4.xyz/pos4.w;
 
-  vec3 pos = pos4.xyz/pos4.w;
+  vec3 pos = shInp.pos;
   vec3 dx  = dFdx(pos);
   vec3 dy  = dFdy(pos);
   return /*normalize*/(cross(dx,dy));
@@ -91,10 +93,10 @@ vec3 calcLight() {
 
 #if (MESH_TYPE==T_LANDSCAPE)
   // fix self-shadowed surface
-  // float flatSh = dot(scene.sunDir,flatNormal());
-  // if(flatSh<=0) {
-  //   lambert = 0;
-  //   }
+  float flatSh = dot(scene.sunDir,flatNormal());
+  if(flatSh<=0) {
+    lambert = 0;
+    }
 #endif
 
   float light   = lambert*calcShadow();

shader/materials/main.tese

@@ -39,8 +39,6 @@ vec3 multiWave(vec2 at) {
 void main() {
   shOut.uv           = interpolate(shInp[0].uv,           shInp[1].uv,           shInp[2].uv);
 #if !defined(DEPTH_ONLY)
-  shOut.shadowPos[0] = interpolate(shInp[0].shadowPos[0], shInp[1].shadowPos[0], shInp[2].shadowPos[0]);
-  shOut.shadowPos[1] = interpolate(shInp[0].shadowPos[1], shInp[1].shadowPos[1], shInp[2].shadowPos[1]);
   shOut.normal       = interpolate(shInp[0].normal,       shInp[1].normal,       shInp[2].normal);
   shOut.pos          = interpolate(shInp[0].pos,          shInp[1].pos,          shInp[2].pos);
 #endif
@@ -54,8 +52,6 @@ void main() {
 
   pos                += scene.viewProject*vec4(dPos,0);
   shOut.pos          += dPos;
-  shOut.shadowPos[0] += scene.viewShadow[0] * vec4(dPos,0);
-  shOut.shadowPos[1] += scene.viewShadow[1] * vec4(dPos,0);
 
   //shOut.normal += dPos;
   //shOut.normal = normalize(shOut.normal);

shader/materials/materials_common.glsl

@@ -79,11 +79,7 @@ struct Varyings {
 #endif
 
 #if !defined(DEPTH_ONLY)
-  vec4 shadowPos[2];
   vec3 normal;
-#endif
-
-#if defined(WATER)
   vec3 pos;
 #endif
 

shader/materials/vertex_process.glsl

@@ -126,13 +126,8 @@ Varyings processVertex(out vec4 position, uint objId, uint vboOffset) {
 #endif
 
 #if !defined(DEPTH_ONLY)
-  shOut.shadowPos[0] = scene.viewShadow[0]*vec4(pos,1.0);
-  shOut.shadowPos[1] = scene.viewShadow[1]*vec4(pos,1.0);
-  shOut.normal       = normal;
-#endif
-
-#if defined(WATER)
-  shOut.pos = pos;
+  shOut.normal = normal;
+  shOut.pos    = pos;
 #endif
 
 #if defined(MAT_COLOR)