Merge pull request #119 from MilchRatchet/dev-collision-vis

Improved collision visualization

Author: MilchRatchet

LibReplanetizer/Models/Collision.cs

@@ -104,16 +104,16 @@ public Collision(FileStream fs, int collisionPointer)
                             uint f1 = totalVertexCount + b0;
                             uint f2 = totalVertexCount + b1;
                             uint f3 = totalVertexCount + b2;
-                            indexList.Add(f1);
                             indexList.Add(f2);
+                            indexList.Add(f1);
                             indexList.Add(f3);
 
                             if (f < rCount)
                             {
                                 int rOffset = vOffset + 4 + (12 * vertexCount) + (faceCount * 4) + f;
                                 uint f4 = totalVertexCount + collision[rOffset];
-                                indexList.Add(f1);
                                 indexList.Add(f3);
+                                indexList.Add(f1);
                                 indexList.Add(f4);
                                 collisionType[collision[rOffset]] = b3;
                             }

Replanetizer/Renderer/CollisionRenderer.cs

@@ -114,6 +114,9 @@ public override void Render(RendererPayload payload)
             shaderTable.collisionShader.UseShader();
             GL.PolygonMode(TriangleFace.FrontAndBack, PolygonMode.Fill);
 
+            GL.Enable(EnableCap.CullFace);
+            GL.CullFace(TriangleFace.Back);
+
             for (int i = 0; i < numCollisions; i++)
             {
                 if (!payload.visibility.chunks[i]) continue;
@@ -122,6 +125,8 @@ public override void Render(RendererPayload payload)
                 GL.DrawElements(PrimitiveType.Triangles, indexCount[i], DrawElementsType.UnsignedInt, 0);
             }
 
+            GL.Disable(EnableCap.CullFace);
+
             GLUtil.CheckGlError("CollisionRenderer");
         }
 

Replanetizer/Renderer/LevelRenderer.cs

@@ -268,6 +268,30 @@ public override void Render(RendererPayload payload)
                         1.0f - levelVariables.fogFarIntensity / 255.0f);
             }
 
+            shaderTable.colorShader.UseShader();
+            shaderTable.colorShader.SetUniform1(UniformName.useFog, (useFog) ? 1 : 0);
+
+            if (useFog && levelVariables != null)
+            {
+                shaderTable.colorShader.SetUniform4(UniformName.fogColor, levelVariables.fogColor);
+                shaderTable.colorShader.SetUniform4(UniformName.fogParams, levelVariables.fogNearDistance / 1024.0f,
+                        1024.0f / (levelVariables.fogFarDistance - levelVariables.fogNearDistance),
+                        1.0f - levelVariables.fogNearIntensity / 255.0f,
+                        1.0f - levelVariables.fogFarIntensity / 255.0f);
+            }
+
+            shaderTable.collisionShader.UseShader();
+            shaderTable.collisionShader.SetUniform1(UniformName.useFog, (useFog) ? 1 : 0);
+
+            if (useFog && levelVariables != null)
+            {
+                shaderTable.collisionShader.SetUniform4(UniformName.fogColor, levelVariables.fogColor);
+                shaderTable.collisionShader.SetUniform4(UniformName.fogParams, levelVariables.fogNearDistance / 1024.0f,
+                        1024.0f / (levelVariables.fogFarDistance - levelVariables.fogNearDistance),
+                        1.0f - levelVariables.fogNearIntensity / 255.0f,
+                        1.0f - levelVariables.fogFarIntensity / 255.0f);
+            }
+
             dirLightsBuffer.Update(lights);
             dirLightsBuffer.Bind();
 

Replanetizer/Replanetizer.csproj

@@ -84,16 +84,16 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="Shaders\collisionshaderfs.glsl">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="Shaders\collisionshadervs.glsl">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="Shaders\colorshaderfs.glsl">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="Shaders\colorshadervs.glsl">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="Shaders\fs.glsl">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

Replanetizer/Shaders/collisionshaderfs.glsl

@@ -2,10 +2,14 @@
 
 // Interpolated values from the vertex shaders
 in vec4 diffuseColors;
+in float fogBlend;
 
 // Ouput data
-out vec4 color;
+layout(location = 0) out vec4 color;
+
+uniform vec4 fogColor;
 
 void main() {
     color = diffuseColors / 255.0f;
+    color.xyz = (fogColor.xyz - color.xyz) * fogBlend + color.xyz;
 }

Replanetizer/Shaders/collisionshadervs.glsl

@@ -6,14 +6,27 @@ layout(location = 1) in vec4 vertexColors;
 
 // Output data ; will be interpolated for each fragment.
 out vec4 diffuseColors;
+out float fogBlend;
 
 // Values that stay constant for the whole mesh.
 uniform mat4 worldToView;
+uniform int useFog;
+uniform vec4 fogParams;
 
 void main() {
     // Output position of the vertex, in clip space : MVP * position
     gl_Position = worldToView * vec4(vertexPosition_modelspace, 1.0f);
 
     // UV of the vertex. No special space for this one.
     diffuseColors = vertexColors;
+
+    fogBlend = 0.0f;
+
+    if (useFog == 1) {
+        float depth = gl_Position.w - fogParams.x;
+
+        depth = clamp(depth * fogParams.y, 0.0f, 1.0f);
+
+        fogBlend = fogParams.z + depth * fogParams.w;
+    }
 }

Replanetizer/Shaders/colorshaderfs.glsl

@@ -3,6 +3,7 @@
 // Interpolated values from the vertex shaders
 //in vec2 UV;
 in vec4 DiffuseColor;
+in float fogBlend;
 
 // Ouput data
 layout(location = 0) out vec4 color;
@@ -12,8 +13,11 @@ layout(location = 1) out int id;
 uniform sampler2D mainTexture;
 uniform int levelObjectType;
 uniform int levelObjectNumber;
+uniform vec4 fogColor;
 
 void main() {
 	color = vec4(DiffuseColor.rgb, 1.0f);
 	id = (levelObjectType << 24) | levelObjectNumber;
+
+    color.xyz = (fogColor.xyz - color.xyz) * fogBlend + color.xyz;
 }

Replanetizer/Shaders/colorshadervs.glsl

@@ -5,16 +5,29 @@ layout(location = 0) in vec3 vertexPosition_modelspace;
 
 // Output data ; will be interpolated for each fragment.
 out vec4 DiffuseColor;
+out float fogBlend;
 
 // Values that stay constant for the whole mesh.
 uniform mat4 worldToView;
 uniform mat4 modelToWorld;
 uniform vec4 incolor;
+uniform int useFog;
+uniform vec4 fogParams;
 
 void main() {
 	// Output position of the vertex, in clip space : MVP * position
 	gl_Position = worldToView * (modelToWorld * vec4(vertexPosition_modelspace, 1.0f));
 
 	// UV of the vertex. No special space for this one.
 	DiffuseColor = incolor;
+
+    fogBlend = 0.0f;
+
+    if (useFog == 1) {
+        float depth = gl_Position.w - fogParams.x;
+
+        depth = clamp(depth * fogParams.y, 0.0f, 1.0f);
+
+        fogBlend = fogParams.z + depth * fogParams.w;
+    }
 }