Reworked Vector class

Author: danmunteanu

Editors/EditorGObject.cs

@@ -51,7 +51,7 @@ public override void SaveState(object item)
 
             obj.Name = txtName.Text;
 
-            Vector temp = obj.Origin;
+            Vector3D temp = obj.Origin;
             temp.X = (float)numX.Value;
             temp.Y = (float)numY.Value;
             temp.Z = (float)numZ.Value;

Editors/EditorPlane.cs

@@ -33,7 +33,7 @@ public override void SaveState(object item)
                 return;
 
             // Update the plane's normal
-            pl.Normal = new Vector(
+            pl.Normal = new Vector3D(
                 (float)numX.Value,
                 (float)numY.Value,
                 (float)numZ.Value

Engine/Camera.cs

@@ -4,8 +4,8 @@ public class Camera
     {
 
 
-        public Vector Eye { get; set; } = new Vector(0, 0, 1);
-        public Vector LookAt { get; set; } = new Vector();
+        public Vector3D Eye { get; set; } = new Vector3D(0, 0, 1);
+        public Vector3D LookAt { get; set; } = new Vector3D();
 
         //  defaults to a 4:3 aspect ratio
         public float ViewportWidth { get; set; } = 4;

Engine/Intersector.cs

@@ -1,7 +1,7 @@
 namespace Unilight
 {
     // Item1 = Origin, Item2 = Direction
-    using Ray = Tuple<Vector, Vector>;
+    using Ray = Tuple<Vector3D, Vector3D>;
 
     public class Intersector : Visitor
     {
@@ -25,13 +25,13 @@ public Ray? Ray
         public float Distance { get; set; } = float.MaxValue;
 
         // point of intersection (non-nullable now)
-        public Vector IntersectionPoint { get; set; } = Vector.Zero;
+        public Vector3D IntersectionPoint { get; set; } = Vector3D.Zero;
 
         private void intersectionMiss()
         {
             Result = IntersectionResult.Miss;
             Distance = float.MaxValue;
-            IntersectionPoint = Vector.Zero;
+            IntersectionPoint = Vector3D.Zero;
         }
 
         public void Visit(Plane p)
@@ -63,7 +63,7 @@ public void Visit(Sphere s)
                 return;
             }
 
-            Vector e = s.Origin - mRay.Item1;
+            Vector3D e = s.Origin - mRay.Item1;
             float a = e.Dot(mRay.Item2);
             float e2 = e.Length();
             e2 *= e2;
@@ -90,18 +90,18 @@ public void Visit(Triangle tri)
                 return;
             }
 
-            Vector origin = tri.Origin;
-            Vector v1 = tri.getV1() + origin;
-            Vector v2 = tri.getV2() + origin;
-            Vector v3 = tri.getV3() + origin;
+            Vector3D origin = tri.Origin;
+            Vector3D v1 = tri.getV1() + origin;
+            Vector3D v2 = tri.getV2() + origin;
+            Vector3D v3 = tri.getV3() + origin;
 
             // Implementation of Möller's algorithm
-            Vector E1 = v2 - v1;
-            Vector E2 = v3 - v1;
-            Vector D = mRay.Item2;
-            Vector P = D.Cross(E2);
-            Vector T = mRay.Item1 - v1;
-            Vector Q = T.Cross(E1);
+            Vector3D E1 = v2 - v1;
+            Vector3D E2 = v3 - v1;
+            Vector3D D = mRay.Item2;
+            Vector3D P = D.Cross(E2);
+            Vector3D T = mRay.Item1 - v1;
+            Vector3D Q = T.Cross(E1);
 
             float pDotE1Inv = 1.0f / P.Dot(E1);
 

Engine/Matrix4.cs

@@ -106,9 +106,9 @@ public void MultiplyThisBy(Matrix4 m)
             }
         }
 
-        public Vector Multiply(Vector v)
+        public Vector3D Multiply(Vector3D v)
         {
-            Vector result = new Vector();
+            Vector3D result = new Vector3D();
 
             //  compute x
             float sum = 0;

Engine/Raytracer.cs

@@ -3,12 +3,12 @@
 namespace Unilight
 {
     //  1st = Origin, 2nd = Direction
-    using Ray = Tuple<Vector, Vector>;
+    using Ray = Tuple<Vector3D, Vector3D>;
 
     using IntPair = Tuple<int, int>;
 
     //  Eye, LookAt, ViewportWidth, ViewportHeight
-    using TCamera = Tuple<Vector, Vector, float, float>;
+    using TCamera = Tuple<Vector3D, Vector3D, float, float>;
 
     public class Raytracer
     {
@@ -21,7 +21,7 @@ private struct RayTraversalResult
         {
             public GObject? Closest { get; set; }
             public float Distance { get; set; }
-            public Vector? IntersectionPoint { get; set; }
+            public Vector3D? IntersectionPoint { get; set; }
         }
 
         public delegate void UpdateCallback(int percent);
@@ -67,7 +67,7 @@ private RgbColor trace(Ray ray, int depth)
 
             GObject? closest = null;
             float dist = float.MaxValue;
-            Vector intersectionPoint = new();
+            Vector3D intersectionPoint = new();
 
             for (int k = 0; k < Scene.CountObjects(); ++k)
             {
@@ -90,16 +90,16 @@ private RgbColor trace(Ray ray, int depth)
 
             if (closest != null && mIntersector.Result == Intersector.IntersectionResult.Hit)
             {
-                Vector n = closest.GetNormalAt(intersectionPoint);
+                Vector3D n = closest.GetNormalAt(intersectionPoint);
                 n.Normalize();
 
                 Material mat = closest.Material;
                 float refl = mat.Reflection;
 
-                Vector v = ray.Item1 - intersectionPoint; // point to eye vector
+                Vector3D v = ray.Item1 - intersectionPoint; // point to eye vector
                 v.Normalize();
-                Vector r; // reflected ray
-                Vector l; // light vector
+                Vector3D r; // reflected ray
+                Vector3D l; // light vector
 
                 for (int k = 0; k < Scene.CountLights(); ++k)
                 {
@@ -150,7 +150,7 @@ private Matrix4 imageToViewportTransform(int imgWidth, int imgHeight, Camera cam
 
             Matrix4 finalTransform = Matrix4.translate(cam.LookAt.X, cam.LookAt.Y, cam.LookAt.Z);
 
-            Vector invNormal = cam.Eye - cam.LookAt;
+            Vector3D invNormal = cam.Eye - cam.LookAt;
             invNormal.Normalize();
 
             Matrix4 scale = Matrix4.identity();
@@ -222,8 +222,8 @@ private void RenderChunk(Point start, Point end, byte[] pixels, int stride)
 
             while (!iter.Done())
             {
-                Vector mapped = i2v.Multiply(new Vector(iter.Cursor.X, iter.Cursor.Y, 0));
-                Vector dir = mapped - Camera.Eye;
+                Vector3D mapped = i2v.Multiply(new Vector3D(iter.Cursor.X, iter.Cursor.Y, 0));
+                Vector3D dir = mapped - Camera.Eye;
                 dir.Normalize();
                 Ray ray = new Ray(Camera.Eye, dir);
 

MainForm.cs

@@ -13,8 +13,8 @@ public class SettingsInfo
             public bool computeAmbient = true;
             public bool computeFog = true;
             public int depth = 1;
-            public Vector eye;
-            public Vector lookAt;
+            public Vector3D eye;
+            public Vector3D lookAt;
             public float width = 0;
             public float height = 0;
         }
@@ -56,7 +56,7 @@ private void BuildScene()
             mScene = new Scene();
 
             Sphere s1 = new Sphere();
-            s1.Origin = new Vector(-3.5f, 0, 0);
+            s1.Origin = new Vector3D(-3.5f, 0, 0);
             s1.Material.Color = RgbColor.Blue;
             s1.Material.Gloss = 30;
             s1.Material.Specular = 1.0f;
@@ -66,7 +66,7 @@ private void BuildScene()
             mScene.AddObject(s1);
 
             Sphere s2 = new Sphere();
-            s2.Origin = new Vector(3, 0, 0);
+            s2.Origin = new Vector3D(3, 0, 0);
             s2.Material.Color = RgbColor.Red;
             s2.Material.Gloss = 10;
             s2.Material.Specular = 0.8f;
@@ -77,7 +77,7 @@ private void BuildScene()
             mScene.AddObject(s2);
 
             Sphere s3 = new Sphere();
-            s3.Origin = new Vector(0, 0, 0);
+            s3.Origin = new Vector3D(0, 0, 0);
             s3.Material.Color = RgbColor.Green;
             s3.Material.Gloss = 10;
             s3.Material.Specular = 0;
@@ -91,7 +91,7 @@ private void BuildScene()
             mScene.AddObject(pln);
 
             PointLight p = new PointLight();
-            p.setPosition(new Vector(0, 15, 35));
+            p.setPosition(new Vector3D(0, 15, 35));
             p.setColor(RgbColor.White);
             p.setName("Point Light");
             p.setEnabled(true);
@@ -112,8 +112,8 @@ public MainForm()
             //  setup camera
             Camera cam = new()
             {
-                Eye = new Vector(0, 15, 35),
-                LookAt = new Vector(0, 0, 0),
+                Eye = new Vector3D(0, 15, 35),
+                LookAt = new Vector3D(0, 0, 0),
                 ViewportWidth = 12,
                 ViewportHeight = 9,
             };

Model/Box.cs

@@ -12,10 +12,10 @@ public override void Accept (Visitor v)
             v.Visit (this);
         }
 
-        public override Vector GetNormalAt(Vector p)
+        public override Vector3D GetNormalAt(Vector3D p)
         {
             // Compute local coordinates relative to box center
-            Vector local = p - Origin;
+            Vector3D local = p - Origin;
             float halfW = Width / 2f;
             float halfH = Height / 2f;
             float halfD = Depth / 2f;
@@ -30,12 +30,12 @@ public override Vector GetNormalAt(Vector p)
 
             float min = Math.Min(Math.Min(Math.Min(dx, dxNeg), Math.Min(dy, dyNeg)), Math.Min(dz, dzNeg));
 
-            if (min == dx) return new Vector(1, 0, 0);
-            if (min == dxNeg) return new Vector(-1, 0, 0);
-            if (min == dy) return new Vector(0, 1, 0);
-            if (min == dyNeg) return new Vector(0, -1, 0);
-            if (min == dz) return new Vector(0, 0, 1);
-            return new Vector(0, 0, -1);
+            if (min == dx) return new Vector3D(1, 0, 0);
+            if (min == dxNeg) return new Vector3D(-1, 0, 0);
+            if (min == dy) return new Vector3D(0, 1, 0);
+            if (min == dyNeg) return new Vector3D(0, -1, 0);
+            if (min == dz) return new Vector3D(0, 0, 1);
+            return new Vector3D(0, 0, -1);
         }
     }
 

Model/GObject.cs

@@ -4,13 +4,13 @@ public abstract class GObject
     {
         protected static int _instanceCount = 0; // shared across all instances
 
-        private Vector mOrigin = new Vector();
+        private Vector3D mOrigin = new Vector3D();
 
         public string Name { get; set; }
 
         public Material Material { get; set; } = new ();
 
-        public Vector Origin
+        public Vector3D Origin
         {
             get => mOrigin;
             set => mOrigin = value;
@@ -26,6 +26,6 @@ protected GObject()
 
         public abstract void Accept(Visitor v);
 
-        public abstract Vector GetNormalAt(Vector p);
+        public abstract Vector3D GetNormalAt(Vector3D p);
     }
 }

Model/Plane.cs

@@ -3,15 +3,15 @@ namespace Unilight
 
     public class Plane : GObject
     {
-        public Vector Normal { get; set; } = new (0, 1, 0);
+        public Vector3D Normal { get; set; } = new (0, 1, 0);
         public float Distance { get; set; } = 0;
 
         public Plane()
         {
             Name = "Plane " + _instanceCount;
         }
 
-        public Plane(Vector n, float d)
+        public Plane(Vector3D n, float d)
         {
             Normal = n;
             Distance = d;
@@ -24,7 +24,7 @@ public override void Accept(Visitor v)
             v.Visit(this);
         }
 
-        public override Vector GetNormalAt(Vector p)
+        public override Vector3D GetNormalAt(Vector3D p)
         {
             return Normal;
         }