Merge pull request #16 from EdwardPalmer99/EdwardPalmer99/partial-migration-to-CPP

Rewrite Primitives, Scene, Camera, PhotonEngine in C++

Author: EdwardPalmer99

.bazelrc

@@ -3,7 +3,7 @@
 test -c opt --verbose_failures --test_output=all
 
 build -c opt --verbose_failures
-build --copt='-Wall' --copt='-Wno-missing-braces' --copt='-O2'
+build --copt='-Wall' --copt='-Wno-missing-braces' --copt='-O2' --copt='-g'
 build --conlyopt='-std=gnu11'
 build --cxxopt='-std=c++17'
 build --color=yes

examples/BUILD.bazel

@@ -1,6 +1,6 @@
 cc_binary(
     name = "batcave",
-    srcs = ["BatCave.c"],
+    srcs = ["BatCave.cpp"],
     deps = [
         "//lib:cphoton"
     ],
@@ -10,7 +10,7 @@ cc_binary(
 
 cc_binary(
     name = "menger-cube",
-    srcs = ["MengerCube.c"],
+    srcs = ["MengerCube.cpp"],
     deps = [
         "//lib:cphoton"
     ],

examples/BatCave.c

@@ -0,0 +1,99 @@
+/**
+ * @file BatCave.c
+ * @author Edward Palmer
+ * @date 2025-01-31
+ *
+ * @copyright Copyright (c) 2025
+ *
+ */
+
+extern "C"
+{
+#include "engine/RenderSettings.h"
+#include "utility/PPMWriter.h"
+}
+
+#include "engine/PhotonEngine.hpp"
+#include "engine/Scene.hpp"
+#include "engine/primitives/BVHNode.hpp"
+#include "engine/primitives/Cube.hpp"
+#include "engine/primitives/Plane.hpp"
+#include "engine/primitives/Primitive.hpp"
+
+#include <cstdlib>
+#include <vector>
+
+Primitive *makeDarkKnightRoom(double length, double width, double height);
+
+int main(int argc, const char *argv[])
+{
+    parseCLIOptions(argc, argv);
+
+    // Create the camera:
+    const double aspectRatio = ((double)gRenderSettings.pixelsWide / (double)gRenderSettings.pixelsHigh);
+    Camera camera(45.0, aspectRatio, 1, 0, point3(-2.5, 2, 10), point3(0, 2, 0));
+
+    Primitive *room = makeDarkKnightRoom(20, 16.0, 5);
+
+    Scene scene;
+    scene.addObject(room);
+
+    // Monolith:
+    for (int i = 0; i < 4; i++)
+    {
+        for (int j = 0; j < 9; j++)
+        {
+            Primitive *cube = new Cube(point3(0.5 * i, 0.25 + 0.5 * j, 0), zeroVector(), 0.5,
+                                       makeLambertian(makeSolidTexture(color3(.01, .01, .01))));
+
+            scene.addObject(cube);
+        }
+    }
+
+    PhotonEngine engine(gRenderSettings.pixelsWide, gRenderSettings.pixelsHigh);
+
+    PPMImage *outputImage = engine.render(&scene, &camera);
+
+    writeBinary16BitPPMImage(outputImage, gRenderSettings.outputPath);
+
+    freePPMImage(outputImage);
+
+    return 0;
+}
+
+
+Primitive *makeDarkKnightRoom(double length, double width, double height)
+{
+    const double halfRoomW = 0.5 * width;
+    const double halfRoomL = 0.5 * length;
+
+    Material *wallMaterial = makeLambertian(makeSolidTexture(color3(0.05, 0.05, 0.05)));
+    Material *lightMaterial = makeEmitter(color3(.9, .9, .9));
+
+    std::vector<Primitive *> objects;
+
+    objects.push_back(new Plane(point3(halfRoomW, 0, 0), vector3(-1, 0, 0), wallMaterial));
+    objects.push_back(new Plane(point3(-halfRoomW, 0, 0), vector3(1, 0, 0), wallMaterial));
+    objects.push_back(new Plane(point3(0, 0, -halfRoomL), vector3(0, 0, 1), wallMaterial));
+    objects.push_back(new Plane(point3(0, 0, halfRoomL), vector3(0, 0, -1), wallMaterial));
+    objects.push_back(new Plane(point3(0, height, 0), vector3(0, -1, 0), wallMaterial));
+    objects.push_back(new Plane(point3(0, 0, 0), vector3(0, 1, 0), wallMaterial));
+
+    // Create all of the lights on the ceiling:
+    for (int i = -halfRoomW; i <= halfRoomW; i += 1)
+    {
+        for (int j = -halfRoomL; j <= halfRoomL; j += 1)
+        {
+            Primitive *floorPanel = new Cube(point3(i + 0.495, -0.490, j + 0.495), zeroVector(), 0.99, wallMaterial);
+
+            Primitive *ceilingPanel =
+                new Cube(point3(i + 0.495, height + .494, j + 0.495), zeroVector(), 0.99, lightMaterial);
+
+            objects.push_back(floorPanel);
+            objects.push_back(ceilingPanel);
+        }
+    }
+
+    objects.shrink_to_fit();
+    return new BVHNode(objects.data(), 0, objects.size());
+}

examples/BatCave.cpp

@@ -7,7 +7,19 @@
  *
  */
 
-#include "CPhoton.h"
+extern "C"
+{
+#include "engine/RenderSettings.h"
+#include "utility/PPMWriter.h"
+}
+
+#include "engine/PhotonEngine.hpp"
+#include "engine/Scene.hpp"
+#include "engine/primitives/BVHNode.hpp"
+#include "engine/primitives/Cube.hpp"
+#include "engine/primitives/Plane.hpp"
+#include "engine/primitives/Primitive.hpp"
+#include "models/MengerCube.hpp"
 
 int main(int argc, const char *argv[])
 {
@@ -18,7 +30,7 @@ int main(int argc, const char *argv[])
     // Create the camera:
     const double aspectRatio = ((double)gRenderSettings.pixelsWide / (double)gRenderSettings.pixelsHigh);
 
-    Camera camera = makeCamera(45.0, aspectRatio, 4, 0.0, point3(2, 5, 5), point3(0.2, 0.6, 1.0));
+    Camera camera(45.0, aspectRatio, 4, 0.0, point3(2, 5, 5), point3(0.2, 0.6, 1.0));
 
     // Create the textures:
     Texture *greyColor = makeSolidTexture(color3(0.20, 0.26, 0.35));
@@ -29,30 +41,29 @@ int main(int argc, const char *argv[])
     Material *goldLambertian = makeLambertian(goldColor);
 
     // Create the scene:
-    Scene *scene = makeScene();
+    Scene scene;
 
     Primitive *mengerSponge0 = makeMengerSponge(0, point3(-1.5, 0.5, -1.5), 1.0, goldLambertian);
     Primitive *mengerSponge1 = makeMengerSponge(1, point3(1.5, 0.5, -1.5), 1.0, goldLambertian);
     Primitive *mengerSponge3 = makeMengerSponge(3, point3(-1.5, 0.5, 1.5), 1.0, goldLambertian);
     Primitive *mengerSponge2 = makeMengerSponge(2, point3(1.5, 0.5, 1.5), 1.0, goldLambertian);
     Primitive *mengerSponge4 = makeMengerSponge(4, point3(0, 0.5, 0), 1.0, goldLambertian);
-    Primitive *plane = makePlane(point3(0, 0, 0), vector3(0, 1, 0), greyMetal);
+    Primitive *plane = new Plane(point3(0, 0, 0), vector3(0, 1, 0), greyMetal);
 
-    scene->addObject(scene, mengerSponge0);
-    scene->addObject(scene, mengerSponge1);
-    scene->addObject(scene, mengerSponge2);
-    scene->addObject(scene, mengerSponge3);
-    scene->addObject(scene, mengerSponge4);
-    scene->addObject(scene, plane);
-    scene->markAsFinished(scene);
+    scene.addObject(mengerSponge0);
+    scene.addObject(mengerSponge1);
+    scene.addObject(mengerSponge2);
+    scene.addObject(mengerSponge3);
+    scene.addObject(mengerSponge4);
+    scene.addObject(plane);
 
     // Render:
-    PPMImage *outputImage = renderScene(scene, &camera);
+    PhotonEngine engine(gRenderSettings.pixelsWide, gRenderSettings.pixelsHigh);
+
+    PPMImage *outputImage = engine.render(&scene, &camera);
     writeBinary16BitPPMImage(outputImage, gRenderSettings.outputPath);
 
     // Cleanup:
     freePPMImage(outputImage);
-    scene->destructor(scene);
-
     return 0;
 }

examples/MengerCube.c examples/MengerCube.cppexamples/MengerCube.c renamed to examples/MengerCube.cpp

@@ -1,7 +1,7 @@
 cc_library(
     name = "cphoton",
-    hdrs = glob(["**/*.h", "*.h"]),
-    srcs = glob(["**/*.cpp", "**/*.c"]),
+    hdrs = glob(["**/*.h", "*.h", "**/*.hpp", "**/**/*.hpp"]),
+    srcs = glob(["**/*.cpp", "**/*.c", "**/**/*.cpp"]),
     strip_include_prefix = ".",
     visibility = ["//visibility:public"]
 )

lib/BUILD.bazel

@@ -8,14 +8,10 @@
  */
 
 #pragma once
-#include "engine/Camera.h"
 #include "engine/HitRec.h"
 #include "engine/Material.h"
-#include "engine/Primitive.h"
 #include "engine/Ray.h"
-#include "engine/RayTracer.h"
 #include "engine/RenderSettings.h"
-#include "engine/Scene.h"
 #include "engine/Texture.h"
 #include "logger/Logger.h"
 #include "models/Fractals3D.h"