refactor: rename property name. update README.md

zzxzzk115 · Nov 2, 2023 · b76f1ac · b76f1ac
1 parent dc78ae1
commit b76f1ac
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 34 deletions.
diff --git a/README.md b/README.md
@@ -39,27 +39,26 @@
         ```c++
         struct GouraudShader : public VGLShaderBase
         {
-            int TextureSlot;
-            Vector3Float LightDirection;
+            int BindTextureSlot;
 
-            Matrix4 MVP;
+            Vector3Float UniformLightDirection;
+            Matrix4      UniformMVP;
 
-            Vector3Float              VaryingIntensity; // written by vertex shader, read by fragment shader
+            Vector3Float              VaryingIntensity;
             std::vector<Vector2Float> VaryingUVs {3};
 
-            virtual Vector3Float vert(Vertex& vertex, int vertexIndexInFace) override
+            virtual void vert(Vertex& vertex, int vertexIndexInFace, Vector3Float& gl_Position) override
             {
-                VaryingIntensity[vertexIndexInFace] = std::max(0.0f, LightDirection * vertex.Normal);
+                VaryingIntensity[vertexIndexInFace] = std::max(0.0f, UniformLightDirection * vertex.Normal);
                 VaryingUVs[vertexIndexInFace] = vertex.UV;
-                Vector3Float glVertex = MVP * VGLShaderBase::vert(vertex, vertexIndexInFace);
-                return glVertex;
+                gl_Position = UniformMVP * vertex.Position;
             }
 
-            virtual bool frag(Vector3Float bc, VSoftRenderer::Color& color) override
+            virtual bool frag(Vector3Float bc, VGL::Color& gl_FragColor) override
             {
                 float intensity = VaryingIntensity * bc;
                 Vector2Float uv = VaryingUVs[0] * bc.X + VaryingUVs[1] * bc.Y + VaryingUVs[2] * bc.Z;
-                color = sample2D(TextureSlot, uv.X, uv.Y) * intensity;
+                gl_FragColor = sample2D(BindTextureSlot, uv.X, uv.Y) * intensity;
                 return false;
             }
         };
@@ -90,9 +89,9 @@
       glBindTexture(0, texture);
 
       GouraudShader shader = {};
-      shader.MVP = mvp;
-      shader.LightDirection = light.GetDirection();
-      shader.TextureSlot = 0;
+      shader.UniformMVP = mvp;
+      shader.UniformLightDirection = light.GetDirection();
+      shader.BindTextureSlot = 0;
 
       glBindShader(0, &shader);
 

diff --git a/Renderer/Application/main.cpp b/Renderer/Application/main.cpp
@@ -36,27 +36,26 @@ void DrawFrameBuffer()
 
 struct GouraudShader : public VGLShaderBase
 {
-    int TextureSlot;
-    Vector3Float LightDirection;
+    int BindTextureSlot;
 
-    Matrix4 MVP;
+    Vector3Float UniformLightDirection;
+    Matrix4      UniformMVP;
 
-    Vector3Float              VaryingIntensity; // written by vertex shader, read by fragment shader
+    Vector3Float              VaryingIntensity;
     std::vector<Vector2Float> VaryingUVs {3};
 
-    virtual Vector3Float vert(Vertex& vertex, int vertexIndexInFace) override
+    virtual void vert(Vertex& vertex, int vertexIndexInFace, Vector3Float& gl_Position) override
     {
-        VaryingIntensity[vertexIndexInFace] = std::max(0.0f, LightDirection * vertex.Normal);
+        VaryingIntensity[vertexIndexInFace] = std::max(0.0f, UniformLightDirection * vertex.Normal);
         VaryingUVs[vertexIndexInFace] = vertex.UV;
-        Vector3Float glVertex = MVP * VGLShaderBase::vert(vertex, vertexIndexInFace);
-        return glVertex;
+        gl_Position = UniformMVP * vertex.Position;
     }
 
-    virtual bool frag(Vector3Float bc, VGL::Color& color) override
+    virtual bool frag(Vector3Float bc, VGL::Color& gl_FragColor) override
     {
         float intensity = VaryingIntensity * bc;
         Vector2Float uv = VaryingUVs[0] * bc.X + VaryingUVs[1] * bc.Y + VaryingUVs[2] * bc.Z;
-        color = sample2D(TextureSlot, uv.X, uv.Y) * intensity;
+        gl_FragColor = sample2D(BindTextureSlot, uv.X, uv.Y) * intensity;
         return false;
     }
 };
@@ -197,9 +196,9 @@ int main()
     glBindTexture(0, texture);
 
     GouraudShader shader = {};
-    shader.MVP = mvp;
-    shader.LightDirection = light.GetDirection();
-    shader.TextureSlot = 0;
+    shader.UniformMVP = mvp;
+    shader.UniformLightDirection = light.GetDirection();
+    shader.BindTextureSlot = 0;
 
     glBindShader(0, &shader);
 

diff --git a/Renderer/VGL/include/VGL/VGL.h b/Renderer/VGL/include/VGL/VGL.h
@@ -20,8 +20,8 @@ namespace VGL
     {
         virtual ~VGLShaderBase() = default;
 
-        virtual Vector3Float vert(Vertex& vertex, int vertexIndexInFace);
-        virtual bool frag(Vector3Float bc, Color& color) = 0;
+        virtual void vert(Vertex& vertex, int vertexIndexInFace, Vector3Float& gl_Position) = 0;
+        virtual bool frag(Vector3Float bc, Color& gl_FragColor) = 0;
 
         Color sample2D(int textureSlot, float u, float v);
     };

diff --git a/Renderer/VGL/src/VGL.cpp b/Renderer/VGL/src/VGL.cpp
@@ -12,11 +12,6 @@ namespace VGL
 {
     VGLState g_vglState = {};
 
-    Vector3Float VGLShaderBase::vert(Vertex& vertex, int vertexIndexInFace)
-    {
-        return vertex.Position;
-    }
-
     Color VGLShaderBase::sample2D(int textureSlot, float u, float v)
     {
         if (g_vglState.TextureMap.count(textureSlot) == 0)
@@ -97,7 +92,9 @@ namespace VGL
                     throw std::runtime_error("No shader bound!");
                 }
 
-                screenCoords[v] = g_vglState.ViewportMatrix * g_vglState.UsingShader->vert(vertex, v);
+                Vector3Float position;
+                g_vglState.UsingShader->vert(vertex, v, position);
+                screenCoords[v] = g_vglState.ViewportMatrix * position;
             }
             Triangle3D::DrawInterpolated(screenCoords, g_vglState.UsingShader);
         }