fix #61

Author: Arkueid

Framework/src/Model/CubismModel.hpp

@@ -1,4 +1,5 @@
 add_subdirectory(src)
 
 # 在配置阶段立即执行文件修改脚本
-include(${CMAKE_CURRENT_SOURCE_DIR}/insert_code.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/patch_1.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/patch_2.cmake)

Framework/src/Model/CubismModel.hpp.bak

@@ -0,0 +1,44 @@
+# BY TONGYILINGMA
+
+# 源文件路径
+set(INPUT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../Framework/src/Model/CubismModel.hpp)
+# 备份文件路径
+set(BACKUP_FILE ${INPUT_FILE}.bak)
+
+if(NOT EXISTS "${BACKUP_FILE}")
+  # 设置要插入的代码
+  set(INSERT_INCLUDE "#include <HackProperties.h>\n")
+  set(INSERT_ADDITIONAL_PROPERTIES "    __ADDITIONAL_METHODS__\n")
+
+  # 读取整个文件到变量
+  file(STRINGS ${INPUT_FILE} FILE_CONTENTS)
+
+  # 初始化输出内容为空字符串
+  set(OUTPUT_CONTENTS "")
+  set(HAS_INSERTED_INCLUDE FALSE)
+  set(HAS_INSERTED_PROPERTIES FALSE)
+
+  # 遍历每一行，检查是否需要插入代码
+  foreach(line IN LISTS FILE_CONTENTS)
+    # 插入 include 语句
+    if("${line}" MATCHES "^#include \"Id/CubismId.hpp\"$" AND NOT HAS_INSERTED_INCLUDE)
+      set(OUTPUT_CONTENTS "${OUTPUT_CONTENTS}${line}\n")
+      set(OUTPUT_CONTENTS "${OUTPUT_CONTENTS}${INSERT_INCLUDE}")
+      set(HAS_INSERTED_INCLUDE TRUE)
+    elseif("${line}" MATCHES "^public:$" AND NOT HAS_INSERTED_PROPERTIES)
+      set(OUTPUT_CONTENTS "${OUTPUT_CONTENTS}${line}\n")
+      set(OUTPUT_CONTENTS "${OUTPUT_CONTENTS}${INSERT_ADDITIONAL_PROPERTIES}")
+      set(HAS_INSERTED_PROPERTIES TRUE)
+    else()
+      set(OUTPUT_CONTENTS "${OUTPUT_CONTENTS}${line}\n")
+    endif()
+  endforeach()
+
+  # 将原始文件复制为备份
+  file(COPY_FILE ${INPUT_FILE} ${BACKUP_FILE})
+
+  # 将最终的内容写回原文件
+  file(WRITE ${INPUT_FILE} "${OUTPUT_CONTENTS}")
+
+  message("patched")
+endif()

Main/CMakeLists.txt

@@ -8,5 +8,18 @@
     std::string group; \
     int no;
 
+#define __ADDITIONAL_METHODS__ \
+    void AddAndSaveParameterValue(const Csm::CubismId* parameterId, float value, float weight = 1.0f)\
+    {\
+        const csmInt32 index = GetParameterIndex(parameterId);\
+        AddParameterValue(index, value, weight);\
+        _savedParameters[index] = _parameterValues[index];\
+    }\
+    void SetAndSaveParameterValue(const Csm::CubismId* parameterId, float value, float weight = 1.0f)\
+    {\
+        const csmInt32 index = GetParameterIndex(parameterId);\
+        SetParameterValue(index, value, weight);\
+        _savedParameters[index] = _parameterValues[index];\
+    }\
 
 #endif // HACKPROPERTIES_H

Main/insert_code.cmake Main/patch_1.cmakeMain/insert_code.cmake renamed to Main/patch_1.cmake

@@ -732,13 +732,13 @@ bool LAppModel::IsMotionFinished()
 void LAppModel::SetParameterValue(const char *paramId, float value, float weight)
 {
     const Csm::CubismId *paramHanle = CubismFramework::GetIdManager()->GetId(paramId);
-    _model->SetParameterValue(paramHanle, value, weight);
+    _model->SetAndSaveParameterValue(paramHanle, value, weight);
 }
 
 void LAppModel::AddParameterValue(const char *paramId, float value)
 {
     const Csm::CubismId *paramHanle = CubismFramework::GetIdManager()->GetId(paramId);
-    _model->AddParameterValue(paramHanle, value);
+    _model->AddAndSaveParameterValue(paramHanle, value);
 }
 
 void LAppModel::SetAutoBreathEnable(bool enable)
@@ -968,6 +968,7 @@ void LAppModel::ResetParameters()
     {
         _parameterValues[i] = _defaultParameterValues[i];
     }
+    _model->SaveParameters();
 }
 
 void LAppModel::ResetPose()

Main/patch_2.cmake

@@ -1,5 +1,5 @@
 
-add_subdirectory(Main/src)
+add_subdirectory(Main)
 
 set_property(TARGET Main PROPERTY CXX_STANDARD 17)
 set_property(TARGET Main PROPERTY CXX_STANDARD_REQUIRED ON)

Main/src/HackProperties.h

@@ -67,7 +67,7 @@ def main():
     model.SetAutoBreathEnable(False)
 
     wavHandler = WavHandler()
-    lipSyncN = 2.5
+    lipSyncN = 3
 
     audioPlayed = False
 
@@ -192,7 +192,7 @@ def getHitFeedback(x, y):
 
         if wavHandler.Update():
             # 利用 wav 响度更新 嘴部张合
-            model.AddParameterValue(
+            model.SetParameterValue(
                 StandardParams.ParamMouthOpenY, wavHandler.GetRms() * lipSyncN
             )
 

Main/src/LAppModel.cpp

@@ -0,0 +1,61 @@
+# 测试 v3 SetParameterValue 是否正确
+# 测试 v3 SetParameterValue 是否能在 Update 和 Draw 之外的地方调用后起作用
+
+import os
+import pygame
+import live2d.v3 as live2d
+import resources
+from live2d.v3.params import StandardParams
+
+
+def main():
+    pygame.init()
+    live2d.init()
+
+    display = (300, 400)
+    pygame.display.set_mode(display, pygame.DOUBLEBUF | pygame.OPENGL)
+    pygame.display.set_caption("pygame window")
+
+    live2d.glewInit()
+
+    model = live2d.LAppModel()
+
+    model.LoadModelJson(
+        os.path.join(resources.RESOURCES_DIRECTORY, "v3/Haru/Haru.model3.json")
+    )
+
+    model.Resize(*display)
+
+    model.SetAutoBlinkEnable(False) # 防止影响测试
+
+    # 左眼闭上
+    model.SetParameterValue(StandardParams.ParamEyeLOpen, 0)
+    # 右眼睁开
+    model.SetParameterValue(StandardParams.ParamEyeROpen, 1)
+    # 张嘴
+    model.SetParameterValue(StandardParams.ParamMouthOpenY, 1)
+
+    running = True
+    while True:
+        for event in pygame.event.get():
+            if event.type == pygame.QUIT:
+                running = False
+                break
+            if event.type == pygame.MOUSEMOTION:
+                model.Drag(*pygame.mouse.get_pos())
+        
+        if not running:
+            break
+
+        live2d.clearBuffer()
+        model.Update()
+        model.Draw()
+
+        pygame.display.flip()
+
+    live2d.dispose()
+
+    pygame.quit()
+
+if __name__ == "__main__":
+    main()