refactor RayTracer class

src/RayTracer.cc

@@ -1,33 +1,24 @@
 #include "RayTracer.h"
 #include "../external/simpleppm.h"
+#include "Scene.h"
 
 #include <iostream>
-#include <string>
 #include <vector>
 
-RayTracer::RayTracer(nlohmann::json scene) : scene(scene) {}
+RayTracer::RayTracer(nlohmann::json json)
+    : json(json), scene(Scene(json["output"])) {}
+
+void RayTracer::render() {
+  int width = scene.getWidth();
+  int height = scene.getHeight();
+
+  std::vector<double> buffer(3 * width * height);
+  save_ppm(scene.getName(), buffer, width, height);
+}
 
 void RayTracer::run() {
-  std::string filename;
+  std::cout << scene.getName() << std::endl
-  int sizeX = -1, sizeY = -1;
+            << scene.getWidth() << " " << scene.getHeight() << std::endl;
-  for (auto itr = scene["output"].begin(); itr != scene["output"].end();
-       ++itr) {
 
-    if (itr->contains("filename")) {
+  render();
-      filename = (*itr)["filename"].get<std::string>();
-
-      std::cout << filename << std::endl;
-    }
-
-    if (itr->contains("size")) {
-      sizeX = (*itr)["size"].begin()->get<int>();
-      sizeY = ((*itr)["size"].begin() + 1)->get<int>();
-
-      std::cout << sizeX << " " << sizeY << std::endl;
-    }
-  }
-
-  std::vector<double> buffer(3 * sizeX * sizeY);
-
-  save_ppm(filename, buffer, sizeX, sizeY);
 }

src/RayTracer.h

@@ -2,14 +2,17 @@
 #define RAY_TRACER_H_
 
 #include "../external/json.hpp"
+#include "Scene.h"
 
 class RayTracer {
 public:
   RayTracer(nlohmann::json);
+  void render();
   void run();
 
 private:
-  nlohmann::json scene;
+  Scene scene;
+  nlohmann::json json;
 };
 
 #endif // !RAY_TRACER_H_