Fixed Camera

Author: danmunteanu

Engine/Raytracer.cs

@@ -26,21 +26,23 @@ private struct RayTraversalResult
 
         public UpdateCallback? Callback { get; set; } = null;
 
-        //  The buffer we're rendering to
+        public Camera Camera { get; set; } = new Camera();
+        
+        public Scene? Scene { get; set; } = null;
+        
+        //  Reference to the Bitmap we're drawing to
         public Bitmap? Buffer { get; set; } = null;
 
-        public Scene? Scene { get; set; } = null;
-        private Camera mCamera = new Camera();
         private Intersector mIntersector = new Intersector();
 
-        public int TraceDepth { get; set; } = DEFAULT_TRACE_DEPTH;
-
-        public bool ApplyGlobalReflection { get; set; } = true;
+        public bool GlobalReflection { get; set; } = true;
         public bool ComputeSpecular { get; set; } = false;
         public bool ComputeDiffuse { get; set; } = false;
         public bool ComputeAmbient { get; set; } = false;
         public bool ComputeFog { get; set; } = false;
 
+        public int TraceDepth { get; set; } = DEFAULT_TRACE_DEPTH;
+
         private bool mStopRender = false;
 
         public Raytracer() { }
@@ -125,7 +127,7 @@ private Color trace(Ray ray, int depth)
                         lit = lit.Add(diff);
                     }
 
-                    if (ApplyGlobalReflection && refl > 0 && depth < TraceDepth)
+                    if (GlobalReflection && refl > 0 && depth < TraceDepth)
                     {
                         Ray reflected = new Ray(intersectionPoint, r);
                         Color acc = trace(reflected, depth + 1);
@@ -178,7 +180,7 @@ public void Render()
             int lastPercent = 0;
             long count = 0;
 
-            Matrix4 i2v = imageToViewportTransform(imgWidth, imgHeight, mCamera);
+            Matrix4 i2v = imageToViewportTransform(imgWidth, imgHeight, Camera);
 
             for (int p = 0; !mStopRender && p < imgWidth; ++p)
             {
@@ -189,9 +191,9 @@ public void Render()
                     lastPercent = percent;
 
                     Vector mapped = i2v.Multiply(new Vector(p, q, 0));
-                    Vector dir = mapped - mCamera.Eye;
+                    Vector dir = mapped - Camera.Eye;
                     dir.Normalize();
-                    Ray ray = new Ray(mCamera.Eye, dir);
+                    Ray ray = new Ray(Camera.Eye, dir);
 
                     Color c = trace(ray, 1);
 
@@ -209,8 +211,5 @@ public void Render()
             mStopRender = false;
         }
 
-        public Camera getCamera() => mCamera;
-
-        public void setCamera(Camera camera) => mCamera = camera;
     }
 }

MainForm.cs

@@ -122,9 +122,9 @@ public MainForm()
             //  setup raytracer
             mRaytracer.Scene = mScene;
             mRaytracer.Callback = UpdateRenderProgress;
-            mRaytracer.setCamera(cam);
+            mRaytracer.Camera = cam;
             mRaytracer.Buffer = mBuffer;
-            mRaytracer.ApplyGlobalReflection = true;
+            mRaytracer.GlobalReflection = true;
             mRaytracer.ComputeFog = false;
             mRaytracer.ComputeAmbient = true;
             mRaytracer.ComputeSpecular = true;
@@ -169,14 +169,14 @@ private void btnCloseScene_Click(object sender, EventArgs e)
         public SettingsInfo LoadSettings()
         {
             SettingsInfo info = new SettingsInfo();
-            info.globalReflection = mRaytracer.ApplyGlobalReflection;
+            info.globalReflection = mRaytracer.GlobalReflection;
             info.computeSpecular = mRaytracer.ComputeSpecular;
             info.computeDiffuse = mRaytracer.ComputeDiffuse;
             info.computeAmbient = mRaytracer.ComputeAmbient;
             info.computeFog = mRaytracer.ComputeFog;
             info.depth = mRaytracer.TraceDepth;
 
-            Camera cam = mRaytracer.getCamera();
+            Camera cam = mRaytracer.Camera;
             info.eye = cam.Eye;
             info.lookAt = cam.LookAt;
             info.width = cam.ViewportWidth;
@@ -193,7 +193,7 @@ public void UpdateSettings(SettingsInfo info)
             mRaytracer.ComputeAmbient = info.computeAmbient;
             mRaytracer.ComputeAmbient = info.computeFog;
 
-            Camera cam = mRaytracer.getCamera();
+            Camera cam = mRaytracer.Camera;
             cam.Eye = info.eye;
             cam.LookAt = info.lookAt;
             cam.ViewportWidth = info.width;