fix: remove excessive idle motion trigger in loop

Author: Eatgrapes

binding/src/main/java/dev/eatgrapes/live2d/CubismUserModel.java

@@ -25,6 +25,9 @@ public CubismUserModel() {
     public void loadExpression(byte[] buffer, String name) { loadExpressionNative(_ptr, buffer, name); }
     private static native void loadExpressionNative(long ptr, byte[] buffer, String name);
 
+    public void setExpression(String name) { setExpressionNative(_ptr, name); }
+    private static native void setExpressionNative(long ptr, String name);
+
     public void createRenderer() { createRendererNative(_ptr); }
     private static native void createRendererNative(long ptr);
 

example/src/main/java/dev/eatgrapes/live2d/example/ControlPanel.java

@@ -13,21 +13,35 @@ public class ControlPanel {
     public static void show() {
         SwingUtilities.invokeLater(() -> {
             JFrame frame = new JFrame("Live2D Controller");
-            frame.setLayout(new FlowLayout());
-            frame.setSize(300, 200);
+            frame.setLayout(new GridLayout(0, 1, 10, 10));
+            frame.setSize(300, 300);
             frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 
-            addButton(frame, "Idle Motion", "m01");
-            addButton(frame, "Tap Body", "m04");
+            JPanel motionPanel = new JPanel(new FlowLayout());
+            motionPanel.setBorder(BorderFactory.createTitledBorder("Motions"));
+            addMotionButton(motionPanel, "Idle", "idle");
+            addMotionButton(motionPanel, "Tap Body", "tap_body");
+            frame.add(motionPanel);
+
+            JPanel exprPanel = new JPanel(new FlowLayout());
+            exprPanel.setBorder(BorderFactory.createTitledBorder("Expressions"));
+            addExprButton(exprPanel, "Default", "Default");
+            frame.add(exprPanel);
 
             frame.setVisible(true);
         });
     }
 
-    private static void addButton(JFrame frame, String label, String motionId) {
+    private static void addMotionButton(JPanel panel, String label, String id) {
+        JButton btn = new JButton(label);
+        btn.addActionListener(e -> sendRequest("/motion?id=" + id));
+        panel.add(btn);
+    }
+
+    private static void addExprButton(JPanel panel, String label, String name) {
         JButton btn = new JButton(label);
-        btn.addActionListener(e -> sendRequest("/motion?id=" + motionId));
-        frame.add(btn);
+        btn.addActionListener(e -> sendRequest("/expression?name=" + name));
+        panel.add(btn);
     }
 
     private static void sendRequest(String path) {
@@ -41,4 +55,4 @@ private static void sendRequest(String path) {
             e.printStackTrace();
         }
     }
-}
+}

example/src/main/java/dev/eatgrapes/live2d/example/Main.java

@@ -45,13 +45,20 @@ private void startServer() throws Exception {
             String query = t.getRequestURI().getQuery();
             String id = query.split("=")[1];
             taskQueue.add(() -> {
-                try {
+                if (motions.containsKey(id)) {
                     model.startMotion(motions.get(id), 3, false, null);
-                } catch (Exception e) { e.printStackTrace(); }
+                }
             });
             t.sendResponseHeaders(200, 0);
             t.close();
         });
+        server.createContext("/expression", t -> {
+            String query = t.getRequestURI().getQuery();
+            String name = query.split("=")[1];
+            taskQueue.add(() -> model.setExpression(name));
+            t.sendResponseHeaders(200, 0);
+            t.close();
+        });
         server.setExecutor(null);
         server.start();
         System.out.println("Control server started on port 8080");
@@ -88,8 +95,8 @@ private void setup() throws Exception {
         model.createRenderer();
         model.registerTexture(0, loadTex("/model/Hiyori/Hiyori.2048/texture_00.png"));
         model.registerTexture(1, loadTex("/model/Hiyori/Hiyori.2048/texture_01.png"));
-        motions.put("m01", load("/model/Hiyori/motions/Hiyori_m01.motion3.json"));
-        motions.put("m04", load("/model/Hiyori/motions/Hiyori_m04.motion3.json"));
+        motions.put("idle", load("/model/Hiyori/motions/Hiyori_m01.motion3.json"));
+        motions.put("tap_body", load("/model/Hiyori/motions/Hiyori_m04.motion3.json"));
     }
 
     private void loop() {
@@ -146,4 +153,4 @@ private int loadTex(String p) throws Exception {
     }
 
     public static void main(String[] args) throws Exception { new Main().run(); }
-}
+}

native/src/CubismUserModel_JNI.cpp

@@ -3,6 +3,7 @@
 #include <Id/CubismIdManager.hpp>
 #include <Rendering/OpenGL/CubismRenderer_OpenGLES2.hpp>
 #include <Motion/CubismMotion.hpp>
+#include <Motion/CubismExpressionMotion.hpp>
 #include <vector>
 #include <string>
 #include <map>
@@ -26,6 +27,7 @@ class JniUserModel : public CubismUserModel {
         JNIEnv* env = getEnv();
         if (env && _javaObj) env->DeleteGlobalRef(_javaObj);
         for (auto& it : _motionBuffers) CubismMotion::Delete(it.first);
+        for (auto& it : _expressions) ACubismMotion::Delete(it.second);
     }
 
     void loadModelCopy(const csmByte* buffer, csmSizeInt size) {
@@ -44,6 +46,21 @@ class JniUserModel : public CubismUserModel {
         LoadPose(_poseBuffer.data(), (csmSizeInt)_poseBuffer.size());
     }
 
+    void loadExpressionCopy(const csmByte* buffer, csmSizeInt size, const std::string& name) {
+        std::vector<csmByte> exprBuf(buffer, buffer + size);
+        auto* expr = LoadExpression(exprBuf.data(), (csmSizeInt)exprBuf.size(), name.c_str());
+        if (expr) {
+            _expressions[name] = expr;
+            _expressionBuffers[name] = std::move(exprBuf);
+        }
+    }
+
+    void setExpression(const std::string& name) {
+        if (_expressions.count(name)) {
+            _expressionManager->StartMotionPriority(_expressions[name], false, 3);
+        }
+    }
+
     void startMotionCopy(const csmByte* buffer, csmSizeInt size, int priority, bool loop) {
         std::vector<csmByte> motionBuf(buffer, buffer + size);
         auto* motion = CubismMotion::Create(motionBuf.data(), (csmSizeInt)motionBuf.size());
@@ -87,6 +104,10 @@ class JniUserModel : public CubismUserModel {
         _motionManager->UpdateMotion(_model, dt);
         _model->SaveParameters();
 
+        if (_expressionManager) {
+            _expressionManager->UpdateMotion(_model, dt);
+        }
+
         if (_pose) _pose->UpdateParameters(_model, dt);
 
         if (_dragManager) {
@@ -130,6 +151,8 @@ class JniUserModel : public CubismUserModel {
     jobject _javaObj = nullptr;
     std::vector<csmByte> _mocBuffer, _physicsBuffer, _poseBuffer;
     std::map<CubismMotion*, std::vector<csmByte>> _motionBuffers;
+    std::map<std::string, std::vector<csmByte>> _expressionBuffers;
+    std::map<std::string, ACubismMotion*> _expressions;
     std::vector<CubismMotion*> _pendingDeletion;
     std::mutex _pendingMutex;
 };
@@ -176,11 +199,17 @@ JNIEXPORT void JNICALL Java_dev_eatgrapes_live2d_CubismUserModel_loadExpressionN
     const char* n = env->GetStringUTFChars(name, nullptr);
     jsize len = env->GetArrayLength(buffer);
     jbyte* data = env->GetByteArrayElements(buffer, nullptr);
-    ((JniUserModel*)ptr)->LoadExpression((const csmByte*)data, len, n);
+    ((JniUserModel*)ptr)->loadExpressionCopy((const csmByte*)data, len, n);
     env->ReleaseByteArrayElements(buffer, data, JNI_ABORT);
     env->ReleaseStringUTFChars(name, n);
 }
 
+JNIEXPORT void JNICALL Java_dev_eatgrapes_live2d_CubismUserModel_setExpressionNative(JNIEnv* env, jclass, jlong ptr, jstring name) {
+    const char* n = env->GetStringUTFChars(name, nullptr);
+    ((JniUserModel*)ptr)->setExpression(n);
+    env->ReleaseStringUTFChars(name, n);
+}
+
 JNIEXPORT void JNICALL Java_dev_eatgrapes_live2d_CubismUserModel_createRendererNative(JNIEnv*, jclass, jlong ptr) {
     ((JniUserModel*)ptr)->CreateRenderer();
 }