Merge pull request #6 from korarei/refactor/beta16

Refactor: Use object existence check introduced in beta16

Author: korarei

.github/workflows/releaser.yml

@@ -35,9 +35,9 @@ jobs:
         $folder = "./dll_src/aviutl2_sdk"
         Get-ChildItem -Path $folder -Filter "*.h" -Recurse | ForEach-Object {
           $file = $_.FullName
-          $content = Get-Content $file -Raw -Encoding Shift_JIS
+          $content = Get-Content $file -Raw -Encoding "shift_jis"
           $content = $content -replace "`r`n", "`n"
-          Set-Content $file -Value $content -Encoding UTF8
+          Set-Content $file -Value $content -Encoding utf8
         }
 
     - name: Build
@@ -50,7 +50,7 @@ jobs:
     - name: Upload artifact
       uses: actions/upload-artifact@v4
       with:
-        name: publish
+        name: module
         path: ${{ github.workspace }}/dll_src/build/Release/*.mod2
 
   releaser:
@@ -68,13 +68,12 @@ jobs:
       uses: actions/checkout@v4
       with:
         fetch-depth: 0
-        submodules: "recursive"
 
     - name: Download artifact
       uses: actions/download-artifact@v4
       with:
-        name: publish
-        path: ${{ github.workspace }}/build/publish
+        name: module
+        path: ${{ github.workspace }}/dll_src/build/Release
 
     - name: Extract script name
       run: |
@@ -85,15 +84,18 @@ jobs:
     - name: Setup python
       uses: actions/setup-python@v5
       with:
-        python-version: '3.11'
+        python-version: '3.14'
 
     - name: Build script
       run: |
-          python tools/build.py --tag ${{ github.ref_name }}
+          pip install git+https://github.com/korarei/AviUtl2_Astra.git@v0.3.0
+          cd ${{ github.workspace }}/scripts
+          astra build -v ${{ github.ref_name }}
+          astra release
 
     - name: Create release
       uses: softprops/action-gh-release@v2
       with:
         name: ${{ env.SCRIPT_NAME }}_${{ github.ref_name }}
-        files: 'build/*.zip'
-        body_path: build/release_note.txt
+        files: 'scripts/release/*.zip'
+        body_path: scripts/release/release_notes.txt

.gitignore

@@ -1,4 +1,4 @@
-**/build/
 .vscode/
-**/aviutl2_sdk/
-**/__pycache__/
+**/build/
+**/release/
+**/aviutl2_sdk/

.gitmodules

@@ -19,10 +19,10 @@ AviUtl ExEdit2のカメラ操作感を変更するスクリプト群．
 
 ## 動作確認
 
-- [AviUtl ExEdit2 beta15](https://spring-fragrance.mints.ne.jp/aviutl/)
+- [AviUtl ExEdit2 beta18b](https://spring-fragrance.mints.ne.jp/aviutl/)
 
 > [!CAUTION]
-> beta15以降必須．
+> beta16以降必須．
 
 ## 導入・削除・更新
 
@@ -32,9 +32,9 @@ AviUtl ExEdit2のカメラ操作感を変更するスクリプト群．
 
 ### 導入
 
-1.  同梱の`*.cam2`と`*.mod2`を`%ProgramData%`内の`aviutl2/Script`フォルダまたはその子フォルダに入れる．
+1.  同梱の`*.cam2`と`*.mod2`を`%ProgramData%`内の`aviutl2\Script`フォルダまたはその子フォルダに入れる．
 
-`beta4`以降では`aviutl2.exe`と同じ階層内の`data/Script`フォルダ内でも可．
+`beta4`以降では`aviutl2.exe`と同じ階層内の`data\Script`フォルダ内でも可．
 
 ### 削除
 
@@ -304,6 +304,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 ## Change Log
+- **v1.0.5**
+  - オブジェクトの存在判定方法を変更．
+
 - **v1.0.4**
   - `rotate`関数を複数値を返す関数に変更．
   - `Transform`と`Track`における`Use Relative Layer`チェックボックスを`Layer Reference`リストに変更 (破壊的)

README.md

@@ -145,6 +145,14 @@ static SCRIPT_MODULE_TABLE script_module_table = {L"CameraTransform_K v" VERSION
                                                   functions};
 
 extern "C" SCRIPT_MODULE_TABLE *
-GetScriptModuleTable(void) {
+GetScriptModuleTable() {
     return &script_module_table;
 }
+
+extern "C" bool
+InitializePlugin(DWORD v) {
+    if (v < 2001600)
+        return false;
+    else
+        return true;
+}

dll_src/main.cpp

@@ -1,2 +1,3 @@
 EXPORTS
-    GetScriptModuleTable @1
+    InitializePlugin
+    GetScriptModuleTable

dll_src/main.def

@@ -1,5 +1,5 @@
 @Transform
---infomation:Transform${SCRIPT_NAME} ${VERSION} by ${AUTHOR}
+--information:Transform${SCRIPT_NAME} ${VERSION} by ${AUTHOR}
 --label:${LABEL}
 --track0:X,-100000,100000,0,0.01
 --track1:Y,-100000,100000,0,0.01
@@ -13,11 +13,6 @@
 --select@s1:Layer Reference,Absolute=0,Relative=1
 --value@_0:PI,{}
 
-if (obj.getinfo("version") < 2001500) then
-    debug_print("AviUtl ExEdit2 beta15 or later is required.")
-    return
-end
-
 _0 = _0 or {}
 local x = tonumber(_0.x) or obj.track0
 local y = tonumber(_0.y) or obj.track1
@@ -31,6 +26,7 @@ local parent_layer = math.floor(tonumber(_0.parent_layer) or obj.track7)
 local layer_ref = tonumber(_0.layer_ref) or s1 s1 = nil
 _0 = nil
 
+local gv = obj.getvalue
 local lib = obj.module("CameraTransform_K")
 local cam = obj.getoption("camera_param")
 
@@ -52,15 +48,15 @@ if (layer <= 0 or layer == obj.layer) then
     if (type(_G["PARENT"]) == "table" and _G["PARENT"].type) then
         parent = _G["PARENT"]
     end
-elseif (obj.getvalue("layer" .. layer .. ".x")) then
+elseif (gv("layer" .. layer)) then
     parent.type = 1
-    parent.x = obj.getvalue("layer" .. layer .. ".x")
-    parent.y = obj.getvalue("layer" .. layer .. ".y")
-    parent.z = obj.getvalue("layer" .. layer .. ".z")
-    parent.rx = obj.getvalue("layer" .. layer .. ".rx")
-    parent.ry = obj.getvalue("layer" .. layer .. ".ry")
-    parent.rz = obj.getvalue("layer" .. layer .. ".rz")
-    parent.scale = obj.getvalue("layer" .. layer .. ".zoom") * 0.01
+    parent.x = gv("layer" .. layer .. ".x") or 0.0
+    parent.y = gv("layer" .. layer .. ".y") or 0.0
+    parent.z = gv("layer" .. layer .. ".z") or 0.0
+    parent.rx = gv("layer" .. layer .. ".rx") or 0.0
+    parent.ry = gv("layer" .. layer .. ".ry") or 0.0
+    parent.rz = gv("layer" .. layer .. ".rz") or 0.0
+    parent.scale = (gv("layer" .. layer .. ".zoom") or 100.0) * 0.01
 end
 _G["PARENT"] = nil
 
@@ -102,7 +98,7 @@ obj.setoption("camera_param", cam)
 
 
 @Parent
---infomation:Parent${SCRIPT_NAME} ${VERSION} by ${AUTHOR}
+--information:Parent${SCRIPT_NAME} ${VERSION} by ${AUTHOR}
 --label:${LABEL}
 --track0:X,-100000,100000,0,0.01
 --track1:Y,-100000,100000,0,0.01
@@ -115,11 +111,6 @@ obj.setoption("camera_param", cam)
 --track7:Zoom,0,10000,100,0.001
 --value@_0:PI,{}
 
-if (obj.getinfo("version") < 2001500) then
-    debug_print("AviUtl ExEdit2 beta15 or later is required.")
-    return
-end
-
 _0 = _0 or {}
 local x = tonumber(_0.x) or obj.track0
 local y = tonumber(_0.y) or obj.track1
@@ -135,11 +126,7 @@ _0 = nil
 local Vec = {}
 Vec.__index = Vec
 function Vec:new(x_, y_, z_)
-    local self = setmetatable({}, self)
-    self.x = x_
-    self.y = y_
-    self.z = z_
-    return self
+     return setmetatable({x = x_, y = y_, z = z_}, self)
 end
 
 function Vec.__add(a, b)
@@ -191,35 +178,32 @@ end
 
 
 @Track
---infomation:Track${SCRIPT_NAME} ${VERSION} by ${AUTHOR}
+--information:Track${SCRIPT_NAME} ${VERSION} by ${AUTHOR}
 --label:${LABEL}
 --track0:Target Layer,-100,100,1,1
 --select@s0:Layer Reference,Absolute=0,Relative=1
 --track1:Influence,0,100,100,0.01
 --value@_0:PI,{}
 
-if (obj.getinfo("version") < 2001500) then
-    debug_print("AviUtl ExEdit2 beta15 or later is required.")
-    return
-end
-
 _0 = _0 or {}
 local target_layer = math.floor(tonumber(_0.target_layer) or obj.track0)
 local layer_ref = tonumber(_0.layer_ref) or s0 s0 = nil
 local influence = (tonumber(_0.influence) or obj.track1) * 0.01
 _0 = nil
 
+local gv = obj.getvalue
+
 local function lerp(a, b, t)
   return a + (b - a) * t
 end
 
 local cam = obj.getoption("camera_param")
 local tx, ty, tz = 0.0, 0.0, 0.0
 local layer = math.max(layer_ref == 1 and obj.layer + target_layer or target_layer, 1)
-if (layer ~= obj.layer and obj.getvalue("layer" .. layer .. ".x")) then
-  tx = obj.getvalue("layer" .. layer .. ".x")
-  ty = obj.getvalue("layer" .. layer .. ".y")
-  tz = obj.getvalue("layer" .. layer .. ".z")
+if (layer ~= obj.layer and gv("layer" .. layer)) then
+  tx = gv("layer" .. layer .. ".x")
+  ty = gv("layer" .. layer .. ".y")
+  tz = gv("layer" .. layer .. ".z")
 end
 
 cam.tx = lerp(cam.tx, tx, influence)

scripts/@CameraTransform_K_template.cam2 scripts/@CameraTransform_K.in.cam2scripts/@CameraTransform_K_template.cam2 renamed to scripts/@CameraTransform_K.in.cam2

@@ -0,0 +1,39 @@
+{
+    "project": {
+        "name": "@CameraTransform_K",
+        "author": "Korarei"
+    },
+    "build": {
+        "directory": "build",
+        "scripts": [
+            {
+                "suffix": ".cam2",
+                "source": {
+                    "variables": {
+                        "LABEL": "カメラ効果"
+                    }
+                }
+            }
+        ],
+        "modules": [
+            {
+                "path": "../dll_src/build/Release/*.mod2"
+            }
+        ]
+    },
+    "install": {
+        "directory": "C:/ProgramData/aviutl2/Script"
+    },
+    "release": {
+        "directory": "release",
+        "archive": {
+            "files": [
+                "../README.md",
+                "../LICENSE"
+            ]
+        },
+        "notes": {
+            "source": "../README.md"
+        }
+    }
+}