Make Sensors' members opaque

mitsuba-renderer · Mar 3, 2023 · c864e08 · c864e08
1 parent df940c1
commit c864e08
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 31 deletions.
diff --git a/include/mitsuba/render/sensor.h b/include/mitsuba/render/sensor.h
@@ -135,15 +135,16 @@ class MI_EXPORT_LIB Sensor : public Endpoint<Float, Spectrum> {
     // =============================================================
 
     void traverse(TraversalCallback *callback) override {
-        callback->put_parameter("shutter_open", m_shutter_open,           +ParamFlags::NonDifferentiable);
-        callback->put_parameter("shutter_open_time", m_shutter_open_time, +ParamFlags::NonDifferentiable);
-        callback->put_object("film", m_film.get(),                        +ParamFlags::NonDifferentiable);
-        callback->put_object("sampler", m_sampler.get(),                  +ParamFlags::NonDifferentiable);
         Base::traverse(callback);
+        callback->put_parameter("shutter_open",      m_shutter_open,      +ParamFlags::NonDifferentiable);
+        callback->put_parameter("shutter_open_time", m_shutter_open_time, +ParamFlags::NonDifferentiable);
+        callback->put_object("film",                 m_film.get(),        +ParamFlags::NonDifferentiable);
+        callback->put_object("sampler",              m_sampler.get(),     +ParamFlags::NonDifferentiable);
     }
 
-    void parameters_changed(const std::vector<std::string> &/*keys*/ = {}) override {
+    void parameters_changed(const std::vector<std::string> &keys = {}) override {
         m_resolution = ScalarVector2f(m_film->crop_size());
+        Base::parameters_changed(keys);
     }
 
     DRJIT_VCALL_REGISTER(Float, mitsuba::Sensor)

diff --git a/src/sensors/irradiancemeter.cpp b/src/sensors/irradiancemeter.cpp
@@ -119,15 +119,15 @@ MI_VARIANT class IrradianceMeter final : public Sensor<Float, Spectrum> {
         using string::indent;
 
         std::ostringstream oss;
-        oss << "IrradianceMeter[" << std::endl
-            << "  surface_area = ";
+        oss << "IrradianceMeter[" << std::endl << "  surface_area = ";
 
-        if (m_shape) oss << m_shape->surface_area();
-            else         oss << " <no shape attached!>";
+        if (m_shape)
+            oss << m_shape->surface_area();
+        else
+            oss << " <no shape attached!>";
         oss << "," << std::endl;
 
-        oss << "  film = " << indent(m_film) << "," << std::endl
-            << "]";
+        oss << "  film = " << indent(m_film) << "," << std::endl << "]";
         return oss.str();
     }
 

diff --git a/src/sensors/orthographic.cpp b/src/sensors/orthographic.cpp
@@ -95,10 +95,6 @@ class OrthographicCamera final : public ProjectiveCamera<Float, Spectrum> {
     }
 
     void parameters_changed(const std::vector<std::string> &keys) override {
-        if (keys.empty() || string::contains(keys, "to_world")) {
-            // Update the scalar value of the matrix
-            m_to_world = m_to_world.value();
-        }
         Base::parameters_changed(keys);
         update_camera_transforms();
     }
@@ -207,4 +203,4 @@ class OrthographicCamera final : public ProjectiveCamera<Float, Spectrum> {
 
 MI_IMPLEMENT_CLASS_VARIANT(OrthographicCamera, ProjectiveCamera)
 MI_EXPORT_PLUGIN(OrthographicCamera, "Orthographic Camera");
-NAMESPACE_END(mitsuba)
+NAMESPACE_END(mitsuba)
diff --git a/src/sensors/perspective.cpp b/src/sensors/perspective.cpp
@@ -143,29 +143,27 @@ class PerspectiveCamera final : public ProjectiveCamera<Float, Spectrum> {
         if (m_to_world.scalar().has_scale())
             Throw("Scale factors in the camera-to-world transformation are not allowed!");
 
-        update_camera_transforms();
-
         m_principal_point_offset = ScalarPoint2f(
             props.get<ScalarFloat>("principal_point_offset_x", 0.f),
             props.get<ScalarFloat>("principal_point_offset_y", 0.f)
         );
+
+        update_camera_transforms();
     }
 
     void traverse(TraversalCallback *callback) override {
         Base::traverse(callback);
-        callback->put_parameter("x_fov", m_x_fov,              ParamFlags::Differentiable | ParamFlags::Discontinuous);
+        callback->put_parameter("x_fov",     m_x_fov,          ParamFlags::Differentiable | ParamFlags::Discontinuous);
         callback->put_parameter("to_world", *m_to_world.ptr(), ParamFlags::Differentiable | ParamFlags::Discontinuous);
     }
 
     void parameters_changed(const std::vector<std::string> &keys) override {
+        Base::parameters_changed(keys);
         if (keys.empty() || string::contains(keys, "to_world")) {
-            // Update the scalar value of the matrix
-            m_to_world = m_to_world.value();
             if (m_to_world.scalar().has_scale())
                 Throw("Scale factors in the camera-to-world transformation are not allowed!");
         }
 
-        Base::parameters_changed(keys);
         update_camera_transforms();
     }
 
@@ -193,7 +191,7 @@ class PerspectiveCamera final : public ProjectiveCamera<Float, Spectrum> {
         m_normalization = 1.f / m_image_rect.volume();
         m_needs_sample_3 = false;
 
-        dr::make_opaque(m_to_world, m_camera_to_sample, m_sample_to_camera, m_dx, m_dy, m_x_fov,
+        dr::make_opaque(m_camera_to_sample, m_sample_to_camera, m_dx, m_dy, m_x_fov,
                         m_image_rect, m_normalization, m_principal_point_offset);
     }
 

diff --git a/src/sensors/thinlens.cpp b/src/sensors/thinlens.cpp
@@ -20,7 +20,7 @@ Perspective camera with a thin lens (:monosp:`thinlens`)
    - |transform|
    - Specifies an optional camera-to-world transformation.
      (Default: none (i.e. camera space = world space))
-   - |exposed|
+   - |exposed|, |differentiable|, |discontinuous|
 
  * - aperture_radius
    - |float|
@@ -171,19 +171,18 @@ class ThinLensCamera final : public ProjectiveCamera<Float, Spectrum> {
     void traverse(TraversalCallback *callback) override {
         Base::traverse(callback);
         callback->put_parameter("aperture_radius", m_aperture_radius, ParamFlags::Differentiable | ParamFlags::Discontinuous);
-        callback->put_parameter("focus_distance", m_focus_distance,   ParamFlags::Differentiable | ParamFlags::Discontinuous);
-        callback->put_parameter("x_fov", m_x_fov,                     ParamFlags::Differentiable | ParamFlags::Discontinuous);
-        callback->put_parameter("to_world", *m_to_world.ptr(),        ParamFlags::Differentiable | ParamFlags::Discontinuous);
+        callback->put_parameter("focus_distance",  m_focus_distance,  ParamFlags::Differentiable | ParamFlags::Discontinuous);
+        callback->put_parameter("x_fov",           m_x_fov,           ParamFlags::Differentiable | ParamFlags::Discontinuous);
+        callback->put_parameter("to_world",       *m_to_world.ptr(),  ParamFlags::Differentiable | ParamFlags::Discontinuous);
     }
 
     void parameters_changed(const std::vector<std::string> &keys) override {
+        Base::parameters_changed(keys);
         if (keys.empty() || string::contains(keys, "to_world")) {
-            // Update the scalar value of the matrix
-            m_to_world = m_to_world.value();
             if (m_to_world.scalar().has_scale())
                 Throw("Scale factors in the camera-to-world transformation are not allowed!");
         }
-        Base::parameters_changed(keys);
+
         update_camera_transforms();
     }
 
@@ -210,7 +209,7 @@ class ThinLensCamera final : public ProjectiveCamera<Float, Spectrum> {
         m_image_rect.expand(Point2f(pmax.x(), pmax.y()) / pmax.z());
         m_normalization = 1.f / m_image_rect.volume();
 
-        dr::make_opaque(m_to_world, m_camera_to_sample, m_sample_to_camera, m_dx, m_dy,
+        dr::make_opaque(m_camera_to_sample, m_sample_to_camera, m_dx, m_dy,
                         m_x_fov, m_image_rect, m_normalization);
     }