Added function to set animations on AnimatedSprite node.

Chukobyte · Chukobyte · commit d5ecf3ae8dd6 · 2022-01-09T19:42:06.000-05:00
diff --git a/_version.json b/_version.json
@@ -1,3 +1,3 @@
 {
-	"version": "0.47.1"
+	"version": "0.48.0"
 }
diff --git a/src/core/scripting/python/python_modules.cpp b/src/core/scripting/python/python_modules.cpp
@@ -1074,6 +1074,84 @@ PyObject* PythonModules::animated_sprite_stop(PyObject *self, PyObject *args, Py
     return nullptr;
 }
 
+// TODO: Actually implement!
+PyObject* PythonModules::animated_sprite_get_animations(PyObject *self, PyObject *args, PyObject *kwargs) {
+    static EntityComponentOrchestrator *entityComponentOrchestrator = GD::GetContainer()->entityComponentOrchestrator;
+    Entity entity;
+    if (PyArg_ParseTupleAndKeywords(args, kwargs, "i", nodeGetEntityKWList, &entity)) {
+        AnimatedSpriteComponent animatedSpriteComponent = entityComponentOrchestrator->GetComponent<AnimatedSpriteComponent>(entity);
+        CPyObject pTagList = PyList_New(0);
+        pTagList.AddRef();
+        return pTagList;
+    }
+    return nullptr;
+}
+
+PyObject* PythonModules::animated_sprite_set_animations(PyObject *self, PyObject *args, PyObject *kwargs) {
+    static EntityComponentOrchestrator *entityComponentOrchestrator = GD::GetContainer()->entityComponentOrchestrator;
+    static AssetManager *assetManager = GD::GetContainer()->assetManager;
+    Entity entity;
+    PyObject *pyList = nullptr;
+    if (PyArg_ParseTupleAndKeywords(args, kwargs, "iO", animatedSpriteSetAnimationsKWList, &entity, &pyList)) {
+        AnimatedSpriteComponent animatedSpriteComponent = entityComponentOrchestrator->GetComponent<AnimatedSpriteComponent>(entity);
+        animatedSpriteComponent.animations.clear();
+        std::string firstAnimName;
+        for (int i = 0; i < PyList_Size(pyList); i++) {
+            CPyObject listTupleItem = PyList_GetItem(pyList, i);
+            listTupleItem.AddRef();
+            CPyObject pyAnimName = PyTuple_GetItem(listTupleItem, 0);
+            pyAnimName.AddRef();
+            CPyObject pyAnimSpeed = PyTuple_GetItem(listTupleItem, 1);
+            pyAnimSpeed.AddRef();
+            CPyObject pyAnimFrames = PyTuple_GetItem(listTupleItem, 2);
+            pyAnimFrames.AddRef();
+            const std::string& animName = std::string(PyUnicode_AsUTF8(pyAnimName));
+            const int animSpeed = PyLong_AsLong(pyAnimSpeed);
+            if (i == 0) {
+                firstAnimName = animName;
+            }
+            std::map<unsigned int, AnimationFrame> animationFrames = {};
+            for (int j = 0; j < PyList_Size(pyAnimFrames); j++) {
+                CPyObject frameTupleItem = PyList_GetItem(pyAnimFrames, j);
+                frameTupleItem.AddRef();
+                CPyObject pyTextureFilePath = PyTuple_GetItem(frameTupleItem, 0);
+                pyTextureFilePath.AddRef();
+                CPyObject pyDrawSourceX = PyTuple_GetItem(frameTupleItem, 1);
+                pyDrawSourceX.AddRef();
+                CPyObject pyDrawSourceY = PyTuple_GetItem(frameTupleItem, 2);
+                pyDrawSourceY.AddRef();
+                CPyObject pyDrawSourceW = PyTuple_GetItem(frameTupleItem, 3);
+                pyDrawSourceW.AddRef();
+                CPyObject pyDrawSourceH = PyTuple_GetItem(frameTupleItem, 4);
+                pyDrawSourceH.AddRef();
+                CPyObject pyIndex = PyTuple_GetItem(frameTupleItem, 5);
+                pyIndex.AddRef();
+                const std::string& frameTextureFilePath = std::string(PyUnicode_AsUTF8(pyTextureFilePath));
+                const float frameDrawSourceX = PyLong_AsLong(pyDrawSourceX);
+                const float frameDrawSourceY = PyLong_AsLong(pyDrawSourceY);
+                const float frameDrawSourceW = PyLong_AsLong(pyDrawSourceW);
+                const float frameDrawSourceH = PyLong_AsLong(pyDrawSourceH);
+                const int frameIndex = PyLong_AsLong(pyIndex);
+                animationFrames.emplace(frameIndex, AnimationFrame{
+                    assetManager->GetTexture(frameTextureFilePath),
+                    Rect2(frameDrawSourceX, frameDrawSourceY, frameDrawSourceW, frameDrawSourceH),
+                    frameIndex
+                });
+            }
+            animatedSpriteComponent.animations.emplace(animName, Animation{
+                animName, animSpeed, animationFrames, animationFrames.size()
+            });
+        }
+        animatedSpriteComponent.currentFrameIndex = 0;
+        if (animatedSpriteComponent.animations.size() > 0) {
+            animatedSpriteComponent.currentAnimation = animatedSpriteComponent.animations[firstAnimName];
+        }
+        entityComponentOrchestrator->UpdateComponent<AnimatedSpriteComponent>(entity, animatedSpriteComponent);
+        Py_RETURN_NONE;
+    }
+    return nullptr;
+}
+
 PyObject* PythonModules::animated_sprite_is_playing(PyObject *self, PyObject *args, PyObject *kwargs) {
     static EntityComponentOrchestrator *entityComponentOrchestrator = GD::GetContainer()->entityComponentOrchestrator;
     Entity entity;
diff --git a/src/core/scripting/python/python_modules.h b/src/core/scripting/python/python_modules.h
@@ -88,6 +88,8 @@ class PythonModules {
     static PyObject* animated_sprite_play(PyObject* self, PyObject* args, PyObject* kwargs);
     static PyObject* animated_sprite_set_animation(PyObject* self, PyObject* args, PyObject* kwargs);
     static PyObject* animated_sprite_stop(PyObject* self, PyObject* args, PyObject* kwargs);
+    static PyObject* animated_sprite_get_animations(PyObject* self, PyObject* args, PyObject* kwargs);
+    static PyObject* animated_sprite_set_animations(PyObject* self, PyObject* args, PyObject* kwargs);
     static PyObject* animated_sprite_is_playing(PyObject* self, PyObject* args, PyObject* kwargs);
     static PyObject* animated_sprite_get_modulate(PyObject* self, PyObject* args, PyObject* kwargs);
     static PyObject* animated_sprite_set_modulate(PyObject* self, PyObject* args, PyObject* kwargs);
@@ -455,6 +457,14 @@ static struct PyMethodDef rollApiMethods[] = {
         "animated_sprite_stop", (PyCFunction) PythonModules::animated_sprite_stop,
         METH_VARARGS | METH_KEYWORDS, "Stops animation."
     },
+    {
+        "animated_sprite_get_animations", (PyCFunction) PythonModules::animated_sprite_get_animations,
+        METH_VARARGS | METH_KEYWORDS, "Gets all entity's animations."
+    },
+    {
+        "animated_sprite_set_animations", (PyCFunction) PythonModules::animated_sprite_set_animations,
+        METH_VARARGS | METH_KEYWORDS, "Sets all animations for entity."
+    },
     {
         "animated_sprite_is_playing", (PyCFunction) PythonModules::animated_sprite_is_playing,
         METH_VARARGS | METH_KEYWORDS, "Returns if an animations is playing."
@@ -736,6 +746,7 @@ static char *spriteSetTextureKWList[] = {"entity_id", "file_path", nullptr};
 static char *spriteSetDrawSourceKWList[] = {"entity_id", "x", "y", "w", "h", nullptr};
 
 static char *animatedSpriteAnimationUpdateKWList[] = {"entity_id", "animation_name", nullptr};
+static char *animatedSpriteSetAnimationsKWList[] = {"entity_id", "animations", nullptr};
 static char *animatedSpriteSetFrameKWList[] = {"entity_id", "frame", nullptr};
 
 static char *textLabelSetTextKWList[] = {"entity_id", "text", nullptr};
diff --git a/src/core/scripting/python/python_source.h b/src/core/scripting/python/python_source.h
@@ -1,15 +1,17 @@
 #ifndef PYTHON_SOURCE_H
 #define PYTHON_SOURCE_H
 
-// Seika Engine API v0.11.1
+// Seika Engine API v0.12.0
 
 using PythonSource = const std::string&;
 
 static PythonSource PYTHON_SOURCE_ASSETS_MODULE =
     "from enum import Enum\n"
+    "from typing import List\n"
+    "\n"
     "import seika_engine_api\n"
     "from seika.color import Color\n"
-    "from seika.math import Vector2\n"
+    "from seika.math import Vector2, Rect2\n"
     "\n"
     "\n"
     "class Texture:\n"
@@ -87,22 +89,6 @@ static PythonSource PYTHON_SOURCE_ASSETS_MODULE =
     "           height=height,\n"
     "       )\n"
     "\n"
-    "   # @staticmethod\n"
-    "   # def create(\n"
-    "   #     file_path: str,\n"
-    "   #     wrap_s=Wrap.CLAMP_TO_BORDER,\n"
-    "   #     wrap_t=Wrap.CLAMP_TO_BORDER,\n"
-    "   #     filter_min=FILTER.NEAREST,\n"
-    "   #     filter_max=FILTER.NEAREST,\n"
-    "   # ):\n"
-    "   #     return Texture(\n"
-    "   #         file_path=file_path,\n"
-    "   #         wrap_s=wrap_s,\n"
-    "   #         wrap_t=wrap_t,\n"
-    "   #         filter_min=filter_min,\n"
-    "   #         filter_max=filter_max,\n"
-    "   #     )\n"
-    "\n"
     "   def get_pixel_color(self, position: Vector2) -> Color:\n"
     "       red, green, blue, alpha = seika_engine_api.texture_get_pixel_color(\n"
     "           file_path=self.file_path, x=position.x, y=position.y\n"
@@ -116,6 +102,20 @@ static PythonSource PYTHON_SOURCE_ASSETS_MODULE =
     "       return f\"Texture(file_path: {self._file_path}, wrap_s: {self._wrap_s}, wrap_t: {self._wrap_t}, filter_min: {self._filter_min}, filter_min: {self._filter_max}, width: {self._width}, height: {self._height})\"\n"
     "\n"
     "\n"
+    "class AnimationFrame:\n"
+    "   def __init__(self, texture: Texture, draw_source: Rect2, index: int):\n"
+    "       self.texture = texture\n"
+    "       self.draw_source = draw_source\n"
+    "       self.index = index\n"
+    "\n"
+    "\n"
+    "class Animation:\n"
+    "   def __init__(self, name: str, speed: int, frames: List[AnimationFrame]):\n"
+    "       self.name = name\n"
+    "       self.speed = speed\n"
+    "       self.frames = frames\n"
+    "\n"
+    "\n"
     "class Font:\n"
     "   def __init__(self, uid: str, file_path: str, size: int):\n"
     "       self._uid = uid\n"
@@ -885,9 +885,9 @@ static PythonSource PYTHON_SOURCE_NETWORK_MODULE =
 
 static PythonSource PYTHON_SOURCE_NODE_MODULE =
     "from enum import Enum\n"
-    "from typing import Optional\n"
+    "from typing import Optional, List\n"
     "import seika_engine_api\n"
-    "from seika.assets import Texture, Font\n"
+    "from seika.assets import Texture, AnimationFrame, Animation, Font\n"
     "from seika.math import Vector2, Vector3, Rect2\n"
     "from seika.color import Color\n"
     "\n"
@@ -1204,6 +1204,88 @@ static PythonSource PYTHON_SOURCE_NODE_MODULE =
     "       seika_engine_api.animated_sprite_stop(entity_id=self.entity_id)\n"
     "\n"
     "   @property\n"
+    "   def current_animation(self) -> Animation:\n"
+    "       return Animation(name=\"\", speed=200, frames=[])\n"
+    "\n"
+    "   @current_animation.setter\n"
+    "   def current_animation(self, value: Animation) -> None:\n"
+    "       seika_engine_api.animated_sprite_set_animation(\n"
+    "           entity_id=self.entity_id, animation_name=value.name\n"
+    "       )\n"
+    "\n"
+    "   @property\n"
+    "   def animations(self) -> List[Animation]:\n"
+    "       # def get_mock_animations() -> list:\n"
+    "       #     mock_animations = [\n"
+    "       #         [\n"
+    "       #             (\n"
+    "       #                 # Animation Name\n"
+    "       #                 \"idle\",\n"
+    "       #                 # Animation Speed\n"
+    "       #                 200,\n"
+    "       #                 # Animation Frames\n"
+    "       #                 [\n"
+    "       #                     (\n"
+    "       #                         # Texture Path\n"
+    "       #                         \"assets/images/mock.png\",\n"
+    "       #                         # Draw Source\n"
+    "       #                         0,\n"
+    "       #                         0,\n"
+    "       #                         16,\n"
+    "       #                         16,\n"
+    "       #                         # index\n"
+    "       #                         0,\n"
+    "       #                     )\n"
+    "       #                 ],\n"
+    "       #             )\n"
+    "       #         ]\n"
+    "       #     ]\n"
+    "       #     return mock_animations\n"
+    "\n"
+    "       received_animations = []\n"
+    "       for (\n"
+    "           anim_name,\n"
+    "           anim_speed,\n"
+    "           anim_frames,\n"
+    "       ) in seika_engine_api.animates_sprite_get_animations(entity_id=self.entity_id):\n"
+    "           in_anim_frames = []\n"
+    "           for frame_texture_path, x, y, w, h, frame_index in anim_frames:\n"
+    "               frame_draw_source = Rect2(x, y, w, h)\n"
+    "               in_anim_frames.append(\n"
+    "                   AnimationFrame(\n"
+    "                       texture=Texture.get(frame_texture_path),\n"
+    "                       draw_source=frame_draw_source,\n"
+    "                       index=frame_index,\n"
+    "                   )\n"
+    "               )\n"
+    "           received_animations.append(\n"
+    "               Animation(name=anim_name, speed=anim_speed, frames=in_anim_frames)\n"
+    "           )\n"
+    "\n"
+    "       return received_animations\n"
+    "\n"
+    "   @animations.setter\n"
+    "   def animations(self, value: List[Animation]) -> None:\n"
+    "       new_anims = []\n"
+    "       for anim in value:\n"
+    "           anim_frames = []\n"
+    "           for anim_frame in anim.frames:\n"
+    "               anim_frames.append(\n"
+    "                   (\n"
+    "                       anim_frame.texture.file_path,\n"
+    "                       anim_frame.draw_source.x,\n"
+    "                       anim_frame.draw_source.y,\n"
+    "                       anim_frame.draw_source.w,\n"
+    "                       anim_frame.draw_source.h,\n"
+    "                       anim_frame.index,\n"
+    "                   )\n"
+    "               )\n"
+    "           new_anims.append((anim.name, anim.speed, anim_frames))\n"
+    "       seika_engine_api.animated_sprite_set_animations(\n"
+    "           entity_id=self.entity_id, animations=new_anims\n"
+    "       )\n"
+    "\n"
+    "   @property\n"
     "   def is_playing(self) -> bool:\n"
     "       return seika_engine_api.animated_is_playing(entity_id=self.entity_id)\n"
     "\n"
@@ -1561,7 +1643,9 @@ static PythonSource PYTHON_SOURCE_SCENE_MODULE =
 
 static PythonSource PYTHON_SOURCE_UTILS_MODULE =
     "class SimpleTimer:\n"
-    "   def __init__(self, wait_time: float, loops=False, timeout_func=None, start_on_init=False):\n"
+    "   def __init__(\n"
+    "       self, wait_time: float, loops=False, timeout_func=None, start_on_init=False\n"
+    "   ):\n"
     "       self.wait_time = wait_time\n"
     "       self.loops = loops\n"
     "       self.timeout_func = timeout_func\n"

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "version": "0.47.1"`
	`2`	`+ "version": "0.48.0"`
`3`	`3`	`}`