feat(JNI):Make the log to Optional

Author: Eatgrapes

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

@@ -5,9 +5,42 @@ public class CubismFramework {
         LibraryLoader.load();
     }
 
-    public static native void startUp();
+    public enum LogLevel {
+        VERBOSE(0),
+        DEBUG(1),
+        INFO(2),
+        WARNING(3),
+        ERROR(4),
+        OFF(5);
+        
+        final int value;
+        LogLevel(int value) { this.value = value; }
+    }
+
+    public interface LogCallback {
+        void log(String message);
+    }
+
+    private static LogCallback logCallback;
+
+    public static void startUp() {
+        startUp(null, LogLevel.OFF);
+    }
+
+    public static void startUp(LogCallback callback, LogLevel level) {
+        logCallback = callback;
+        startUpNative(callback != null, level.value);
+    }
+
+    private static native void startUpNative(boolean hasCallback, int logLevel);
     public static native void initialize();
     public static native void dispose();
     public static native boolean isStarted();
     public static native boolean isInitialized();
+
+    private static void onLog(String message) {
+        if (logCallback != null) {
+            logCallback.log("[Live2D Native] " + message);
+        }
+    }
 }

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

@@ -143,7 +143,11 @@ private void init() {
             }
         });
 
-        CubismFramework.startUp();
+        CubismFramework.startUp(msg -> {
+            if (!msg.contains("Live2D Cubism SDK Core Version")) {
+                System.out.println(msg);
+            }
+        }, CubismFramework.LogLevel.WARNING);
         CubismFramework.initialize();
     }
 

native/src/CubismFramework_JNI.cpp

@@ -65,6 +65,30 @@ class JniAllocator : public ICubismAllocator {
 
 static JniAllocator allocator;
 static CubismFramework::Option option;
+static bool g_useJavaLogger = false;
+
+static void LogFunction(const char* message) {
+    if (!g_useJavaLogger) return;
+    
+    JNIEnv* env;
+    bool attached = false;
+    if (g_jvm->GetEnv((void**)&env, JNI_VERSION_1_6) != JNI_OK) {
+        g_jvm->AttachCurrentThread((void**)&env, nullptr);
+        attached = true;
+    }
+
+    jclass cls = env->FindClass("dev/eatgrapes/live2d/CubismFramework");
+    if (cls) {
+        jmethodID mid = env->GetStaticMethodID(cls, "onLog", "(Ljava/lang/String;)V");
+        if (mid) {
+            jstring str = env->NewStringUTF(message);
+            env->CallStaticVoidMethod(cls, mid, str);
+            env->DeleteLocalRef(str);
+        }
+    }
+
+    if (attached) g_jvm->DetachCurrentThread();
+}
 
 extern "C" {
 
@@ -76,9 +100,10 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved) {
     return JNI_VERSION_1_6;
 }
 
-JNIEXPORT void JNICALL Java_dev_eatgrapes_live2d_CubismFramework_startUp(JNIEnv* env, jclass clazz) {
-    option.LogFunction = [](const char* message) { };
-    option.LoggingLevel = CubismFramework::Option::LogLevel_Off;
+JNIEXPORT void JNICALL Java_dev_eatgrapes_live2d_CubismFramework_startUpNative(JNIEnv* env, jclass clazz, jboolean hasCallback, jint logLevel) {
+    g_useJavaLogger = hasCallback;
+    option.LogFunction = LogFunction;
+    option.LoggingLevel = static_cast<CubismFramework::Option::LogLevel>(logLevel);
     option.LoadFileFunction = LoadFile;
     option.ReleaseBytesFunction = ReleaseBytes;
     CubismFramework::StartUp(&allocator, &option);