Merge pull request #2 from korarei/fix/cdef

Fix: Avoid struct name collisions by renaming

Author: korarei

dll_src/main.cpp

@@ -73,7 +73,7 @@ rotate(const std::vector<Vec3d> &input, const Param &param) noexcept {
 }
 
 extern "C" int
-transform_cam(const CParam *c_param, const CParent *c_parent, const CCam *c_input, CCam *c_output) {
+CameraTransform_K(const CParam *c_param, const CParent *c_parent, const CCam *c_input, CCam *c_output) {
     if (!c_param || !c_input || !c_parent || !c_output)
         return 1;
 

dll_src/main.def

@@ -1,3 +1,3 @@
 LIBRARY "CameraTransform_K"
 EXPORTS
-    transform_cam
+    CameraTransform_K

scripts/@CameraTransform_K_template.cam2

@@ -37,31 +37,31 @@ pcall(ffi.cdef, [[
         double x, y, z;
         double rw, rx, ry, rz;
         unsigned int rot_mode;
-    } Param;
+    } CAMTFKParam;
 
     typedef struct {
         int type;
         double x, y, z;
         double rw, rx, ry, rz;
         unsigned int rot_mode;
         double scale;
-    } Parent;
+    } CAMTFKParent;
 
     typedef struct {
         double x, y, z;
         double tx, ty, tz;
         double ux, uy, uz;
-    } Cam;
+    } CAMTFKCam;
 
-    int transform_cam(const Param *param, const Parent *parent, const Cam *input, Cam *output);
+    int CameraTransform_K(const CAMTFKParam *param, const CAMTFKParent *parent, const CAMTFKCam *input, CAMTFKCam *output);
 ]])
 
 ---@class Param : ffi.cdata*
-local Param = ffi.typeof("Param")
+local Param = ffi.typeof("CAMTFKParam")
 ---@class Parent : ffi.cdata*
-local Parent = ffi.typeof("Parent")
+local Parent = ffi.typeof("CAMTFKParent")
 ---@class Cam : ffi.cdata*
-local Cam = ffi.typeof("Cam")
+local Cam = ffi.typeof("CAMTFKCam")
 
 local dll_path = obj.getinfo("script_path") .. "CameraTransform_K.dll"
 local lib = ffi.load(dll_path)
@@ -89,7 +89,7 @@ local param = Param(x, y, z, rw, rx, ry, rz, rot_mode)
 local input = Cam(cam.x, cam.y, cam.z, cam.tx, cam.ty, cam.tz, cam.ux, cam.uy, cam.uz)
 local output = Cam()
 
-if (lib.transform_cam(param, parent, input, output) ~= 0) then
+if (lib.CameraTransform_K(param, parent, input, output) ~= 0) then
     error("Camera transformation failed.")
 end