添加复位方法

Author: Arkueid

Framework/src/Model/CubismModel.hpp

@@ -27,6 +27,11 @@ class CubismModel
     /**
      * Structure for color information of drawing object
      */
+    csmVector<float>& GetSavedParameters()
+    {
+        return _savedParameters;
+    }
+
     struct DrawableColorData
     {
         /**

LAppModelWrapper.cpp

@@ -192,12 +192,6 @@ static PyObject* PyLAppModel_StartRandomMotion(PyLAppModelObject* self, PyObject
     Py_RETURN_NONE;
 }
 
-static PyObject* PyLAppModel_ClearMotions(PyLAppModelObject* self, PyObject* args, PyObject* kwargs)
-{
-    self->model->ClearMotions();
-    Py_RETURN_NONE;
-}
-
 static PyObject* PyLAppModel_SetExpression(PyLAppModelObject* self, PyObject* args, PyObject* kwargs)
 {
     const char* expressionID;
@@ -673,14 +667,31 @@ static PyObject* PyLAppModel_GetPartScreenColor(PyLAppModelObject* self, PyObjec
     return Py_BuildValue("ffff", r, g, b, a);
 }
 
+static PyObject* PyLAppModel_StopAllMotions(PyLAppModelObject* self, PyObject* args, PyObject* kwargs)
+{
+    self->model->StopAllMotions();
+    Py_RETURN_NONE;
+}
+
+static PyObject* PyLAppModel_ResetParameters(PyLAppModelObject* self, PyObject* args, PyObject* kwargs)
+{
+    self->model->ResetParameters();
+    Py_RETURN_NONE;
+}
+
+static PyObject* PyLAppModel_ResetPose(PyLAppModelObject* self, PyObject* args, PyObject* kwargs)
+{
+    self->model->ResetPose();
+    Py_RETURN_NONE;
+}
+
 // 包装模块方法的方法列表
 static PyMethodDef PyLAppModel_methods[] = {
     {"LoadModelJson", (PyCFunction)PyLAppModel_LoadModelJson, METH_VARARGS, ""},
     {"Resize", (PyCFunction)PyLAppModel_Resize, METH_VARARGS, ""},
     {"Draw", (PyCFunction)PyLAppModel_Draw, METH_VARARGS, ""},
     {"StartMotion", (PyCFunction)PyLAppModel_StartMotion, METH_VARARGS | METH_KEYWORDS, ""},
     {"StartRandomMotion", (PyCFunction)PyLAppModel_StartRandomMotion, METH_VARARGS | METH_KEYWORDS, ""},
-    {"ClearMotions", (PyCFunction)PyLAppModel_ClearMotions, METH_VARARGS | METH_KEYWORDS, ""},
 
     {"SetExpression", (PyCFunction)PyLAppModel_SetExpression, METH_VARARGS | METH_KEYWORDS, ""},
     {"SetRandomExpression", (PyCFunction)PyLAppModel_SetRandomExpression, METH_VARARGS | METH_KEYWORDS, ""},
@@ -715,6 +726,12 @@ static PyMethodDef PyLAppModel_methods[] = {
 
     {"SetPartScreenColor", (PyCFunction)PyLAppModel_SetPartScreenColor, METH_VARARGS, ""},
     {"GetPartScreenColor", (PyCFunction)PyLAppModel_GetPartScreenColor, METH_VARARGS, ""},
+
+    // 复位
+    {"StopAllMotions", (PyCFunction)PyLAppModel_StopAllMotions, METH_VARARGS | METH_KEYWORDS, ""},
+    {"ResetParameters", (PyCFunction)PyLAppModel_ResetParameters, METH_VARARGS | METH_KEYWORDS, ""},
+    {"ResetPose", (PyCFunction)PyLAppModel_ResetPose, METH_VARARGS | METH_KEYWORDS, ""},
+
     {NULL} // 方法列表结束的标志
 };
 

Main/src/LAppModel.cpp

@@ -372,27 +372,10 @@ void LAppModel::Update()
     csmBool motionUpdated = false;
 
     //-----------------------------------------------------------------
-    if (_clearMotionFlag) 
+    _model->LoadParameters(); // 前回セーブされた状態を
+    if (!_motionManager->IsFinished())
     {
-        _clearMotionFlag = false;
-        _motionManager->StopAllMotions();
-        for (int i = 0; i < _parameterCount; i++)
-        {
-            _parameterValues[i] = _defaultParameterValues[i];
-        }
-        if (_pose)
-        {
-            _pose->Reset(_model);
-        }
-        Info("motion: cleared");
-    }
-    else
-    {
-        _model->LoadParameters(); // 前回セーブされた状態を
-        if (!_motionManager->IsFinished())
-        {
-            motionUpdated = _motionManager->UpdateMotion(_model, _deltaTimeSeconds); // モーションを更新
-        }
+        motionUpdated = _motionManager->UpdateMotion(_model, _deltaTimeSeconds); // モーションを更新
     }
     _model->SaveParameters(); // 状態を保存
     //-----------------------------------------------------------------
@@ -974,9 +957,25 @@ void LAppModel::Rotate(float deg)
     _matrixManager.Rotate(deg);
 }
 
-void LAppModel::ClearMotions()
+void LAppModel::StopAllMotions()
+{
+    _motionManager->StopAllMotions();
+}
+
+void LAppModel::ResetParameters()
+{
+    for (int i = 0; i < _parameterCount; i++)
+    {
+        _parameterValues[i] = _defaultParameterValues[i];
+    }
+}
+
+void LAppModel::ResetPose()
 {
-    _clearMotionFlag = true;
+    if (_pose)
+    {
+        _pose->Reset(_model);
+    }
 }
 
 void LAppModel::ResetExpression()

Main/src/LAppModel.hpp

@@ -188,7 +188,11 @@ class LAppModel : public Csm::CubismUserModel
 
     void Rotate(float deg);
 
-    void ClearMotions();
+    void StopAllMotions();
+
+    void ResetParameters();
+
+    void ResetPose();
 
     void ResetExpression();
 

package/live2d/v3/live2d.pyi

@@ -243,11 +243,17 @@ class LAppModel:
     def GetPartMultiplyColor(self, partIndex: int) -> tuple[float]:
         ...
 
-    def ClearMotions(self) -> None:
-        ...
-
     def ResetExpression(self) -> None:
         """
         重置为默认表情
         """
+        ...
+
+    def StopAllMotions(self) -> None:
+        ...
+
+    def ResetParameters(self) -> None:
+        ...
+
+    def ResetPose(self) -> None:
         ...

package/main_pygame.py

@@ -29,7 +29,7 @@ def main():
     pygame.mixer.init()
     live2d.init()
 
-    display = (500, 700)
+    display = (500, 600)
     pygame.display.set_mode(display, DOUBLEBUF | OPENGL)
     pygame.display.set_caption("pygame window")
 
@@ -135,7 +135,7 @@ def getHitFeedback(x, y):
                 # log.Info(f"Clicked Part: {currentTopClickedPartId}")
                 # model.Touch(x, y, onFinishMotionHandler=lambda : print("motion finished"), onStartMotionHandler=lambda group, no: print(f"started motion: {group} {no}"))
                 # model.StartRandomMotion(group="TapBody", onFinishMotionHandler=lambda : print("motion finished"), onStartMotionHandler=lambda group, no: print(f"started motion: {group} {no}"))
-                model.SetRandomExpression()
+                # model.SetRandomExpression()
                 model.StartRandomMotion(priority=3)
 
             if event.type == pygame.KEYDOWN:

package/test_motion_stop.py

@@ -3,8 +3,8 @@
 import pygame
 from pygame.locals import *
 
-# import live2d.v3 as live2d
-import live2d.v2 as live2d
+import live2d.v3 as live2d
+# import live2d.v2 as live2d
 from live2d.utils import log
 
 
@@ -46,7 +46,11 @@ def main():
                 model.StartRandomMotion()
             elif event.type == pygame.KEYDOWN:
                 if event.key == pygame.K_r:
-                    model.ClearMotions()
+                    model.ResetParameters() # 对于没有 pose 的模型，可以通过 ResetParameters 恢复初始动作
+                elif event.key == pygame.K_s:
+                    model.StopAllMotions()
+                elif event.key == pygame.K_p:
+                    model.ResetPose()
 
         if not running:
             break