Adapt vertex shader normal computations for sphere

bozbalci · Jan 10, 2020 · f642959 · f642959
1 parent d05aaf7
commit f642959
Showing 1 changed file with 2 additions and 43 deletions.
diff --git a/assignments/hw3/src/shaders/sphere.vert b/assignments/hw3/src/shaders/sphere.vert
@@ -18,56 +18,15 @@ out vec3 ToCamera;
 out vec3 ToLight;
 out vec3 VertexNormal;
 
-vec3 ComputeNeighbor(in vec3 Offset)
-{
-    vec3 NeighborPosition = Position + Offset;
-    vec2 NeighborTextureCoordinate = vec2(-NeighborPosition.x + TextureHorizontalShift / TextureWidth,
-                                          -NeighborPosition.z);
-    vec4 NeighborHeightMapColor = texture(HeightMap, NeighborTextureCoordinate);
-    float Height = HeightFactor * NeighborHeightMapColor.r;
-    NeighborPosition.y = Height;
-    return NeighborPosition;
-}
-
-vec3 ComputeNormal(in float Height)
-{
-    vec3 Current = vec3(Position.x, Height, Position.z);
-    vec3 Left = ComputeNeighbor(vec3(-1, 0, 0));
-    vec3 Right = ComputeNeighbor(vec3(1, 0, 0));
-    vec3 Top = ComputeNeighbor(vec3(0, 0, 1));
-    vec3 Bottom = ComputeNeighbor(vec3(0, 0, -1));
-    vec3 TopRight = ComputeNeighbor(vec3(1, 0, 1));
-    vec3 BottomLeft = ComputeNeighbor(vec3(-1, 0, -1));
-
-    vec3 ToLeft = Left - Current;
-    vec3 ToRight = Right - Current;
-    vec3 ToTop = Top - Current;
-    vec3 ToBottom = Bottom - Current;
-    vec3 ToTopRight = TopRight - Current;
-    vec3 ToBottomLeft = BottomLeft - Current;
-
-    vec3 Norm1 = -cross(ToTop, ToLeft);
-    vec3 Norm2 = -cross(ToTopRight, ToTop);
-    vec3 Norm3 = -cross(ToRight, ToTopRight);
-    vec3 Norm4 = -cross(ToBottom, ToRight);
-    vec3 Norm5 = -cross(ToBottomLeft, ToBottom);
-    vec3 Norm6 = -cross(ToLeft, ToBottomLeft);
-
-    vec3 Norm = (Norm1 + Norm2 + Norm3 + Norm4 + Norm5 + Norm6) / 6.0f;
-    return normalize(Norm);
-}
-
 void main()
 {
     VertexTextureCoordinate = vec2(TextureCoordinate.x + (TextureHorizontalShift / TextureWidth),
                                    TextureCoordinate.y);
 
-    vec4 TextureColor = texture(Texture, VertexTextureCoordinate);
+    VertexNormal = normalize(Position);
     vec4 HeightMapColor = texture(HeightMap, VertexTextureCoordinate);
-    float Height = HeightFactor * HeightMapColor.r;
-    vec4 CalculatedPosition = vec4(Position.x, Height, Position.z, 1.0f);
+    vec4 CalculatedPosition = vec4(Position + HeightFactor * HeightMapColor.r * VertexNormal, 1.0f);
 
-    VertexNormal = ComputeNormal(Height);
     ToLight = normalize(LightPosition - CalculatedPosition.xyz);
     ToCamera = normalize(CameraPosition - CalculatedPosition.xyz);