Discarded ObservableImage, using Bitmap buffer instead

Author: danmunteanu

Engine/ObservableImage.cs

@@ -25,9 +25,11 @@ private struct RayTraversalResult
         public delegate void UpdateCallback(int percent);
 
         public UpdateCallback? Callback { get; set; } = null;
+        
+        //  The buffer we're rendering to
+        public Bitmap? Buffer { get; set; } = null;
 
         public Scene? Scene { get; set; } = null;
-        private ObservableImage? mObservableImage = null;
         private Camera mCamera = new Camera();
         private Intersector mIntersector = new Intersector();
 
@@ -164,10 +166,11 @@ private Matrix4 imageToViewportTransform(int imgWidth, int imgHeight, Camera cam
 
         public void Render()
         {
-            if (mObservableImage == null) return;
+            if (Buffer == null)
+                return;
 
-            int imgWidth = mObservableImage.Width;
-            int imgHeight = mObservableImage.Height;
+            int imgWidth = Buffer.Width;
+            int imgHeight = Buffer.Height;
             long total = imgWidth * imgHeight;
             if (total <= 0) return;
 
@@ -176,8 +179,7 @@ public void Render()
             long count = 0;
 
             Matrix4 i2v = imageToViewportTransform(imgWidth, imgHeight, mCamera);
-            mObservableImage.Clear();
-
+            
             for (int p = 0; !mStopRender && p < imgWidth; ++p)
             {
                 for (int q = 0; !mStopRender && q < imgHeight; ++q)
@@ -192,7 +194,12 @@ public void Render()
                     Ray ray = new Ray(mCamera.Eye, dir);
 
                     Color c = trace(ray, 1);
-                    mObservableImage.SetRGB(p, q, c);
+
+                    Buffer.SetPixel(p, q, System.Drawing.Color.FromArgb(
+                        (int)Math.Round(c.r * 255),
+                        (int)Math.Round(c.g * 255),
+                        (int)Math.Round(c.b * 255)
+                    ));
 
                     ++count;
                 }
@@ -202,8 +209,8 @@ public void Render()
             mStopRender = false;
         }
 
-        public void setImage(ObservableImage img) => mObservableImage = img;
         public Camera getCamera() => mCamera;
+
         public void setCamera(Camera camera) => mCamera = camera;
     }
 }

Engine/Raytracer.cs

@@ -20,6 +20,8 @@ public class SettingsInfo
             public float height = 0;
         }
 
+        private Bitmap? mBuffer = null;
+
         //  stores created editors
         private EditorCache mCache = new();
 
@@ -29,11 +31,14 @@ public class SettingsInfo
         public async Task Render()
         {
             await Task.Run(() =>
-            {
-                mImage.Clear(Color.black);
+            {                
                 mRaytracer.Render();
-                pictureRender.Image = mImage.GetBitmap();
 
+                pictureRender.BeginInvoke((System.Windows.Forms.MethodInvoker)(() =>
+                {
+                    pictureRender.Image = mBuffer;
+                    pictureRender.Refresh();
+                }));
                 btnRender.BeginInvoke((System.Windows.Forms.MethodInvoker)(() => btnRender.Enabled = true));
 
             });
@@ -45,7 +50,7 @@ public void UpdateRenderProgress(int percent)
             progressRender.Invoke(m);
         }
 
-        private ObservableImage mImage = new(800, 600);
+        
 
         private void BuildScene()
         {
@@ -103,11 +108,7 @@ public MainForm()
 
             RegisterEditors();
 
-            //  Trigger Double Buffering
-            /*typeof(Panel).InvokeMember("DoubleBuffered", BindingFlags.SetProperty
-            | BindingFlags.Instance | BindingFlags.NonPublic, null,
-            panelRender, new object[] { true });*/
-            //  Storage storage = new SerializationStorage();
+            mBuffer = new(800, 600);
 
             //  setup camera
             Camera cam = new()
@@ -122,7 +123,7 @@ public MainForm()
             mRaytracer.Scene = mScene;
             mRaytracer.Callback = UpdateRenderProgress;
             mRaytracer.setCamera(cam);
-            mRaytracer.setImage(mImage);
+            mRaytracer.Buffer = mBuffer;
             mRaytracer.ApplyGlobalReflection = true;
             mRaytracer.ComputeFog = false;
             mRaytracer.ComputeAmbient = true;
@@ -132,9 +133,6 @@ public MainForm()
 
             LoadItemsList();
 
-            //  add mainFrame as an observer for the image
-            /*image.getSubject().addObserver(mainFrame);*/
-
             editorGObject.ResetState();
             editorGObject.Enabled = false;