Merge pull request #1 from korarei/refactor/samples

Refactor: Update required samples calculation

Author: korarei

dll_src/main.cpp

@@ -57,12 +57,9 @@ calc_delta(const Param &param, Input &input, const std::array<std::uint32_t, 2>
 }
 
 static std::array<int, 4>
-calc_size(Delta &delta, float amt, const Input &input, bool enable) noexcept {
+calc_size(Delta &delta, float amt, const Input &input) noexcept {
     std::array<int, 4> margin{};
 
-    if (!enable)
-        return margin;
-
     auto htm = delta.calc_htm(amt);
     auto c_prev = Vec3<float>(delta.get_center(), 1.0f);
     auto pos = (htm * c_prev).to_vec2() + input.pivot;
@@ -72,10 +69,10 @@ calc_size(Delta &delta, float amt, const Input &input, bool enable) noexcept {
     auto upper_left = static_cast<Vec2<int>>((diff - pos).ceil());
     auto lower_right = static_cast<Vec2<int>>((diff + pos).ceil());
 
-    margin[0] = std::max(margin[0], upper_left.get_y());
-    margin[1] = std::max(margin[1], lower_right.get_y());
-    margin[2] = std::max(margin[2], upper_left.get_x());
-    margin[3] = std::max(margin[3], lower_right.get_x());
+    margin[0] = std::max(upper_left.get_y(), 0);
+    margin[1] = std::max(lower_right.get_y(), 0);
+    margin[2] = std::max(upper_left.get_x(), 0);
+    margin[3] = std::max(lower_right.get_x(), 0);
 
     return margin;
 }
@@ -124,24 +121,33 @@ process_motion_blur(const CParam *c_param, const CInput *c_input, COutput *c_out
     if (flag) {
         const float amt = param.shutter_angle / 360.0f;
 
+        std::array<int, 4> margin{};
+        std::uint32_t req_smp = 0u;
+        std::uint32_t smp = 0u;
+
         if (param.geo_cache && !input.frame)
             set_init_geo(param.ext, k);
 
         auto delta = calc_delta(param, input, {k, (param.geo_cache == 2u && input.frame) ? 7u : input.frame});
-        std::uint32_t smp = std::clamp(delta.calc_req_smp(amt, input.res), 0u, param.smp_lim - 1u);
+
+        if (delta.is_moved()) {
+            margin = calc_size(delta, amt, input);
+            req_smp = static_cast<std::uint32_t>(Vec2<int>(margin[2] + margin[3], margin[0] + margin[1]).norm(2));
+            smp = std::min(req_smp, param.smp_lim - 1u);
+        }
 
         if (smp) {
             auto init_htm = delta.calc_htm(amt, smp, true);
             auto drift = delta.calc_drift(amt, smp);
-            auto margin = calc_size(delta, amt, input, param.resize);
 
-            *c_output = COutput(margin, init_htm, drift, smp);
+            *c_output = COutput(margin, init_htm, drift, smp, req_smp);
         } else {
             flag = false;
             *c_output = COutput();
         }
-    } else
+    } else {
         *c_output = COutput();
+    }
 
     if (param.geo_cache == 2u)
         if (auto geo = geo_map.read({k, 7u}); !geo || !geo->is_cached(input.frame))

dll_src/structs.hpp

@@ -34,11 +34,12 @@ struct COutput {
     float init_htm[3][3];
     float drift[2];
     int smp;
+    int req_smp;
 
     constexpr COutput() noexcept = default;
     constexpr COutput(const std::array<int, 4> &margin_, const Mat3<float> &init_htm_, const Vec2<float> &drift_,
-                      std::uint32_t smp_) noexcept :
-        smp(smp_) {
+                      std::uint32_t smp_, std::uint32_t req_smp_) noexcept :
+        smp(static_cast<int>(smp_)), req_smp(static_cast<int>(req_smp_)) {
         std::copy(margin_.begin(), margin_.end(), margin);
         for (std::size_t i = 0; i < 3; ++i) std::copy(init_htm_[i].begin(), init_htm_[i].end(), init_htm[i]);
         std::copy(drift_.begin(), drift_.end(), drift);
@@ -56,7 +57,7 @@ struct Param {
 
     constexpr Param(const CParam &c_param) noexcept :
         shutter_angle(std::clamp(c_param.shutter_angle, 0.0f, 360.0f)),
-        smp_lim(static_cast<std::uint32_t>(std::max(c_param.smp_lim, 0))),
+        smp_lim(static_cast<std::uint32_t>(std::max(c_param.smp_lim, 1))),
         ext(static_cast<std::uint32_t>(std::clamp(c_param.ext, 0, 2))),
         resize(c_param.resize),
         geo_cache(static_cast<std::uint32_t>(std::clamp(c_param.geo_cache, 0, 2))),

dll_src/transform_utils.cpp

@@ -8,12 +8,11 @@ Delta::Delta(const Transform &from, const Transform &to) noexcept :
     rel_center(from.get_center() - to.get_center()),
     center_to(-to.get_center()),
     center_from(-from.get_center()),
-    rel_dist(rel_pos.norm(2) + rel_center.norm(2)),
-    flag(is_zero(rel_dist) && are_equal(rel_scale, 1.0f) && is_zero(rel_rot)) {}
+    flag(is_zero(rel_pos.norm(2)) && is_zero(rel_center.norm(2)) && are_equal(rel_scale, 1.0f) && is_zero(rel_rot)) {}
 
 Mat3<float>
 Delta::calc_htm(float amt, std::uint32_t smp, bool is_inv) const noexcept {
-    float step_amt = smp > 1 ? amt / static_cast<float>(smp) : amt;
+    float step_amt = smp > 1u ? amt / static_cast<float>(smp) : amt;
     float rot = rel_rot * step_amt;
     float scale = std::pow(rel_scale, step_amt);
     auto pos = rel_pos * step_amt;

dll_src/transform_utils.hpp

@@ -79,9 +79,6 @@ class Delta {
     [[nodiscard]] constexpr const Vec2<float> &get_center() const noexcept { return center_to; }
     [[nodiscard]] constexpr const bool is_moved() const noexcept { return !flag; }
 
-    // Calculate the required samples.
-    [[nodiscard]] constexpr std::uint32_t calc_req_smp(float amt, const Vec2<float> &res) const noexcept;
-
     // Calculate the HTM (Homogeneous Transformation Matrix).
     [[nodiscard]] Mat3<float> calc_htm(float amt = 1.0f, std::uint32_t smp = 1u, bool is_inv = false) const noexcept;
 
@@ -90,23 +87,11 @@ class Delta {
 private:
     float rel_rot, rel_scale;
     Vec2<float> rel_pos, rel_center, center_to, center_from;
-    float rel_dist;
     bool flag;
 };
 
-inline constexpr std::uint32_t
-Delta::calc_req_smp(float amt, const Vec2<float> &res) const noexcept {
-    if (flag)
-        return 0u;
-
-    auto size = res + center_from.abs();
-    float r = size.norm(2) * 0.5f;
-    auto req_smps = Vec3<float>(rel_dist, (rel_scale - 1.0f) * r, rel_rot * r) * amt;
-    return static_cast<std::uint32_t>(std::ceil(req_smps.norm(-1)));
-}
-
 inline constexpr Vec2<float>
 Delta::calc_drift(float amt, std::uint32_t smp) const noexcept {
-    float step_amt = smp > 1 ? amt / static_cast<float>(smp) : amt;
+    float step_amt = smp > 1u ? amt / static_cast<float>(smp) : amt;
     return -rel_center * step_amt;
 }

scripts/ObjectMotionBlur_LK_template.anm2

@@ -68,12 +68,9 @@ pcall(ffi.cdef, [[
         float init_htm[3][3];
         float drift[2];
         int smp;
+        int req_smp;
     } Output;
 
-    typedef struct {
-        float ox, oy, zoom, rz;
-    } Geo;
-
     int process_motion_blur(const Param *param, const Input *input, Output *output);
 ]])
 
@@ -136,12 +133,16 @@ if (state == 0) then
     local drift = output.drift
     local add = output.margin
 
-    obj.effect("領域拡張", "上", add[0], "下", add[1], "左", add[2], "右", add[3])
-    obj.cx = obj.cx + (add[2] - add[3]) * 0.5 -- beta 11a
-    obj.cy = obj.cy + (add[0] - add[1]) * 0.5 -- beta 11a
+    local w_new, h_new = w, h
 
-    local w_new = w + add[2] + add[3]
-    local h_new = h + add[0] + add[1]
+    if (resize) then
+        obj.effect("領域拡張", "上", add[0], "下", add[1], "左", add[2], "右", add[3])
+        obj.cx = obj.cx + (add[2] - add[3]) * 0.5
+        obj.cy = obj.cy + (add[0] - add[1]) * 0.5
+
+        w_new = w + add[2] + add[3]
+        h_new = h + add[0] + add[1]
+    end
 
     obj.pixelshader("motion_blur", "object", "object", {
         htm[0][0], htm[0][1], htm[0][2], 0.0,
@@ -162,5 +163,5 @@ if (print_info) then
         Object ID       : %d
         Index           : %d
         Required Samples: %d
-    ]], obj_id, obj.index, output.smp))
+    ]], obj_id, obj.index, output.req_smp))
 end