skelform-python 0.2.0__tar.gz → 0.2.1__tar.gz

{skelform_python-0.2.0 → skelform_python-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skelform_python
-Version: 0.2.0
+Version: 0.2.1
 Summary: SkelForm runtime for Python
 Author-email: Retropaint <darkglasses1122@gmail.com>
 License-Expression: MIT

{skelform_python-0.2.0 → skelform_python-0.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "skelform_python"
-version = "0.2.0"
+version = "0.2.1"
 authors = [
   { name="Retropaint", email="darkglasses1122@gmail.com" },
 ]

{skelform_python-0.2.0 → skelform_python-0.2.1}/skelform_python/__init__.py

@@ -116,9 +116,36 @@ def animate(
             bone.scale.x = ikf(3, bone.scale.x, bone.init_scale.x, kf, frames[a], id, bf)
             bone.scale.y = ikf(4, bone.scale.y, bone.init_scale.y, kf, frames[a], id, bf)
 
+    for bone in bones:
+        bone = reset_bone(bone, animations, bone.id, frames[0], blend_frames[0])
+
     return bones
 
 
+def is_animated(anims: [Animation], bone_id: int, element: int) -> bool:
+    for anim in anims:
+        for kf in anim.keyframes:
+            if kf.bone_id == bone_id and kf.element == element:
+                return True
+
+    return False
+
+
+def reset_bone(
+    bone: Bone, anims: [Animation], bone_id: int, frame: int, blend_frame: int
+):
+    if not is_animated(anims, bone_id, 0):
+        interpolate(frame, blend_frame, bone.pos.x, bone.init_pos.x)
+    if not is_animated(anims, bone_id, 1):
+        interpolate(frame, blend_frame, bone.pos.y, bone.init_pos.y)
+    if not is_animated(anims, bone_id, 2):
+        interpolate(frame, blend_frame, bone.rot, bone.init_rot)
+    if not is_animated(anims, bone_id, 3):
+        interpolate(frame, blend_frame, bone.scale.x, bone.init_scale.x)
+    if not is_animated(anims, bone_id, 4):
+        interpolate(frame, blend_frame, bone.scale.y, bone.init_scale.y)
+
+
 def rotate(point: Vec2, rot: float):
     return Vec2(
         point.x * math.cos(rot) - point.y * math.sin(rot),
@@ -177,7 +204,7 @@ def inverse_kinematics(bones: list[Bone], ik_root_ids: list[int]):
         if (
             family.ik_target_id == -1
             or not family.ik_bone_ids
-            or not family.ik_target_id
+            or family.ik_target_id == -1
         ):
             continue