Update matrices & unit tests

technologists-team · Oct 26, 2024 · 0f6e698 · 0f6e698
1 parent 139933b
commit 0f6e698
Show file tree

Hide file tree

Showing 17 changed files with 576 additions and 532 deletions.
diff --git a/Hypercube.Client/Graphics/Realisation/OpenGL/Rendering/Renderer.Drawing.cs b/Hypercube.Client/Graphics/Realisation/OpenGL/Rendering/Renderer.Drawing.cs
@@ -14,7 +14,7 @@ public void DrawPoint(Vector2 vector, Color color)
         DrawPoint(vector, color, Matrix4X4.Identity);
     }
 
-    public void DrawPoint(Vector2 vector, Color color, Matrix3X3 model)
+    public void DrawPoint(Vector2 vector, Color color, Matrix3x3 model)
     {
         DrawPoint(vector, color, Matrix4X4.CreateIdentity(model));
     }
@@ -31,7 +31,7 @@ public void DrawLine(Vector2 pointA, Vector2 pointB, Color color)
         DrawLine(pointA, pointB, color, Matrix4X4.Identity);
     }
 
-    public void DrawLine(Vector2 pointA, Vector2 pointB, Color color, Matrix3X3 model)
+    public void DrawLine(Vector2 pointA, Vector2 pointB, Color color, Matrix3x3 model)
     {
         DrawLine(pointA, pointB, color, Matrix4X4.CreateIdentity(model));
     }
@@ -46,7 +46,7 @@ public void DrawLine(Box2 box, Color color)
         DrawLine(box, color, Matrix4X4.Identity);
     }
 
-    public void DrawLine(Box2 box, Color color, Matrix3X3 model)
+    public void DrawLine(Box2 box, Color color, Matrix3x3 model)
     {
         DrawLine(box, color, Matrix4X4.CreateIdentity(model));
     }
@@ -62,7 +62,7 @@ public void DrawCircle(Circle circle, Color color)
         DrawCircle(circle, color, Matrix4X4.Identity);
     }
 
-    public void DrawCircle(Circle circle, Color color, Matrix3X3 model)
+    public void DrawCircle(Circle circle, Color color, Matrix3x3 model)
     {
         DrawCircle(circle, color, Matrix4X4.CreateIdentity(model));
     }
@@ -78,7 +78,7 @@ public void DrawRectangle(Box2 box, Color color, bool outline = false)
         DrawRectangle(box, color, Matrix4X4.Identity, outline);
     }
 
-    public void DrawRectangle(Box2 box, Color color, Matrix3X3 model, bool outline = false)
+    public void DrawRectangle(Box2 box, Color color, Matrix3x3 model, bool outline = false)
     {
         DrawRectangle(box, color, Matrix4X4.CreateIdentity(model), outline);
     }
@@ -94,7 +94,7 @@ public void DrawPolygon(Vector2[] vertices, Color color, bool outline = false)
         DrawPolygon(vertices, color, Matrix4X4.Identity, outline);
     }
 
-    public void DrawPolygon(Vector2[] vertices, Color color, Matrix3X3 model, bool outline = false)
+    public void DrawPolygon(Vector2[] vertices, Color color, Matrix3x3 model, bool outline = false)
     {
         DrawPolygon(vertices, color, Matrix4X4.CreateIdentity(model), outline);
     }
@@ -149,7 +149,7 @@ public void DrawTexture(ITextureHandle texture, Box2 quad, Box2 uv, Color color)
         DrawTexture(texture, quad, uv, color, Matrix4X4.Identity);
     }
 
-    public void DrawTexture(ITextureHandle texture, Box2 quad, Box2 uv, Color color, Matrix3X3 model)
+    public void DrawTexture(ITextureHandle texture, Box2 quad, Box2 uv, Color color, Matrix3x3 model)
     {
         DrawTexture(texture, quad, uv, color, Matrix4X4.CreateIdentity(model));
     }

diff --git a/Hypercube.Client/Graphics/Rendering/IRenderer.cs b/Hypercube.Client/Graphics/Rendering/IRenderer.cs
@@ -26,22 +26,22 @@ public interface IRenderer
 
     // Drawing
     void DrawPoint(Vector2 vector, Color color);
-    void DrawPoint(Vector2 vector, Color color, Matrix3X3 model);
+    void DrawPoint(Vector2 vector, Color color, Matrix3x3 model);
     void DrawPoint(Vector2 vector, Color color, Matrix4X4 model);
     void DrawLine(Vector2 pointA, Vector2 pointB, Color color);
-    void DrawLine(Vector2 pointA, Vector2 pointB, Color color, Matrix3X3 model);
+    void DrawLine(Vector2 pointA, Vector2 pointB, Color color, Matrix3x3 model);
     void DrawLine(Vector2 pointA, Vector2 pointB, Color color, Matrix4X4 model);
     void DrawLine(Box2 box, Color color);
-    void DrawLine(Box2 box, Color color, Matrix3X3 model);
+    void DrawLine(Box2 box, Color color, Matrix3x3 model);
     void DrawLine(Box2 box, Color color, Matrix4X4 model);
     void DrawCircle(Circle circle, Color color);
-    void DrawCircle(Circle circle, Color color, Matrix3X3 model);
+    void DrawCircle(Circle circle, Color color, Matrix3x3 model);
     void DrawCircle(Circle circle, Color color, Matrix4X4 model);
     void DrawRectangle(Box2 box, Color color, bool outline = false);
-    void DrawRectangle(Box2 box, Color color, Matrix3X3 model, bool outline = false);
+    void DrawRectangle(Box2 box, Color color, Matrix3x3 model, bool outline = false);
     void DrawRectangle(Box2 box, Color color, Matrix4X4 model, bool outline = false);
     void DrawPolygon(Vector2[] vertices, Color color, bool outline = false);
-    void DrawPolygon(Vector2[] vertices, Color color, Matrix3X3 model, bool outline = false);
+    void DrawPolygon(Vector2[] vertices, Color color, Matrix3x3 model, bool outline = false);
     void DrawPolygon(Vector2[] vertices, Color color, Matrix4X4 model, bool outline = false);
     void DrawTexture(ITextureHandle texture, Box2 quad, Box2 uv, Color color);
     void DrawTexture(ITextureHandle texture, Box2 quad, Box2 uv, Color color, Matrix4X4 model);

diff --git a/Hypercube.Graphics/Shaders/IShaderProgram.cs b/Hypercube.Graphics/Shaders/IShaderProgram.cs
@@ -30,7 +30,7 @@ public interface IShaderProgram : IDisposable
     void SetUniform(string name, Vector2i value);
     void SetUniform(string name, Vector3 value);
 
-    void SetUniform(string name, Matrix3X3 value, bool transpose = false);
+    void SetUniform(string name, Matrix3x3 value, bool transpose = false);
     void SetUniform(string name, Matrix4X4 value, bool transpose = false);
 
     void Label(string name);