Merge pull request #6 from korarei/refactor/geo

Refactor: Add constexpr and const qualifiers to GeoMap class

Author: korarei

dll_src/geo_utils.hpp

@@ -4,6 +4,7 @@
 #include <cstddef>
 #include <cstdint>
 #include <map>
+#include <mutex>
 #include <unordered_map>
 #include <vector>
 
@@ -12,10 +13,10 @@
 template <std::size_t N>
 class GeoMap {
 public:
-    GeoMap() noexcept = default;
-    ~GeoMap() noexcept = default;
+    constexpr GeoMap() noexcept = default;
+    constexpr ~GeoMap() noexcept = default;
 
-    void resize(std::size_t hash, std::size_t idx, std::size_t num, std::uint32_t mode) noexcept {
+    constexpr void resize(std::size_t hash, std::size_t idx, std::size_t num, std::uint32_t mode) noexcept {
         if (mode == 0u) {
             clear(hash);
             return;
@@ -42,7 +43,7 @@ class GeoMap {
         return;
     }
 
-    void write(std::size_t hash, std::size_t idx, std::size_t pos, const Geo &geo) noexcept {
+    constexpr void write(std::size_t hash, std::size_t idx, std::size_t pos, const Geo &geo) noexcept {
         const auto [id, offset] = calc_block_pos(pos);
 
         auto it_hash = map.find(hash);
@@ -58,7 +59,7 @@ class GeoMap {
         return;
     }
 
-    [[nodiscard]] Geo *read(std::size_t hash, std::size_t idx, std::size_t pos) noexcept {
+    [[nodiscard]] constexpr const Geo *read(std::size_t hash, std::size_t idx, std::size_t pos) const noexcept {
         const auto [id, offset] = calc_block_pos(pos);
 
         if (auto block = get_block(hash, idx, id); block && (*block)[offset].get_flag())
@@ -67,8 +68,9 @@ class GeoMap {
             return nullptr;
     }
 
-    void clear() noexcept { MapData{}.swap(map); }
-    void clear(std::size_t hash) noexcept {
+    constexpr void clear() noexcept { MapData{}.swap(map); }
+
+    constexpr void clear(std::size_t hash) noexcept {
         auto it_hash = map.find(hash);
         if (it_hash == map.end())
             return;
@@ -80,13 +82,16 @@ class GeoMap {
     }
 
 private:
-    using BlockMap = std::map<std::size_t, std::array<Geo, N>>;
+    using Block = std::array<Geo, N>;
+    using BlockMap = std::map<std::size_t, Block>;
     using MapData = std::unordered_map<std::size_t, std::vector<BlockMap>>;
     MapData map{};
 
-    std::array<std::size_t, 2> calc_block_pos(std::size_t v) const { return {v / N, v % N}; }
+    [[nodiscard]] constexpr std::array<std::size_t, 2> calc_block_pos(std::size_t v) const noexcept {
+        return {v / N, v % N};
+    }
 
-    std::array<Geo, N> *get_block(std::size_t hash, std::size_t idx, std::size_t id) {
+    [[nodiscard]] constexpr const Block *get_block(std::size_t hash, std::size_t idx, std::size_t id) const noexcept {
         auto it_hash = map.find(hash);
         if (it_hash == map.end())
             return nullptr;

dll_src/main.cpp

@@ -76,15 +76,15 @@ cleanup_geo(const Param &param, const Input &input) {
         case 1:
             if (input.is_last[1])
                 geo_map.clear(input.obj_id);
-            break;
+            return;
         case 2:
             geo_map.clear();
-            break;
+            return;
         case 3:
             geo_map.clear(input.obj_id);
-            break;
+            return;
         default:
-            break;
+            return;
     }
 }
 

dll_src/structs.hpp

@@ -22,8 +22,8 @@ struct CParam {
 struct CInput {
     float w, h;
     float px, py;
-    int obj_id, obj_idx, obj_num;
-    int frame, total_frame;
+    size_t obj_id, obj_idx, obj_num;
+    size_t frame, total_frame;
     float curr[6];
     float prev[6];
     float geo[6];
@@ -79,10 +79,10 @@ struct Input {
     constexpr Input(const CInput &c_input) noexcept :
         res(c_input.w, c_input.h),
         pivot(c_input.px, c_input.py),
-        obj_id(static_cast<std::size_t>(std::max(c_input.obj_id, 0))),
-        obj_idx(static_cast<std::size_t>(c_input.obj_idx)),
-        obj_num(static_cast<std::size_t>(c_input.obj_num)),
-        frame(static_cast<std::size_t>(c_input.frame)),
+        obj_id(c_input.obj_id),
+        obj_idx(c_input.obj_idx),
+        obj_num(c_input.obj_num),
+        frame(c_input.frame),
         is_last(c_input.obj_idx == c_input.obj_num - 1, c_input.frame == c_input.total_frame - 1),
         tf_curr(std::to_array(c_input.curr)),
         tf_prev(std::to_array(c_input.prev)),

scripts/ObjectMotionBlur_LK_template.anm2

@@ -20,6 +20,10 @@ if (not pcall(obj.getvalue, "cx")) then
     return
 end
 
+if (obj.num == 0) then
+    return
+end
+
 local function tobool(v, d)
     if (type(v) == "boolean") then
         return v
@@ -38,7 +42,7 @@ local ext = tonumber(_0.extrapolation) or s0 s0 = nil
 local resize = tobool(_0.resize, c1 ~= 0) c1 = nil
 local geo_cache = tonumber(_0.geo_cache or s1) s1 = nil
 local geo_ctrl = tonumber(_0.geo_ctrl or s2) s2 = nil
-local obj_id = tonumber(_0.object_id) or t6 t6 = nil -- beta 11a
+local obj_id = math.max(tonumber(_0.object_id) or t6, 0) t6 = nil -- beta 11a
 local mix = math.min(math.max(tonumber(_0.mix) or t5, 0.0), 100.0) * 0.01 t5 = nil
 local print_info = tobool(_0.print_info, c2 ~= 0) c2 = nil
 _0 = nil
@@ -57,8 +61,8 @@ pcall(ffi.cdef, [[
     typedef struct {
         float w, h;
         float px, py;
-        int obj_id, obj_idx, obj_num;
-        int frame, total_frame;
+        size_t obj_id, obj_idx, obj_num;
+        size_t frame, total_frame;
         float curr[6];
         float prev[6];
         float geo[6];