misc cleanup

Author: jdupuy

terrain/shaders/TerrainRenderCS.glsl

@@ -29,7 +29,7 @@ void main()
     );
 
     // compute final vertex attributes
-    ClipSpaceAttribute attrib = TessellateClipSpaceTriangle(
+    VertexAttribute attrib = TessellateTriangle(
         triangleTexCoords,
         i_VertexPos
     );
@@ -41,10 +41,10 @@ void main()
     screenPos.xy*= 1.0f * vec2(1.0f, 1920.0f / 720.0f);
     gl_Position = vec4(screenPos, 1.0);
 #else
-    gl_Position = u_ViewProjectionMatrix * attrib.position;
+    gl_Position = u_ModelViewProjectionMatrix * attrib.position;
 #endif
     o_TexCoord  = attrib.texCoord;
-    o_WorldPos = attrib.position.xyz;
+    o_WorldPos  = (u_ModelMatrix * attrib.position).xyz;
 }
 #endif
 

terrain/shaders/TerrainRenderCS_Wire.glsl

@@ -30,7 +30,7 @@ void main()
     );
 
     // compute final vertex attributes
-    ClipSpaceAttribute attrib = TessellateClipSpaceTriangle(
+    VertexAttribute attrib = TessellateTriangle(
         triangleTexCoords,
         i_VertexPos
     );
@@ -42,10 +42,10 @@ void main()
     screenPos.xy*= 1.0f * vec2(1.0f, 1920.0f / 720.0f);
     gl_Position = vec4(screenPos, 1.0);
 #else
-    gl_Position = u_ViewProjectionMatrix * attrib.position;
+    gl_Position = u_ModelViewProjectionMatrix * attrib.position;
 #endif
     o_TexCoord  = attrib.texCoord;
-    o_WorldPos = attrib.position.xyz;
+    o_WorldPos  = (u_ModelMatrix * attrib.position).xyz;
 }
 #endif
 

terrain/shaders/TerrainRenderCommon.glsl

@@ -200,10 +200,6 @@ bool FrustumCullingTest(in const vec4[3] patchVertices)
 {
     vec3 bmin = min(min(patchVertices[0].xyz, patchVertices[1].xyz), patchVertices[2].xyz);
     vec3 bmax = max(max(patchVertices[0].xyz, patchVertices[1].xyz), patchVertices[2].xyz);
-#   if FLAG_DISPLACE
-    bmin.z = 0.0;
-    bmax.z = u_DmapFactor;
-#   endif
 
     return FrustumCullingTest(u_FrustumPlanes, bmin, bmax);
 }
@@ -255,45 +251,23 @@ vec4 BarycentricInterpolation(in vec4 v[3], in vec2 u)
  * GenerateVertex -- Computes the final vertex position
  *
  */
-struct ClipSpaceAttribute {
+struct VertexAttribute {
     vec4 position;
     vec2 texCoord;
 };
 
-ClipSpaceAttribute TessellateClipSpaceTriangle(
-    in const vec4 vertexPositions[3],
-    in const vec2 vertexTexCoords[3],
-    in vec2 tessellationCoordinate
-) {
-    // compute final attributes
-    vec4 position = BarycentricInterpolation(vertexPositions, tessellationCoordinate);
-    vec2 texCoord = BarycentricInterpolation(vertexTexCoords, tessellationCoordinate);
-
-#if FLAG_DISPLACE
-    // displace the surface in clip space
-    vec4 upDir = u_ModelViewProjectionMatrix[2];
-    float z = u_DmapFactor * textureLod(u_DmapSampler, texCoord, 0.0).r;
-
-    position+= upDir * z;
-#endif
-
-    return ClipSpaceAttribute(position, texCoord);
-}
-
-ClipSpaceAttribute TessellateClipSpaceTriangle(
-    in const vec2 vertexTexCoords[3],
-    in vec2 tessellationCoordinate
+VertexAttribute TessellateTriangle(
+    in const vec2 texCoords[3],
+    in vec2 tessCoord
 ) {
-    // compute final attributes
-    vec2 texCoord = BarycentricInterpolation(vertexTexCoords, tessellationCoordinate);
+    vec2 texCoord = BarycentricInterpolation(texCoords, tessCoord);
     vec4 position = vec4(texCoord, 0, 1);
 
 #if FLAG_DISPLACE
-    float z = u_DmapFactor * textureLod(u_DmapSampler, texCoord, 0.0).r;
-    position.z = z;
+    position.z = u_DmapFactor * textureLod(u_DmapSampler, texCoord, 0.0).r;
 #endif
 
-    return ClipSpaceAttribute(u_ModelMatrix * position, texCoord);
+    return VertexAttribute(position, texCoord);
 }
 
 

terrain/shaders/TerrainRenderGS.glsl

@@ -53,15 +53,15 @@ GenerateVertex(
     in vec2 tessCoord
 ) {
     // compute final vertex attributes
-    ClipSpaceAttribute attrib = TessellateClipSpaceTriangle(
+    VertexAttribute attrib = TessellateTriangle(
         triangleTexCoords,
         tessCoord
     );
 
     // set varyings and emit vertex
-    o_WorldPos  = attrib.position.xyz;
+    o_WorldPos  = (u_ModelMatrix * attrib.position).xyz;
     o_TexCoord  = attrib.texCoord;
-    gl_Position = u_ViewProjectionMatrix * attrib.position;
+    gl_Position = u_ModelViewProjectionMatrix * attrib.position;
     EmitVertex();
 }
 

terrain/shaders/TerrainRenderGS_Wire.glsl

@@ -51,13 +51,13 @@ vec2[3] DecodeTriangleTexCoords(in const cbt_Node node)
 }
 
 void EmitTriangle(
-    inout ClipSpaceAttribute v0,
-    inout ClipSpaceAttribute v1,
-    inout ClipSpaceAttribute v2
+    inout VertexAttribute v0,
+    inout VertexAttribute v1,
+    inout VertexAttribute v2
 ) {
-    vec4 c0 = u_ViewProjectionMatrix * v0.position;
-    vec4 c1 = u_ViewProjectionMatrix * v1.position;
-    vec4 c2 = u_ViewProjectionMatrix * v2.position;
+    vec4 c0 = u_ModelViewProjectionMatrix * v0.position;
+    vec4 c1 = u_ModelViewProjectionMatrix * v1.position;
+    vec4 c2 = u_ModelViewProjectionMatrix * v2.position;
     vec2 p0 = u_ScreenResolution * c0.xy / c0.w;
     vec2 p1 = u_ScreenResolution * c1.xy / c1.w;
     vec2 p2 = u_ScreenResolution * c2.xy / c2.w;
@@ -68,19 +68,19 @@ void EmitTriangle(
 
     gl_Position = c0;
     o_TexCoord  = v0.texCoord;
-    o_WorldPos = v0.position.xyz;
+    o_WorldPos  = (u_ModelMatrix * v0.position).xyz;
     o_Distance = vec3(area / length(u0), 0, 0);
     EmitVertex();
 
     gl_Position = c1;
     o_TexCoord  = v1.texCoord;
-    o_WorldPos = v1.position.xyz;
+    o_WorldPos  = (u_ModelMatrix * v1.position).xyz;
     o_Distance = vec3(0, area / length(u1), 0);
     EmitVertex();
 
     gl_Position = c2;
     o_TexCoord  = v2.texCoord;
-    o_WorldPos = v2.position.xyz;
+    o_WorldPos  = (u_ModelMatrix * v2.position).xyz;
     o_Distance = vec3(0, 0, area / length(u2));
     EmitVertex();
 
@@ -138,15 +138,15 @@ void main()
             only one triangle.
         */
 #if TERRAIN_PATCH_SUBD_LEVEL == 0
-        ClipSpaceAttribute v0 = TessellateClipSpaceTriangle(
+        VertexAttribute v0 = TessellateTriangle(
             triangleTexCoords,
             vec2(0, 1)
         );
-        ClipSpaceAttribute v1 = TessellateClipSpaceTriangle(
+        VertexAttribute v1 = TessellateTriangle(
             triangleTexCoords,
             vec2(0, 0)
         );
-        ClipSpaceAttribute v2 = TessellateClipSpaceTriangle(
+        VertexAttribute v2 = TessellateTriangle(
             triangleTexCoords,
             vec2(1, 0)
         );
@@ -159,19 +159,19 @@ void main()
         for (uint nodeID = minNodeID; nodeID < maxNodeID; ++nodeID) {
             cbt_Node node = cbt_CreateNode(nodeID, nodeDepth);
             vec2 tessCoords[3] = DecodeTriangleTexCoords(node);
-            ClipSpaceAttribute v0 = TessellateClipSpaceTriangle(
+            VertexAttribute v0 = TessellateTriangle(
                 triangleTexCoords,
                 tessCoords[2]
             );
-            ClipSpaceAttribute v1 = TessellateClipSpaceTriangle(
+            VertexAttribute v1 = TessellateTriangle(
                 triangleTexCoords,
                 tessCoords[1]
             );
-            ClipSpaceAttribute v2 = TessellateClipSpaceTriangle(
+            VertexAttribute v2 = TessellateTriangle(
                 triangleTexCoords,
                 (tessCoords[0] + tessCoords[2]) / 2.0f
             );
-            ClipSpaceAttribute v3 = TessellateClipSpaceTriangle(
+            VertexAttribute v3 = TessellateTriangle(
                 triangleTexCoords,
                 tessCoords[0]
             );

terrain/shaders/TerrainRenderTS.glsl

@@ -25,7 +25,7 @@ void main()
 #ifdef TESS_CONTROL_SHADER
 layout (vertices = 1) out;
 out PatchData {
-    vec4 packedData[4];
+    vec2 texCoords[3];
 } o_Patch[];
 
 
@@ -67,11 +67,10 @@ void main()
     if (true) {
 #endif
         // set output data
-        o_Patch[gl_InvocationID].packedData  = vec4[4](
-            u_ModelViewProjectionMatrix * vec4(triangleVertices[0].xy, 0.0f, 1.0f),
-            u_ModelViewProjectionMatrix * vec4(triangleVertices[1].xy, 0.0f, 1.0f),
-            u_ModelViewProjectionMatrix * vec4(triangleVertices[2].xy, 0.0f, 1.0f),
-            vec4(triangleVertices[0].xy, triangleVertices[1].xy)
+        o_Patch[gl_InvocationID].texCoords  = vec2[3](
+            triangleVertices[0].xy,
+            triangleVertices[1].xy,
+            triangleVertices[2].xy
         );
 
         // set tess levels
@@ -98,37 +97,24 @@ void main()
 #ifdef TESS_EVALUATION_SHADER
 layout (triangles, ccw, equal_spacing) in;
 in PatchData {
-    vec4 packedData[4];
+    vec2 texCoords[3];
 } i_Patch[];
 
 layout(location = 0) out vec2 o_TexCoord;
 layout(location = 1) out vec3 o_WorldPos;
 
 void main()
 {
-    // unpack triangle attributes
-    vec4 trianglePositions[3] = vec4[3](
-        i_Patch[0].packedData[0],
-        i_Patch[0].packedData[1],
-        i_Patch[0].packedData[2]
-    );
-    vec2 tmp = i_Patch[0].packedData[3].xy - i_Patch[0].packedData[3].zw;
-    vec2 triangleTexCoords[3] = vec2[3](
-        i_Patch[0].packedData[3].xy,
-        i_Patch[0].packedData[3].zw,
-        i_Patch[0].packedData[3].zw + vec2(tmp.y, -tmp.x)
-    );
-
     // compute final vertex attributes
-    ClipSpaceAttribute attrib = TessellateClipSpaceTriangle(
-        triangleTexCoords,
+    VertexAttribute attrib = TessellateTriangle(
+        i_Patch[0].texCoords,
         gl_TessCoord.xy
     );
 
     // set varyings
-    gl_Position = u_ViewProjectionMatrix * attrib.position;
+    gl_Position = u_ModelViewProjectionMatrix * attrib.position;
     o_TexCoord  = attrib.texCoord;
-    o_WorldPos  = attrib.position.xyz;
+    o_WorldPos  = (u_ModelMatrix * attrib.position).xyz;
 }
 #endif
 

terrain/shaders/TerrainRenderTS_Wire.glsl

@@ -121,15 +121,15 @@ void main()
     );
 
     // compute final vertex attributes
-    ClipSpaceAttribute attrib = TessellateClipSpaceTriangle(
+    VertexAttribute attrib = TessellateTriangle(
         triangleTexCoords,
         gl_TessCoord.xy
     );
 
     // set varyings
-    gl_Position = u_ViewProjectionMatrix * attrib.position;
+    gl_Position = u_ModelViewProjectionMatrix * attrib.position;
     o_TexCoord  = attrib.texCoord;
-    o_WorldPos  = attrib.position.xyz;
+    o_WorldPos  = (u_ModelMatrix * attrib.position).xyz;
 }
 #endif