Resolve test build errors

philippitts · Apr 8, 2022 · 9130824 · 9130824
1 parent 8870c63
commit 9130824
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ src/build
 src/bin
 src/objs
 .sconsign.dblite
+build
diff --git a/src/tests/analytic_scenes.cpp b/src/tests/analytic_scenes.cpp
@@ -29,6 +29,7 @@
 #include "shapes/sphere.h"
 #include "spectrum.h"
 #include "textures/constant.h"
+#include "films/image.h"
 
 struct TestScene {
     std::shared_ptr<Scene> scene;
@@ -271,9 +272,9 @@ std::vector<TestIntegrator> GetIntegrators() {
         // Path tracing integrators
         for (auto sampler : GetSamplers(Bounds2i(Point2i(0, 0), resolution))) {
             std::unique_ptr<Filter> filter(new BoxFilter(Vector2f(0.5, 0.5)));
-            Film *film =
-                new Film(resolution, Bounds2f(Point2f(0, 0), Point2f(1, 1)),
-                         std::move(filter), 1., "test.exr", 1.);
+            Film *film = new ImageFilm(resolution,
+                                       Bounds2f(Point2f(0, 0), Point2f(1, 1)),
+                                       std::move(filter), 1., "test.exr", 1.);
             std::shared_ptr<Camera> camera =
                 std::make_shared<PerspectiveCamera>(
                     identity, Bounds2f(Point2f(-1, -1), Point2f(1, 1)), 0., 1.,
@@ -290,9 +291,9 @@ std::vector<TestIntegrator> GetIntegrators() {
 
         for (auto sampler : GetSamplers(Bounds2i(Point2i(0, 0), resolution))) {
             std::unique_ptr<Filter> filter(new BoxFilter(Vector2f(0.5, 0.5)));
-            Film *film =
-                new Film(resolution, Bounds2f(Point2f(0, 0), Point2f(1, 1)),
-                         std::move(filter), 1., "test.exr", 1.);
+            Film *film = new ImageFilm(resolution,
+                                       Bounds2f(Point2f(0, 0), Point2f(1, 1)),
+                                       std::move(filter), 1., "test.exr", 1.);
             std::shared_ptr<Camera> camera =
                 std::make_shared<OrthographicCamera>(
                     identity, Bounds2f(Point2f(-.1, -.1), Point2f(.1, .1)), 0.,
@@ -309,9 +310,9 @@ std::vector<TestIntegrator> GetIntegrators() {
         // Volume path tracing integrators
         for (auto sampler : GetSamplers(Bounds2i(Point2i(0, 0), resolution))) {
             std::unique_ptr<Filter> filter(new BoxFilter(Vector2f(0.5, 0.5)));
-            Film *film =
-                new Film(resolution, Bounds2f(Point2f(0, 0), Point2f(1, 1)),
-                         std::move(filter), 1., "test.exr", 1.);
+            Film *film = new ImageFilm(resolution,
+                                       Bounds2f(Point2f(0, 0), Point2f(1, 1)),
+                                       std::move(filter), 1., "test.exr", 1.);
             std::shared_ptr<Camera> camera =
                 std::make_shared<PerspectiveCamera>(
                     identity, Bounds2f(Point2f(-1, -1), Point2f(1, 1)), 0., 1.,
@@ -327,9 +328,9 @@ std::vector<TestIntegrator> GetIntegrators() {
         }
         for (auto sampler : GetSamplers(Bounds2i(Point2i(0, 0), resolution))) {
             std::unique_ptr<Filter> filter(new BoxFilter(Vector2f(0.5, 0.5)));
-            Film *film =
-                new Film(resolution, Bounds2f(Point2f(0, 0), Point2f(1, 1)),
-                         std::move(filter), 1., "test.exr", 1.);
+            Film *film = new ImageFilm(resolution,
+                                       Bounds2f(Point2f(0, 0), Point2f(1, 1)),
+                                       std::move(filter), 1., "test.exr", 1.);
             std::shared_ptr<Camera> camera =
                 std::make_shared<OrthographicCamera>(
                     identity, Bounds2f(Point2f(-.1, -.1), Point2f(.1, .1)), 0.,
@@ -347,9 +348,9 @@ std::vector<TestIntegrator> GetIntegrators() {
         // BDPT
         for (auto sampler : GetSamplers(Bounds2i(Point2i(0, 0), resolution))) {
             std::unique_ptr<Filter> filter(new BoxFilter(Vector2f(0.5, 0.5)));
-            Film *film =
-                new Film(resolution, Bounds2f(Point2f(0, 0), Point2f(1, 1)),
-                         std::move(filter), 1., "test.exr", 1.);
+            Film *film = new ImageFilm(resolution,
+                                       Bounds2f(Point2f(0, 0), Point2f(1, 1)),
+                                       std::move(filter), 1., "test.exr", 1.);
             std::shared_ptr<Camera> camera =
                 std::make_shared<PerspectiveCamera>(
                     identity, Bounds2f(Point2f(-1, -1), Point2f(1, 1)), 0., 1.,
@@ -384,9 +385,9 @@ std::vector<TestIntegrator> GetIntegrators() {
         // MLT
         {
             std::unique_ptr<Filter> filter(new BoxFilter(Vector2f(0.5, 0.5)));
-            Film *film =
-                new Film(resolution, Bounds2f(Point2f(0, 0), Point2f(1, 1)),
-                         std::move(filter), 1., "test.exr", 1.);
+            Film *film = new ImageFilm(resolution,
+                                       Bounds2f(Point2f(0, 0), Point2f(1, 1)),
+                                       std::move(filter), 1., "test.exr", 1.);
             std::shared_ptr<Camera> camera =
                 std::make_shared<PerspectiveCamera>(
                     identity, Bounds2f(Point2f(-1, -1), Point2f(1, 1)), 0., 1.,
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,3 +3,4 @@ src/build @@
     src/bin
     src/objs
     .sconsign.dblite
+    build