Merge pull request #13 from Live2D/develop

Update to Cubism 5 SDK for Java R2

Author: itoh-at-live2d-com

CHANGELOG.md

@@ -4,6 +4,28 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+
+## [5-r.2] - 2024-11-07
+
+### Added
+
+* Add a function to notify when motion playback starts.
+* Add right orientation to the fixed orientations in the Android app.
+* Add a feature to change render target to the minimum sample.
+
+### Fixed
+
+* Fix a hang-up caused by an improper function call in the application termination process.
+* Fix a bug that caused white edge-like objects to be drawn when enabling the `USE_RENDER_TARGET` or `USE_MODEL_RENDER_TARGET` flag in `LAppDefine`.
+* Fix a bug where the method of obtaining color location differs between full sample and minimum sample.
+
+### Removed
+
+* Remove armeabi-v7a from architecture support.
+* Remove the `startMotion()` method that receives a callback in the minimum sample.
+  * If you want to use the callback feature, please check the Full sample.
+
+
 ## [5-r.1] - 2024-03-26
 
 ### Added
@@ -140,6 +162,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 * New released!
 
 
+[5-r.2]: https://github.com/Live2D/CubismJavaSamples/compare/5-r.1...5-r.2
 [5-r.1]: https://github.com/Live2D/CubismJavaSamples/compare/5-r.1-beta.3...5-r.1
 [5-r.1-beta.3]: https://github.com/Live2D/CubismJavaSamples/compare/5-r.1-beta.2...5-r.1-beta.3
 [5-r.1-beta.2]: https://github.com/Live2D/CubismJavaSamples/compare/5-r.1-beta.1...5-r.1-beta.2

Core/CHANGELOG.md

@@ -5,6 +5,24 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 
+## 2024-11-07
+
+### Added
+
+* [Native] Add experimental support `arm64` library for linux.
+
+### Removed
+
+* [Unity,Native,Java] Remove Android ARM v7 library.
+
+
+## 2024-04-04
+
+### Added
+
+* [Unity] Add library(.so) for HarmonyOS build.
+
+
 ## 2024-03-26
 
 ### Remove

Core/README.ja.md

@@ -18,6 +18,5 @@ Javaで開発する場合は、このファイルを使用してください。
 | プラットフォーム | アーキテクチャ  | jar | aar | パス | 注記  |
 | --- |----------|---|-----|---|-----|
 | Android | ARM64    |   | ✓ | android/Live2DCubismCore.aar |     |
-| Android | ARMv7    |   | ✓ | android/Live2DCubismCore.aar | このライブラリは現在非推奨で、近日中に削除される予定です。 |
 | Android | x86      |   | ✓ | android/Live2DCubismCore.aar |     |
 | Android | x86_64   |   | ✓ | android/Live2DCubismCore.aar |     |

Core/README.md

@@ -18,6 +18,5 @@ Use this file when developing with Java.
 | Platform | Architecture | jar | aar | Path                         | Note |
 | --- | --- | --- | --- |------------------------------| --- |
 | Android | ARM64 |  |✓  | android/Live2DCubismCore.aar |    |
-| Android | ARMv7 |  | ✓ | android/Live2DCubismCore.aar | This library is currently deprecated and will be removed in the near future. |
 | Android | x86 |  | ✓ | android/Live2DCubismCore.aar |    |
 | Android | x86_64 |  | ✓ | android/Live2DCubismCore.aar |    |

Framework

@@ -71,8 +71,9 @@ Core : [CHANGELOG.md](Core/CHANGELOG.md)
 
 | 開発ツール          | バージョン            |
 |----------------|------------------|
-| Android Studio | Iguana 2023.2.1 |
+| Android Studio | Ladybug 2024.2.1 Patch 2 |
 | Gradle         | 8.2           |
+| Gradle JDK | 17.0.12 |
 | Android SDK | 34.0.0       |
 
 ## 動作確認環境
@@ -82,11 +83,11 @@ Core : [CHANGELOG.md](Core/CHANGELOG.md)
 本サンプルアプリケーションは**Java SE 7**以上のJavaバージョンで動作します。
 
 ### Android
-| バージョン | デバイス     | Tegra |
-|-------|----------|-------|
-| 14   | Pixel 7a |  |
-| 7.1.1 | Nexus 9  | ✔ |
-| 4.1   | Pixel 5  |  |
+
+| バージョン | デバイス     | エミュレーター |
+|-------|----------|:-------:|
+| 14    | Pixel 7a |         |
+| 5.0   | Pixel 7a |    ✔    |
 
 本サンプルアプリケーションは**Android API 21**以上のAndroidバージョンで動作します。
 

README.ja.md

@@ -71,8 +71,9 @@ Core : [CHANGELOG.md](Core/CHANGELOG.md)
 
 | Development Tools | Version |
 |-------------------|--|
-| Android Studio    | Iguana 2023.2.1 |
+| Android Studio    | Ladybug 2024.2.1 Patch 2 |
 | Gradle            | 8.2 |
+| Gradle JDK | 17.0.12 |
 | Android SDK | 34.0.0       |
 
 ## Operation environment
@@ -83,11 +84,10 @@ This sample application runs with **Java SE 7** or higher Java versions.
 
 ### Android
 
-| Version | Device   | Tegra |
-|---------|----------| --- |
-| 14     | Pixel 7a ||
-| 7.1.1   | Nexus 9  | ✔︎ |
-| 4.1   | Pixel 5  ||
+| Version | Device   | Emulator |
+|---------|----------|:--------:|
+| 14      | Pixel 7a |          |
+| 5.0     | Pixel 7a |    ✔     |
 
 This sample application runs with **Android API 21** or higher Android versions.
 

README.md

@@ -15,7 +15,7 @@
     <activity
       android:name=".full.MainActivity"
       android:configChanges="orientation|screenSize"
-      android:screenOrientation="landscape"
+      android:screenOrientation="sensorLandscape"
       android:exported="true">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>

Sample/src/full/AndroidManifest.xml

@@ -113,7 +113,6 @@ public void run() {
         // アプリケーションを非アクティブにする
         if (!isActive) {
             activity.finishAndRemoveTask();
-            System.exit(0);
         }
     }
 

Sample/src/full/java/com/live2d/demo/full/LAppDelegate.java

@@ -9,6 +9,7 @@
 
 import com.live2d.sdk.cubism.framework.math.CubismMatrix44;
 import com.live2d.sdk.cubism.framework.motion.ACubismMotion;
+import com.live2d.sdk.cubism.framework.motion.IBeganMotionCallback;
 import com.live2d.sdk.cubism.framework.motion.IFinishedMotionCallback;
 
 import java.io.IOException;
@@ -154,7 +155,7 @@ else if (model.hitTest(HitAreaName.BODY.getId(), x, y)) {
                     LAppPal.printLog("hit area: " + HitAreaName.HEAD.getId());
                 }
 
-                model.startRandomMotion(MotionGroup.TAP_BODY.getId(), Priority.NORMAL.getPriority(), finishedMotion);
+                model.startRandomMotion(MotionGroup.TAP_BODY.getId(), Priority.NORMAL.getPriority(), finishedMotion, beganMotion);
             }
         }
     }
@@ -218,7 +219,7 @@ public void changeScene(int index) {
         LAppDelegate.getInstance().getView().switchRenderingTarget(useRenderingTarget);
 
         // 別レンダリング先を選択した際の背景クリア色
-        float[] clearColor = {1.0f, 1.0f, 1.0f};
+        float[] clearColor = {0.0f, 0.0f, 0.0f};
         LAppDelegate.getInstance().getView().setRenderingTargetClearColor(clearColor[0], clearColor[1], clearColor[2]);
     }
 
@@ -256,6 +257,18 @@ public int getModelNum() {
         return models.size();
     }
 
+    /**
+     * モーション再生時に実行されるコールバック関数
+     */
+    private static class BeganMotion implements IBeganMotionCallback {
+        @Override
+        public void execute(ACubismMotion motion) {
+            LAppPal.printLog("Motion Began: " + motion);
+        }
+    }
+
+    private static final BeganMotion beganMotion = new BeganMotion();
+
     /**
      * モーション終了時に実行されるコールバック関数
      */