diff --git a/CHANGELOG.md b/CHANGELOG.md index 72b9b49..91dd03d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,19 @@ 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.1-beta.1] - 2023-08-17 + +### Added + +* Add Wankoromochi as a model bundled with SDK. + +### Changed + +* Change the minimum support version of Android OS to 5.0 (API 21). +* Unify Offscreen drawing-related terminology with `OffscreenSurface`. +* Adjust to automatically search and use models in the assets folder. + + ## [4-r.1] - 2023-05-25 ### Added @@ -75,6 +88,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). * New released! +[5-r.1-beta.1]: https://github.com/Live2D/CubismJavaSamples/compare/4-r.1...5-r.1-beta.1 [4-r.1]: https://github.com/Live2D/CubismJavaSamples/compare/4-r.1-beta.4...4-r.1 [4-r.1-beta.4]: https://github.com/Live2D/CubismJavaSamples/compare/4-r.1-beta.3...4-r.1-beta.4 [4-r.1-beta.3]: https://github.com/Live2D/CubismJavaSamples/compare/4-r.1-beta.2...4-r.1-beta.3 diff --git a/Core/CHANGELOG.md b/Core/CHANGELOG.md index fc5b177..3ca60c4 100644 --- a/Core/CHANGELOG.md +++ b/Core/CHANGELOG.md @@ -4,6 +4,26 @@ 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/). + +## 2023-08-17 + +### Added + +* Enhance Blend Shape features. + * Please see [here](https://docs.live2d.com/en/cubism-editor-manual/blend-shape/). + +### Changed + +* Upgrade Core version to 05.00.0000. + + +## 2023-05-09 + +### Changed + +* Change the GCC version of the library for Linux from 6.5.0 to 8.3.0. + + ## 2023-03-16 ### Fixed diff --git a/Framework b/Framework index 0163379..e55d802 160000 --- a/Framework +++ b/Framework @@ -1 +1 @@ -Subproject commit 01633795da2c1717be88f6e3d60a119d6f15cdf0 +Subproject commit e55d8026657aa57071751013d244b29cdcfa560c diff --git a/LICENSE.md b/LICENSE.md index 5c5d0fd..5cc3fe6 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -53,6 +53,7 @@ Sample/src/main/assets/Mao Sample/src/main/assets/Mark Sample/src/main/assets/Natori Sample/src/main/assets/Rice +Sample/src/main/assets/Wanko ``` If you use these models, you must agree to the terms of a contract set [here](https://docs.live2d.com/cubism-editor-manual/sample-model/) for each model. diff --git a/README.ja.md b/README.ja.md index 98f03bb..c686ea4 100644 --- a/README.ja.md +++ b/README.ja.md @@ -4,13 +4,21 @@ # Cubism Java Samples -Live2D Cubism 4 Editor で出力したモデルを表示するアプリケーションのサンプル実装です。 +Live2D Cubism Editor で出力したモデルを表示するアプリケーションのサンプル実装です。 Cubism Java Framework および Live2D Cubism Core Javaと組み合わせて使用します。 ## ライセンス 本 SDK を使用する前に[ライセンス](LICENSE.md)をご確認ください。 + +## Cubism 5新機能や過去バージョンとの互換性について + +本 SDK はCubism 5に対応した製品です。 +Cubism 5 Editorに搭載された新機能のSDK対応については [こちら](https://docs.live2d.com/cubism-sdk-manual/cubism-5-new-functions/)をご確認ください。 +過去バージョンのCubism SDKとの互換性については [こちら](https://docs.live2d.com/cubism-sdk-manual/compatibility-with-cubism-5/)をご確認ください。 + + ## ディレクトリ構成 ``` @@ -59,10 +67,9 @@ Android Studioでプロジェクトを開きビルドすることを推奨しま | 開発ツール | バージョン | |----------------|------------------| -| Android Studio | Flamingo 2022.2.1 Patch 1 | -| IntelliJ IDEA | 2023.1.1 | +| Android Studio | Giraffe 2022.3.1 | | CMake | 3.1.0 | -| Gradle | 6.9 | +| Gradle | 8.1.1 | ### Android @@ -76,7 +83,7 @@ Android Studioでプロジェクトを開きビルドすることを推奨しま ### Java -本サンプルアプリケーションは**Java SE 6**以上のJavaバージョンで動作します。 +本サンプルアプリケーションは**Java SE 7**以上のJavaバージョンで動作します。 ### Android | バージョン | デバイス | Tegra | @@ -85,7 +92,7 @@ Android Studioでプロジェクトを開きビルドすることを推奨しま | 7.1.1 | Nexus 9 | ✔ | | 4.1 | Pixel 5 | | -本サンプルアプリケーションは**Android API 16**以上のAndroidバージョンで動作します。 +本サンプルアプリケーションは**Android API 21**以上のAndroidバージョンで動作します。 ## プロジェクトへの貢献 diff --git a/README.md b/README.md index a53b689..14eac91 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ # Cubism Java Samples -This is a sample implementation of an application that displays models output by the Live2D Cubism 4 Editor. +This is a sample implementation of an application that displays models output by the Live2D Cubism Editor. It is used in conjunction with Cubism Java Framework and Live2D Cubism Core Java. @@ -12,6 +12,14 @@ It is used in conjunction with Cubism Java Framework and Live2D Cubism Core Java Please check the [license](LICENSE.md) before using this SDK. + +## Compatibility with Cubism 5 new features and previous Cubism SDK versions + +This SDK is compatible with Cubism 5. +For SDK compatibility with new features in Cubism 5 Editor, please refer to [here](https://docs.live2d.com/en/cubism-sdk-manual/cubism-5-new-functions/). +For compatibility with previous versions of Cubism SDK, please refer to [here](https://docs.live2d.com/en/cubism-sdk-manual/compatibility-with-cubism-5/). + + ## Directory structure ``` @@ -59,10 +67,9 @@ Please refer to [CHANGELOG.md](CHANGELOG.md) for the changelog of this repositor | Development Tools | Version | |-------------------|--| -| Android Studio | Flamingo 2022.2.1 Patch 1 | -| IntelliJ IDEA | 2023.1.1 | +| Android Studio | Giraffe 2022.3.1 | | CMake | 3.1.0 | -| Gradle | 6.9 | +| Gradle | 8.1.1 | ### Android @@ -76,7 +83,7 @@ Please refer to [CHANGELOG.md](CHANGELOG.md) for the changelog of this repositor ### Java -This sample application runs with **Java SE 6** or higher Java versions. +This sample application runs with **Java SE 7** or higher Java versions. ### Android @@ -86,7 +93,7 @@ This sample application runs with **Java SE 6** or higher Java versions. | 7.1.1 | Nexus 9 | ✔︎ | | 4.1 | Pixel 5 || -This sample application runs with **Android API 16** or higher Android versions. +This sample application runs with **Android API 21** or higher Android versions. ## Contributing diff --git a/Sample/build.gradle b/Sample/build.gradle index 813c34a..4376aed 100644 --- a/Sample/build.gradle +++ b/Sample/build.gradle @@ -3,6 +3,7 @@ plugins { } android { + namespace = "com.live2d.demo" compileSdkVersion PROP_COMPILE_SDK_VERSION.toInteger() defaultConfig { @@ -52,8 +53,8 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_6 - targetCompatibility JavaVersion.VERSION_1_6 + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 } lintOptions { diff --git a/Sample/src/full/java/com/live2d/demo/full/LAppDelegate.java b/Sample/src/full/java/com/live2d/demo/full/LAppDelegate.java index 9935662..a50eded 100644 --- a/Sample/src/full/java/com/live2d/demo/full/LAppDelegate.java +++ b/Sample/src/full/java/com/live2d/demo/full/LAppDelegate.java @@ -11,7 +11,6 @@ import android.opengl.GLES20; import android.os.Build; import com.live2d.demo.LAppDefine; -import com.live2d.demo.LAppDefine.ModelDir; import com.live2d.sdk.cubism.framework.CubismFramework; import static android.opengl.GLES20.*; @@ -93,7 +92,7 @@ public void onSurfaceChanged(int width, int height) { // load models if (LAppLive2DManager.getInstance().getCurrentModel() != currentModel) { - LAppLive2DManager.getInstance().changeScene(currentModel.getOrder()); + LAppLive2DManager.getInstance().changeScene(currentModel); } isActive = true; @@ -220,7 +219,7 @@ public int getWindowHeight() { private static LAppDelegate s_instance; private LAppDelegate() { - currentModel = ModelDir.values()[0]; + currentModel = 0; // Set up Cubism SDK framework. cubismOption.logFunction = new LAppPal.PrintLogFunction(); @@ -243,7 +242,7 @@ private LAppDelegate() { /** * モデルシーンインデックス */ - private ModelDir currentModel; + private int currentModel; /** * クリックしているか diff --git a/Sample/src/full/java/com/live2d/demo/full/LAppLive2DManager.java b/Sample/src/full/java/com/live2d/demo/full/LAppLive2DManager.java index 0d8092e..1972259 100644 --- a/Sample/src/full/java/com/live2d/demo/full/LAppLive2DManager.java +++ b/Sample/src/full/java/com/live2d/demo/full/LAppLive2DManager.java @@ -11,9 +11,13 @@ import com.live2d.sdk.cubism.framework.motion.ACubismMotion; import com.live2d.sdk.cubism.framework.motion.IFinishedMotionCallback; +import java.io.IOException; import java.util.ArrayList; +import java.util.Collections; import java.util.List; +import android.content.res.AssetManager; + import static com.live2d.demo.LAppDefine.*; /** @@ -42,6 +46,34 @@ public void releaseAllModel() { models.clear(); } + /** + * assets フォルダにあるモデルフォルダ名をセットする + */ + public void setUpModel() { + // assetsフォルダの中にあるフォルダ名を全てクロールし、モデルが存在するフォルダを定義する。 + // フォルダはあるが同名の.model3.jsonが見つからなかった場合はリストに含めない。 + modelDir.clear(); + + final AssetManager assets = LAppDelegate.getInstance().getActivity().getResources().getAssets(); + try { + String[] root = assets.list(""); + for (String subdir: root) { + String[] files = assets.list(subdir); + String target = subdir + ".model3.json"; + // フォルダと同名の.model3.jsonがあるか探索する + for (String file : files) { + if (file.equals(target)) { + modelDir.add(subdir); + break; + } + } + } + Collections.sort(modelDir); + } catch (IOException ex) { + throw new IllegalStateException(ex); + } + } + // モデル更新処理及び描画処理を行う public void onUpdate() { int width = LAppDelegate.getInstance().getWindowWidth(); @@ -132,7 +164,7 @@ else if (model.hitTest(HitAreaName.BODY.getId(), x, y)) { * サンプルアプリケーションではモデルセットの切り替えを行う */ public void nextScene() { - final int number = (currentModel.getOrder() + 1) % ModelDir.values().length; + final int number = (currentModel + 1) % modelDir.size(); changeScene(number); } @@ -143,14 +175,15 @@ public void nextScene() { * @param index 切り替えるシーンインデックス */ public void changeScene(int index) { - currentModel = ModelDir.values()[index]; + currentModel = index; if (DEBUG_LOG_ENABLE) { - LAppPal.printLog("model index: " + currentModel.getOrder()); + LAppPal.printLog("model index: " + currentModel); } - String modelDirName = currentModel.getDirName(); + String modelDirName = modelDir.get(index); + String modelPath = ResourcePath.ROOT.getPath() + modelDirName + "/"; - String modelJsonName = currentModel.getDirName() + ".model3.json"; + String modelJsonName = modelDirName + ".model3.json"; releaseAllModel(); @@ -207,7 +240,7 @@ public LAppModel getModel(int number) { * * @return シーンインデックス */ - public ModelDir getCurrentModel() { + public int getCurrentModel() { return currentModel; } @@ -241,16 +274,21 @@ public void execute(ACubismMotion motion) { private static LAppLive2DManager s_instance; private LAppLive2DManager() { - currentModel = ModelDir.values()[0]; - changeScene(currentModel.getOrder()); + setUpModel(); + changeScene(0); } - private final List models = new ArrayList(); + private final List models = new ArrayList<>(); /** * 表示するシーンのインデックス値 */ - private ModelDir currentModel; + private int currentModel; + + /** + * モデルディレクトリ名 + */ + private final List modelDir = new ArrayList<>(); // onUpdateメソッドで使用されるキャッシュ変数 private final CubismMatrix44 viewMatrix = CubismMatrix44.create(); diff --git a/Sample/src/full/java/com/live2d/demo/full/LAppView.java b/Sample/src/full/java/com/live2d/demo/full/LAppView.java index f625972..e26b349 100644 --- a/Sample/src/full/java/com/live2d/demo/full/LAppView.java +++ b/Sample/src/full/java/com/live2d/demo/full/LAppView.java @@ -184,7 +184,7 @@ public void render() { * @param refModel モデルデータ */ public void preModelDraw(LAppModel refModel) { - // 別のレンダリングターゲットへ向けて描画する場合の使用するフレームバッファ + // 別のレンダリングターゲットへ向けて描画する場合の使用するオフスクリーンサーフェス CubismOffscreenSurfaceAndroid useTarget; // 別のレンダリングターゲットへ向けて描画する場合 @@ -201,7 +201,7 @@ public void preModelDraw(LAppModel refModel) { int height = LAppDelegate.getInstance().getWindowHeight(); // モデル描画キャンバス - useTarget.createOffscreenFrame((int) width, (int) height, null); + useTarget.createOffscreenSurface((int) width, (int) height, null); } // レンダリング開始 useTarget.beginDraw(null); diff --git a/Sample/src/main/assets/Wanko/Wanko.1024/texture_00.png b/Sample/src/main/assets/Wanko/Wanko.1024/texture_00.png new file mode 100644 index 0000000..09ee282 Binary files /dev/null and b/Sample/src/main/assets/Wanko/Wanko.1024/texture_00.png differ diff --git a/Sample/src/main/assets/Wanko/Wanko.cdi3.json b/Sample/src/main/assets/Wanko/Wanko.cdi3.json new file mode 100644 index 0000000..5411d28 --- /dev/null +++ b/Sample/src/main/assets/Wanko/Wanko.cdi3.json @@ -0,0 +1,261 @@ +{ + "Version": 3, + "Parameters": [ + { + "Id": "PARAM_ANGLE_X", + "GroupId": "", + "Name": "角度 X" + }, + { + "Id": "PARAM_ANGLE_Y", + "GroupId": "", + "Name": "角度 Y" + }, + { + "Id": "PARAM_ANGLE_Z", + "GroupId": "", + "Name": "角度 Z" + }, + { + "Id": "PARAM_EYE_L_OPEN", + "GroupId": "", + "Name": "左眼　開閉" + }, + { + "Id": "PARAM_EYE_R_OPEN", + "GroupId": "", + "Name": "右眼　開閉" + }, + { + "Id": "PARAM_MOUTH_FORM", + "GroupId": "", + "Name": "口　変形" + }, + { + "Id": "PARAM_MOUTH_OPEN_Y", + "GroupId": "", + "Name": "口　開閉" + }, + { + "Id": "PARAM_TERE", + "GroupId": "", + "Name": "照れ" + }, + { + "Id": "PARAM_BODY_ANGLE_X", + "GroupId": "", + "Name": "体の回転　X" + }, + { + "Id": "PARAM_BODY_ANGLE_Z", + "GroupId": "", + "Name": "体の回転　Z" + }, + { + "Id": "PARAM_BODY_ANGLE_Y", + "GroupId": "", + "Name": "体の回転　Y" + }, + { + "Id": "PARAM_BREATH", + "GroupId": "", + "Name": "呼吸" + }, + { + "Id": "PARAM_BOWL_LID", + "GroupId": "", + "Name": "お椀　ふた" + }, + { + "Id": "PARAM_YUGE_01", + "GroupId": "", + "Name": "湯気" + }, + { + "Id": "PARAM_YUGE_02", + "GroupId": "", + "Name": "湯気" + }, + { + "Id": "PARAM_EFFECT", + "GroupId": "", + "Name": "エフェクト" + }, + { + "Id": "PARAM_EAR_L", + "GroupId": "", + "Name": "左耳" + }, + { + "Id": "PARAM_EAR_R", + "GroupId": "", + "Name": "右耳" + }, + { + "Id": "PARAM_HAND_L", + "GroupId": "", + "Name": "左手" + }, + { + "Id": "PARAM_HAND_R", + "GroupId": "", + "Name": "右手" + }, + { + "Id": "PARAM_SWING", + "GroupId": "", + "Name": "揺れ" + }, + { + "Id": "PARAM_BOWL_SWING", + "GroupId": "", + "Name": "揺れ　お椀" + }, + { + "Id": "PARAM_FACE_01", + "GroupId": "", + "Name": "どや キリッ" + }, + { + "Id": "PARAM_BASE_X", + "GroupId": "", + "Name": "全体の左右" + }, + { + "Id": "PARAM_BASE_Y", + "GroupId": "", + "Name": "全体の上下" + } + ], + "ParameterGroups": [], + "Parts": [ + { + "Id": "PARTS_01_SKETCH", + "Name": "[ 下絵 ]" + }, + { + "Id": "PARTS_01_BACKGROUND", + "Name": "背景" + }, + { + "Id": "PARTS_01_BOWL", + "Name": "お椀" + }, + { + "Id": "PARTS_01_BODY", + "Name": "体" + }, + { + "Id": "PARTS_01_EAR_001", + "Name": "耳" + }, + { + "Id": "PARTS_01_NOSE_001", + "Name": "鼻" + }, + { + "Id": "PARTS_01_MOUTH_001", + "Name": "口" + }, + { + "Id": "PARTS_01_BROW_001", + "Name": "まゆ毛" + }, + { + "Id": "PARTS_01_EYE_BALL_001", + "Name": "目玉" + }, + { + "Id": "PARTS_01_EYE_001", + "Name": "目" + }, + { + "Id": "PARTS_01_FACE_001", + "Name": "顔" + }, + { + "Id": "PARTS_01_HOHO", + "Name": "頬" + }, + { + "Id": "PARTS_01_EFFECT", + "Name": "エフェクト" + }, + { + "Id": "PARTS_01_ITEM_16", + "Name": "蕎麦６杯目" + }, + { + "Id": "PARTS_01_ITEM_15", + "Name": "ベニテングタケ" + }, + { + "Id": "PARTS_01_ITEM_14", + "Name": "蕎麦５杯目" + }, + { + "Id": "PARTS_01_ITEM_13", + "Name": "しいたけ" + }, + { + "Id": "PARTS_01_ITEM_12", + "Name": "みかん" + }, + { + "Id": "PARTS_01_ITEM_11", + "Name": "蕎麦４杯目" + }, + { + "Id": "PARTS_01_ITEM_10", + "Name": "王冠" + }, + { + "Id": "PARTS_01_ITEM_09", + "Name": "まゆげ" + }, + { + "Id": "PARTS_01_ITEM_08", + "Name": "蕎麦３杯目" + }, + { + "Id": "PARTS_01_ITEM_07", + "Name": "アフロ" + }, + { + "Id": "PARTS_01_ITEM_06", + "Name": "リボン" + }, + { + "Id": "PARTS_01_ITEM_05", + "Name": "蕎麦２杯目" + }, + { + "Id": "PARTS_01_ITEM_04", + "Name": "星" + }, + { + "Id": "PARTS_01_ITEM_03", + "Name": "ひげ" + }, + { + "Id": "PARTS_01_ITEM_02", + "Name": "蕎麦１杯目" + }, + { + "Id": "PARTS_01_ITEM_01", + "Name": "たんぽぽ" + }, + { + "Id": "PARTS_01_CORE_ITEM", + "Name": "コア　アイテム" + }, + { + "Id": "PARTS_01_CORE", + "Name": "コア" + }, + { + "Id": "ROUGH", + "Name": "ラフ" + } + ] +} \ No newline at end of file diff --git a/Sample/src/main/assets/Wanko/Wanko.moc3 b/Sample/src/main/assets/Wanko/Wanko.moc3 new file mode 100644 index 0000000..b686610 Binary files /dev/null and b/Sample/src/main/assets/Wanko/Wanko.moc3 differ diff --git a/Sample/src/main/assets/Wanko/Wanko.model3.json b/Sample/src/main/assets/Wanko/Wanko.model3.json new file mode 100644 index 0000000..95ffeeb --- /dev/null +++ b/Sample/src/main/assets/Wanko/Wanko.model3.json @@ -0,0 +1,55 @@ +{ + "Version": 3, + "FileReferences": { + "Moc": "Wanko.moc3", + "Textures": [ + "Wanko.1024/texture_00.png" + ], + "Physics": "Wanko.physics3.json", + "DisplayInfo": "Wanko.cdi3.json", + "Motions": { + "Idle": [ + { + "File": "motions/idle_01.motion3.json" + }, + { + "File": "motions/idle_03.motion3.json" + }, + { + "File": "motions/idle_04.motion3.json" + } + ], + "TapBody": [ + { + "File": "motions/touch_02.motion3.json" + }, + { + "File": "motions/touch_04.motion3.json" + } + ] + } + }, + "Groups": [ + { + "Target": "Parameter", + "Name": "EyeBlink", + "Ids": [ + "PARAM_EYE_L_OPEN", + "PARAM_EYE_R_OPEN" + ] + }, + { + "Target": "Parameter", + "Name": "LipSync", + "Ids": [ + "PARAM_MOUTH_OPEN_Y" + ] + } + ], + "HitAreas": [ + { + "Id": "HitArea", + "Name": "Body" + } + ] +} \ No newline at end of file diff --git a/Sample/src/main/assets/Wanko/Wanko.physics3.json b/Sample/src/main/assets/Wanko/Wanko.physics3.json new file mode 100644 index 0000000..604bbfb --- /dev/null +++ b/Sample/src/main/assets/Wanko/Wanko.physics3.json @@ -0,0 +1,373 @@ +{ + "Version": 3, + "Meta": { + "PhysicsSettingCount": 4, + "TotalInputCount": 14, + "TotalOutputCount": 4, + "VertexCount": 8, + "EffectiveForces": { + "Gravity": { + "X": 0, + "Y": -1 + }, + "Wind": { + "X": 0, + "Y": 0 + } + }, + "PhysicsDictionary": [ + { + "Id": "PhysicsSetting1", + "Name": "お椀揺れ" + }, + { + "Id": "PhysicsSetting2", + "Name": "揺れ" + }, + { + "Id": "PhysicsSetting3", + "Name": "右耳" + }, + { + "Id": "PhysicsSetting4", + "Name": "左耳" + } + ] + }, + "PhysicsSettings": [ + { + "Id": "PhysicsSetting1", + "Input": [ + { + "Source": { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_X" + }, + "Weight": 100, + "Type": "X", + "Reflect": false + }, + { + "Source": { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Z" + }, + "Weight": 100, + "Type": "Angle", + "Reflect": false + } + ], + "Output": [ + { + "Destination": { + "Target": "Parameter", + "Id": "PARAM_BOWL_SWING" + }, + "VertexIndex": 1, + "Scale": 1, + "Weight": 100, + "Type": "Angle", + "Reflect": false + } + ], + "Vertices": [ + { + "Position": { + "X": 0, + "Y": 0 + }, + "Mobility": 1, + "Delay": 1, + "Acceleration": 1, + "Radius": 0 + }, + { + "Position": { + "X": 0, + "Y": 3 + }, + "Mobility": 0.8, + "Delay": 0.9, + "Acceleration": 1.5, + "Radius": 3 + } + ], + "Normalization": { + "Position": { + "Minimum": -10, + "Default": 0, + "Maximum": 10 + }, + "Angle": { + "Minimum": -10, + "Default": 0, + "Maximum": 10 + } + } + }, + { + "Id": "PhysicsSetting2", + "Input": [ + { + "Source": { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Y" + }, + "Weight": 100, + "Type": "X", + "Reflect": false + }, + { + "Source": { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Z" + }, + "Weight": 100, + "Type": "Angle", + "Reflect": false + } + ], + "Output": [ + { + "Destination": { + "Target": "Parameter", + "Id": "PARAM_SWING" + }, + "VertexIndex": 1, + "Scale": 1, + "Weight": 100, + "Type": "Angle", + "Reflect": false + } + ], + "Vertices": [ + { + "Position": { + "X": 0, + "Y": 0 + }, + "Mobility": 1, + "Delay": 1, + "Acceleration": 1, + "Radius": 0 + }, + { + "Position": { + "X": 0, + "Y": 5 + }, + "Mobility": 0.85, + "Delay": 0.9, + "Acceleration": 1, + "Radius": 5 + } + ], + "Normalization": { + "Position": { + "Minimum": -10, + "Default": 0, + "Maximum": 10 + }, + "Angle": { + "Minimum": -10, + "Default": 0, + "Maximum": 10 + } + } + }, + { + "Id": "PhysicsSetting3", + "Input": [ + { + "Source": { + "Target": "Parameter", + "Id": "PARAM_ANGLE_X" + }, + "Weight": 50, + "Type": "X", + "Reflect": false + }, + { + "Source": { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Y" + }, + "Weight": 20, + "Type": "X", + "Reflect": false + }, + { + "Source": { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Z" + }, + "Weight": 60, + "Type": "Angle", + "Reflect": false + }, + { + "Source": { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_X" + }, + "Weight": 30, + "Type": "X", + "Reflect": false + }, + { + "Source": { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Z" + }, + "Weight": 40, + "Type": "Angle", + "Reflect": false + } + ], + "Output": [ + { + "Destination": { + "Target": "Parameter", + "Id": "PARAM_EAR_R" + }, + "VertexIndex": 1, + "Scale": 1.5, + "Weight": 100, + "Type": "Angle", + "Reflect": false + } + ], + "Vertices": [ + { + "Position": { + "X": 0, + "Y": 0 + }, + "Mobility": 1, + "Delay": 1, + "Acceleration": 1, + "Radius": 0 + }, + { + "Position": { + "X": 0, + "Y": 5.5 + }, + "Mobility": 0.95, + "Delay": 0.9, + "Acceleration": 1.5, + "Radius": 5.5 + } + ], + "Normalization": { + "Position": { + "Minimum": -10, + "Default": 0, + "Maximum": 10 + }, + "Angle": { + "Minimum": -10, + "Default": 0, + "Maximum": 10 + } + } + }, + { + "Id": "PhysicsSetting4", + "Input": [ + { + "Source": { + "Target": "Parameter", + "Id": "PARAM_ANGLE_X" + }, + "Weight": 50, + "Type": "X", + "Reflect": false + }, + { + "Source": { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Y" + }, + "Weight": 20, + "Type": "X", + "Reflect": true + }, + { + "Source": { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Z" + }, + "Weight": 60, + "Type": "Angle", + "Reflect": false + }, + { + "Source": { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_X" + }, + "Weight": 30, + "Type": "X", + "Reflect": false + }, + { + "Source": { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Z" + }, + "Weight": 40, + "Type": "Angle", + "Reflect": false + } + ], + "Output": [ + { + "Destination": { + "Target": "Parameter", + "Id": "PARAM_EAR_L" + }, + "VertexIndex": 1, + "Scale": 1.5, + "Weight": 100, + "Type": "Angle", + "Reflect": false + } + ], + "Vertices": [ + { + "Position": { + "X": 0, + "Y": 0 + }, + "Mobility": 1, + "Delay": 1, + "Acceleration": 1, + "Radius": 0 + }, + { + "Position": { + "X": 0, + "Y": 5.5 + }, + "Mobility": 0.95, + "Delay": 0.9, + "Acceleration": 1.5, + "Radius": 5.5 + } + ], + "Normalization": { + "Position": { + "Minimum": -10, + "Default": 0, + "Maximum": 10 + }, + "Angle": { + "Minimum": -10, + "Default": 0, + "Maximum": 10 + } + } + } + ] +} \ No newline at end of file diff --git a/Sample/src/main/assets/Wanko/motions/idle_01.motion3.json b/Sample/src/main/assets/Wanko/motions/idle_01.motion3.json new file mode 100644 index 0000000..86982bf --- /dev/null +++ b/Sample/src/main/assets/Wanko/motions/idle_01.motion3.json @@ -0,0 +1,699 @@ +{ + "Version": 3, + "Meta": { + "Duration": 5.967, + "Fps": 30.0, + "Loop": true, + "AreBeziersRestricted": true, + "CurveCount": 22, + "TotalSegmentCount": 85, + "TotalPointCount": 233, + "UserDataCount": 0, + "TotalUserDataSize": 0 + }, + "Curves": [ + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_X", + "Segments": [ + 0, + -1, + 1, + 0.222, + -1, + 0.444, + 0, + 0.667, + 0, + 1, + 0.911, + 0, + 1.156, + -1, + 1.4, + -1, + 1, + 1.622, + -1, + 1.844, + 0, + 2.067, + 0, + 1, + 2.322, + 0, + 2.578, + -1, + 2.833, + -1, + 1, + 3.067, + -1, + 3.3, + 0, + 3.533, + 0, + 1, + 3.844, + 0, + 4.156, + -1, + 4.467, + -1, + 1, + 4.656, + -1, + 4.844, + 0, + 5.033, + 0, + 1, + 5.333, + 0, + 5.633, + -1, + 5.933, + -1, + 0, + 5.967, + -1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Y", + "Segments": [ + 0, + 14, + 1, + 0.222, + 14, + 0.444, + -8, + 0.667, + -8, + 1, + 0.911, + -8, + 1.156, + 14, + 1.4, + 14, + 1, + 1.622, + 14, + 1.844, + -13, + 2.067, + -13, + 1, + 2.322, + -13, + 2.578, + 14, + 2.833, + 14, + 1, + 3.067, + 14, + 3.3, + -8, + 3.533, + -8, + 1, + 3.844, + -8, + 4.156, + 14, + 4.467, + 14, + 1, + 4.656, + 14, + 4.844, + -13, + 5.033, + -13, + 1, + 5.333, + -13, + 5.633, + 14, + 5.933, + 14, + 0, + 5.967, + 14 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Z", + "Segments": [ + 0, + -10, + 1, + 0.467, + -10, + 0.933, + 13, + 1.4, + 13, + 1, + 1.878, + 13, + 2.356, + -10, + 2.833, + -10, + 1, + 3.378, + -10, + 3.922, + 13, + 4.467, + 13, + 1, + 4.956, + 13, + 5.444, + -10, + 5.933, + -10, + 0, + 5.967, + -10 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_L_OPEN", + "Segments": [ + 0, + 1, + 1, + 0.622, + 1, + 1.244, + 1, + 1.867, + 1, + 1, + 1.922, + 1, + 1.978, + 0, + 2.033, + 0, + 1, + 2.133, + 0, + 2.233, + 1, + 2.333, + 1, + 1, + 3.533, + 1, + 4.733, + 1, + 5.933, + 1, + 0, + 5.967, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_R_OPEN", + "Segments": [ + 0, + 1, + 1, + 0.622, + 1, + 1.244, + 1, + 1.867, + 1, + 1, + 1.922, + 1, + 1.978, + 0, + 2.033, + 0, + 1, + 2.133, + 0, + 2.233, + 1, + 2.333, + 1, + 1, + 3.533, + 1, + 4.733, + 1, + 5.933, + 1, + 0, + 5.967, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_MOUTH_OPEN_Y", + "Segments": [ + 0, + 1, + 1, + 0.622, + 1, + 1.244, + 1, + 1.867, + 1, + 1, + 1.922, + 1, + 1.978, + 0, + 2.033, + 0, + 1, + 2.133, + 0, + 2.233, + 1, + 2.333, + 1, + 1, + 3.044, + 1, + 3.756, + 1, + 4.467, + 1, + 1, + 4.656, + 1, + 4.844, + 0, + 5.033, + 0, + 1, + 5.333, + 0, + 5.633, + 1, + 5.933, + 1, + 0, + 5.967, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_X", + "Segments": [ + 0, + -2, + 1, + 0.467, + -2, + 0.933, + 2, + 1.4, + 2, + 1, + 1.878, + 2, + 2.356, + -2, + 2.833, + -2, + 1, + 3.378, + -2, + 3.922, + 4, + 4.467, + 4, + 1, + 4.956, + 4, + 5.444, + -2, + 5.933, + -2, + 0, + 5.967, + -2 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Z", + "Segments": [ + 0, + -5, + 1, + 0.467, + -5, + 0.933, + 6, + 1.4, + 6, + 1, + 1.878, + 6, + 2.356, + -5, + 2.833, + -5, + 1, + 3.378, + -5, + 3.922, + 6, + 4.467, + 6, + 1, + 4.956, + 6, + 5.444, + -5, + 5.933, + -5, + 0, + 5.967, + -5 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 1.978, + 0, + 3.956, + 0, + 5.933, + 0, + 0, + 5.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BREATH", + "Segments": [ + 0, + 0, + 1, + 1.978, + 0, + 3.956, + 0, + 5.933, + 0, + 0, + 5.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_LID", + "Segments": [ + 0, + 50, + 1, + 1.978, + 50, + 3.956, + 50, + 5.933, + 50, + 0, + 5.967, + 50 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_01", + "Segments": [ + 0, + 0, + 1, + 1.978, + 0, + 3.956, + 0, + 5.933, + 0, + 0, + 5.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_02", + "Segments": [ + 0, + 0, + 1, + 1.978, + 0, + 3.956, + 0, + 5.933, + 0, + 0, + 5.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EFFECT", + "Segments": [ + 0, + 0, + 1, + 1.978, + 0, + 3.956, + 0, + 5.933, + 0, + 0, + 5.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_L", + "Segments": [ + 0, + 0, + 1, + 0.267, + 0, + 0.533, + 0, + 0.8, + 0, + 1, + 0.867, + 0, + 0.933, + 0.82, + 1, + 0.82, + 1, + 1.056, + 0.82, + 1.111, + -0.72, + 1.167, + -0.72, + 1, + 1.222, + -0.72, + 1.278, + 0.23, + 1.333, + 0.23, + 1, + 1.356, + 0.23, + 1.378, + 0, + 1.4, + 0, + 1, + 2.156, + 0, + 2.911, + 0, + 3.667, + 0, + 1, + 3.722, + 0, + 3.778, + 0.82, + 3.833, + 0.82, + 1, + 3.889, + 0.82, + 3.944, + -0.72, + 4, + -0.72, + 1, + 4.056, + -0.72, + 4.111, + 0.23, + 4.167, + 0.23, + 1, + 4.2, + 0.23, + 4.233, + 0, + 4.267, + 0, + 1, + 4.822, + 0, + 5.378, + 0, + 5.933, + 0, + 0, + 5.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_R", + "Segments": [ + 0, + 0, + 1, + 1.978, + 0, + 3.956, + 0, + 5.933, + 0, + 0, + 5.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_L", + "Segments": [ + 0, + 0, + 1, + 1.978, + 0, + 3.956, + 0, + 5.933, + 0, + 0, + 5.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_R", + "Segments": [ + 0, + 0, + 1, + 1.978, + 0, + 3.956, + 0, + 5.933, + 0, + 0, + 5.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_SWING", + "Segments": [ + 0, + 0, + 0, + 5.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_SWING", + "Segments": [ + 0, + 0, + 0, + 5.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_FACE_01", + "Segments": [ + 0, + 0, + 1, + 1.978, + 0, + 3.956, + 0, + 5.933, + 0, + 0, + 5.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BASE_X", + "Segments": [ + 0, + 0, + 0, + 5.967, + 0 + ] + } + ] +} \ No newline at end of file diff --git a/Sample/src/main/assets/Wanko/motions/idle_02.motion3.json b/Sample/src/main/assets/Wanko/motions/idle_02.motion3.json new file mode 100644 index 0000000..3493c37 --- /dev/null +++ b/Sample/src/main/assets/Wanko/motions/idle_02.motion3.json @@ -0,0 +1,818 @@ +{ + "Version": 3, + "Meta": { + "Duration": 6.933, + "Fps": 30.0, + "Loop": true, + "AreBeziersRestricted": true, + "CurveCount": 22, + "TotalSegmentCount": 102, + "TotalPointCount": 284, + "UserDataCount": 0, + "TotalUserDataSize": 0 + }, + "Curves": [ + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.3, + 0, + 0.6, + 0, + 0.9, + 0, + 1, + 1.167, + 0, + 1.433, + -2, + 1.7, + -2, + 1, + 1.889, + -2, + 2.078, + -2, + 2.267, + -2, + 1, + 2.633, + -2, + 3, + 0, + 3.367, + 0, + 1, + 3.567, + 0, + 3.767, + 0, + 3.967, + 0, + 1, + 4.322, + 0, + 4.678, + 0, + 5.033, + 0, + 1, + 5.156, + 0, + 5.278, + 0, + 5.4, + 0, + 1, + 5.9, + 0, + 6.4, + 0, + 6.9, + 0, + 0, + 6.933, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 0.3, + 0, + 0.6, + 0, + 0.9, + 0, + 1, + 1.167, + 0, + 1.433, + 15, + 1.7, + 15, + 1, + 1.889, + 15, + 2.078, + 15, + 2.267, + 15, + 1, + 2.633, + 15, + 3, + 0, + 3.367, + 0, + 1, + 3.567, + 0, + 3.767, + 0, + 3.967, + 0, + 1, + 4.322, + 0, + 4.678, + 0, + 5.033, + 0, + 1, + 5.078, + 0, + 5.122, + 11, + 5.167, + 11, + 1, + 5.244, + 11, + 5.322, + 0, + 5.4, + 0, + 1, + 5.9, + 0, + 6.4, + 0, + 6.9, + 0, + 0, + 6.933, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.3, + 0, + 0.6, + 0, + 0.9, + 0, + 1, + 1.167, + 0, + 1.433, + 23, + 1.7, + 23, + 1, + 1.889, + 23, + 2.078, + 23, + 2.267, + 23, + 1, + 2.633, + 23, + 3, + -7, + 3.367, + -7, + 1, + 3.567, + -7, + 3.767, + 0, + 3.967, + 0, + 1, + 4.322, + 0, + 4.678, + 0, + 5.033, + 0, + 1, + 5.656, + 0, + 6.278, + 0, + 6.9, + 0, + 0, + 6.933, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_L_OPEN", + "Segments": [ + 0, + 1, + 1, + 0.444, + 1, + 0.889, + 1, + 1.333, + 1, + 1, + 1.367, + 1, + 1.4, + 0, + 1.433, + 0, + 1, + 1.5, + 0, + 1.567, + 1, + 1.633, + 1, + 1, + 2.856, + 1, + 4.078, + 1, + 5.3, + 1, + 1, + 5.333, + 1, + 5.367, + 0, + 5.4, + 0, + 1, + 5.467, + 0, + 5.533, + 1, + 5.6, + 1, + 0, + 6.933, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_R_OPEN", + "Segments": [ + 0, + 1, + 1, + 0.444, + 1, + 0.889, + 1, + 1.333, + 1, + 1, + 1.367, + 1, + 1.4, + 0, + 1.433, + 0, + 1, + 1.5, + 0, + 1.567, + 1, + 1.633, + 1, + 1, + 2.856, + 1, + 4.078, + 1, + 5.3, + 1, + 1, + 5.333, + 1, + 5.367, + 0, + 5.4, + 0, + 1, + 5.467, + 0, + 5.533, + 1, + 5.6, + 1, + 0, + 6.933, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_MOUTH_OPEN_Y", + "Segments": [ + 0, + 1, + 1, + 0.978, + 1, + 1.956, + 1, + 2.933, + 1, + 1, + 3.078, + 1, + 3.222, + 0, + 3.367, + 0, + 1, + 3.8, + 0, + 4.233, + 0, + 4.667, + 0, + 1, + 4.789, + 0, + 4.911, + 0, + 5.033, + 0, + 1, + 5.111, + 0, + 5.189, + 1, + 5.267, + 1, + 1, + 5.4, + 1, + 5.533, + 0, + 5.667, + 0, + 1, + 5.911, + 0, + 6.156, + 0, + 6.4, + 0, + 1, + 6.567, + 0, + 6.733, + 1, + 6.9, + 1, + 0, + 6.933, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.3, + 0, + 0.6, + 0, + 0.9, + 0, + 1, + 2.278, + 0, + 3.656, + 0, + 5.033, + 0, + 1, + 5.656, + 0, + 6.278, + 0, + 6.9, + 0, + 0, + 6.933, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.3, + 0, + 0.6, + 0, + 0.9, + 0, + 1, + 1.167, + 0, + 1.433, + 10, + 1.7, + 10, + 1, + 1.889, + 10, + 2.078, + 10, + 2.267, + 10, + 1, + 2.833, + 10, + 3.4, + 0, + 3.967, + 0, + 1, + 4.322, + 0, + 4.678, + 0, + 5.033, + 0, + 1, + 5.656, + 0, + 6.278, + 0, + 6.9, + 0, + 0, + 6.933, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 2, + 0.333, + 2, + 1, + 0.522, + 2, + 0.711, + 0, + 0.9, + 0, + 1, + 1.011, + 0, + 1.122, + 8, + 1.233, + 8, + 1, + 1.389, + 8, + 1.544, + 0, + 1.7, + 0, + 1, + 1.889, + 0, + 2.078, + 0, + 2.267, + 0, + 1, + 2.489, + 0, + 2.711, + 3, + 2.933, + 3, + 1, + 3.078, + 3, + 3.222, + 0, + 3.367, + 0, + 1, + 3.567, + 0, + 3.767, + 0, + 3.967, + 0, + 1, + 4.2, + 0, + 4.433, + 2, + 4.667, + 2, + 1, + 4.789, + 2, + 4.911, + 0, + 5.033, + 0, + 1, + 5.078, + 0, + 5.122, + 8, + 5.167, + 8, + 1, + 5.244, + 8, + 5.322, + -2, + 5.4, + -2, + 1, + 5.456, + -2, + 5.511, + 1, + 5.567, + 1, + 1, + 5.6, + 1, + 5.633, + 0, + 5.667, + 0, + 1, + 5.789, + 0, + 5.911, + 0, + 6.033, + 0, + 1, + 6.156, + 0, + 6.278, + 3, + 6.4, + 3, + 1, + 6.567, + 3, + 6.733, + 0, + 6.9, + 0, + 0, + 6.933, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BREATH", + "Segments": [ + 0, + 0, + 0, + 6.933, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_LID", + "Segments": [ + 0, + 50, + 0, + 6.933, + 50 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_01", + "Segments": [ + 0, + 0, + 0, + 6.933, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_02", + "Segments": [ + 0, + 0, + 0, + 6.933, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EFFECT", + "Segments": [ + 0, + 0, + 0, + 6.933, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_L", + "Segments": [ + 0, + 0, + 1, + 1.656, + 0, + 3.311, + 0, + 4.967, + 0, + 1, + 5.011, + 0, + 5.056, + -0.57, + 5.1, + -0.57, + 1, + 5.167, + -0.57, + 5.233, + 0.55, + 5.3, + 0.55, + 1, + 5.367, + 0.55, + 5.433, + -0.24, + 5.5, + -0.24, + 1, + 5.556, + -0.24, + 5.611, + 0, + 5.667, + 0, + 0, + 6.933, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_R", + "Segments": [ + 0, + 0, + 1, + 1.656, + 0, + 3.311, + 0, + 4.967, + 0, + 1, + 5.011, + 0, + 5.056, + 0.5, + 5.1, + 0.5, + 1, + 5.167, + 0.5, + 5.233, + -0.64, + 5.3, + -0.64, + 1, + 5.367, + -0.64, + 5.433, + 0.18, + 5.5, + 0.18, + 1, + 5.556, + 0.18, + 5.611, + 0, + 5.667, + 0, + 0, + 6.933, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_L", + "Segments": [ + 0, + 0, + 0, + 6.933, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_R", + "Segments": [ + 0, + 0, + 0, + 6.933, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_SWING", + "Segments": [ + 0, + 0, + 0, + 6.933, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_SWING", + "Segments": [ + 0, + 0, + 0, + 6.933, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_FACE_01", + "Segments": [ + 0, + 0, + 0, + 6.933, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BASE_X", + "Segments": [ + 0, + 0, + 0, + 6.933, + 0 + ] + } + ] +} \ No newline at end of file diff --git a/Sample/src/main/assets/Wanko/motions/idle_03.motion3.json b/Sample/src/main/assets/Wanko/motions/idle_03.motion3.json new file mode 100644 index 0000000..db19098 --- /dev/null +++ b/Sample/src/main/assets/Wanko/motions/idle_03.motion3.json @@ -0,0 +1,783 @@ +{ + "Version": 3, + "Meta": { + "Duration": 6.7, + "Fps": 30.0, + "Loop": true, + "AreBeziersRestricted": true, + "CurveCount": 22, + "TotalSegmentCount": 97, + "TotalPointCount": 269, + "UserDataCount": 0, + "TotalUserDataSize": 0 + }, + "Curves": [ + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.378, + 0, + 0.756, + -14, + 1.133, + -14, + 1, + 1.344, + -14, + 1.556, + -14, + 1.767, + -14, + 1, + 2.189, + -14, + 2.611, + -14, + 3.033, + -14, + 1, + 3.8, + -14, + 4.567, + -14, + 5.333, + -14, + 1, + 5.678, + -14, + 6.022, + 0, + 6.367, + 0, + 1, + 6.467, + 0, + 6.567, + 0, + 6.667, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 0.378, + 0, + 0.756, + 16, + 1.133, + 16, + 1, + 1.344, + 16, + 1.556, + 16, + 1.767, + 16, + 1, + 2.956, + 16, + 4.144, + 16, + 5.333, + 16, + 1, + 5.678, + 16, + 6.022, + 0, + 6.367, + 0, + 1, + 6.467, + 0, + 6.567, + 0, + 6.667, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.378, + 0, + 0.756, + 0, + 1.133, + 0, + 1, + 1.344, + 0, + 1.556, + 0, + 1.767, + 0, + 1, + 2.956, + 0, + 4.144, + 0, + 5.333, + 0, + 1, + 5.678, + 0, + 6.022, + 0, + 6.367, + 0, + 1, + 6.467, + 0, + 6.567, + 0, + 6.667, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_L_OPEN", + "Segments": [ + 0, + 1, + 1, + 0.478, + 1, + 0.956, + 1, + 1.433, + 1, + 1, + 1.544, + 1, + 1.656, + 0, + 1.767, + 0, + 1, + 2.022, + 0, + 2.278, + 0, + 2.533, + 0, + 1, + 2.689, + 0, + 2.844, + 0, + 3, + 0, + 1, + 3.111, + 0, + 3.222, + 1, + 3.333, + 1, + 1, + 4, + 1, + 4.667, + 1, + 5.333, + 1, + 1, + 5.456, + 1, + 5.578, + 1, + 5.7, + 1, + 1, + 5.733, + 1, + 5.767, + 0, + 5.8, + 0, + 1, + 5.867, + 0, + 5.933, + 1, + 6, + 1, + 0, + 6.7, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_R_OPEN", + "Segments": [ + 0, + 1, + 1, + 0.478, + 1, + 0.956, + 1, + 1.433, + 1, + 1, + 1.544, + 1, + 1.656, + 0, + 1.767, + 0, + 1, + 2.022, + 0, + 2.278, + 0, + 2.533, + 0, + 1, + 2.689, + 0, + 2.844, + 0, + 3, + 0, + 1, + 3.111, + 0, + 3.222, + 1, + 3.333, + 1, + 1, + 4, + 1, + 4.667, + 1, + 5.333, + 1, + 1, + 5.456, + 1, + 5.578, + 1, + 5.7, + 1, + 1, + 5.733, + 1, + 5.767, + 0, + 5.8, + 0, + 1, + 5.867, + 0, + 5.933, + 1, + 6, + 1, + 0, + 6.7, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_MOUTH_OPEN_Y", + "Segments": [ + 0, + 0, + 1, + 1.422, + 0, + 2.844, + 0, + 4.267, + 0, + 1, + 4.378, + 0, + 4.489, + 0.6, + 4.6, + 0.6, + 1, + 4.733, + 0.6, + 4.867, + 0, + 5, + 0, + 1, + 5.456, + 0, + 5.911, + 0, + 6.367, + 0, + 1, + 6.467, + 0, + 6.567, + 0, + 6.667, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.378, + 0, + 0.756, + -9, + 1.133, + -9, + 1, + 2.533, + -9, + 3.933, + -9, + 5.333, + -9, + 1, + 5.678, + -9, + 6.022, + 0, + 6.367, + 0, + 1, + 6.467, + 0, + 6.567, + 0, + 6.667, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.122, + 0, + 0.244, + 0, + 0.367, + 0, + 1, + 0.622, + 0, + 0.878, + -2, + 1.133, + -2, + 1, + 2.533, + -2, + 3.933, + 0, + 5.333, + 0, + 1, + 5.678, + 0, + 6.022, + 0, + 6.367, + 0, + 1, + 6.467, + 0, + 6.567, + 0, + 6.667, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 0.122, + 0, + 0.244, + 4, + 0.367, + 4, + 1, + 0.511, + 4, + 0.656, + -1, + 0.8, + -1, + 1, + 0.856, + -1, + 0.911, + 1, + 0.967, + 1, + 1, + 1.044, + 1, + 1.122, + 0, + 1.2, + 0, + 1, + 1.389, + 0, + 1.578, + 0, + 1.767, + 0, + 1, + 1.8, + 0, + 1.833, + 2, + 1.867, + 2, + 1, + 1.911, + 2, + 1.956, + 0, + 2, + 0, + 1, + 2.044, + 0, + 2.089, + 1, + 2.133, + 1, + 1, + 2.178, + 1, + 2.222, + 0, + 2.267, + 0, + 1, + 2.622, + 0, + 2.978, + 0, + 3.333, + 0, + 1, + 3.511, + 0, + 3.689, + 0, + 3.867, + 0, + 1, + 4, + 0, + 4.133, + -1, + 4.267, + -1, + 1, + 4.411, + -1, + 4.556, + 2, + 4.7, + 2, + 1, + 4.911, + 2, + 5.122, + 1.884, + 5.333, + 0, + 1, + 5.489, + -1.388, + 5.644, + -5, + 5.8, + -5, + 1, + 5.989, + -5, + 6.178, + 0, + 6.367, + 0, + 1, + 6.467, + 0, + 6.567, + 0, + 6.667, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BREATH", + "Segments": [ + 0, + 0, + 1, + 1.778, + 0, + 3.556, + 0, + 5.333, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_LID", + "Segments": [ + 0, + 50, + 1, + 1.778, + 50, + 3.556, + 50, + 5.333, + 50, + 0, + 6.7, + 50 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_01", + "Segments": [ + 0, + 0, + 1, + 1.778, + 0, + 3.556, + 0, + 5.333, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_02", + "Segments": [ + 0, + 0, + 1, + 1.778, + 0, + 3.556, + 0, + 5.333, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EFFECT", + "Segments": [ + 0, + 0, + 1, + 1.778, + 0, + 3.556, + 0, + 5.333, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_L", + "Segments": [ + 0, + 0, + 1, + 1.778, + 0, + 3.556, + 0, + 5.333, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_R", + "Segments": [ + 0, + 0, + 1, + 1.778, + 0, + 3.556, + 0, + 5.333, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_L", + "Segments": [ + 0, + 0, + 1, + 1.778, + 0, + 3.556, + 0, + 5.333, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_R", + "Segments": [ + 0, + 0, + 1, + 1.778, + 0, + 3.556, + 0, + 5.333, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_SWING", + "Segments": [ + 0, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_SWING", + "Segments": [ + 0, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_FACE_01", + "Segments": [ + 0, + 0, + 1, + 1.778, + 0, + 3.556, + 0, + 5.333, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BASE_X", + "Segments": [ + 0, + 0, + 0, + 6.7, + 0 + ] + } + ] +} \ No newline at end of file diff --git a/Sample/src/main/assets/Wanko/motions/idle_04.motion3.json b/Sample/src/main/assets/Wanko/motions/idle_04.motion3.json new file mode 100644 index 0000000..b54e5a5 --- /dev/null +++ b/Sample/src/main/assets/Wanko/motions/idle_04.motion3.json @@ -0,0 +1,636 @@ +{ + "Version": 3, + "Meta": { + "Duration": 10.367, + "Fps": 30.0, + "Loop": true, + "AreBeziersRestricted": true, + "CurveCount": 22, + "TotalSegmentCount": 76, + "TotalPointCount": 206, + "UserDataCount": 0, + "TotalUserDataSize": 0 + }, + "Curves": [ + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 2.533, + 0, + 5.067, + -1, + 7.6, + -1, + 1, + 8.511, + -1, + 9.422, + 0, + 10.333, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 0.333, + 0, + 0.667, + 12, + 1, + 12, + 1, + 1.6, + 12, + 2.2, + -1.589, + 2.8, + -1.589, + 1, + 3.178, + -1.589, + 3.556, + 12, + 3.933, + 12, + 1, + 4.656, + 12, + 5.378, + -1.589, + 6.1, + -1.589, + 1, + 6.489, + -1.589, + 6.878, + 13.71, + 7.267, + 13.71, + 1, + 7.378, + 13.71, + 7.489, + -23, + 7.6, + -23, + 1, + 7.678, + -23, + 7.756, + -7.683, + 7.833, + -7.683, + 1, + 7.933, + -7.683, + 8.033, + -10.837, + 8.133, + -10.837, + 1, + 8.867, + -10.837, + 9.6, + 0, + 10.333, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Z", + "Segments": [ + 0, + -8, + 1, + 0.333, + -8, + 0.667, + 9, + 1, + 9, + 1, + 1.6, + 9, + 2.2, + -11, + 2.8, + -11, + 1, + 3.178, + -11, + 3.556, + 9, + 3.933, + 9, + 1, + 4.656, + 9, + 5.378, + -11, + 6.1, + -11, + 1, + 6.489, + -11, + 6.878, + 5, + 7.267, + 5, + 1, + 7.378, + 5, + 7.489, + -9, + 7.6, + -9, + 1, + 7.678, + -9, + 7.756, + -1, + 7.833, + -1, + 1, + 7.933, + -1, + 8.033, + -7, + 8.133, + -7, + 1, + 8.478, + -7, + 8.822, + 2, + 9.167, + 2, + 1, + 9.556, + 2, + 9.944, + -8, + 10.333, + -8, + 0, + 10.367, + -8 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_L_OPEN", + "Segments": [ + 0, + 0, + 1, + 3.444, + 0, + 6.889, + 0, + 10.333, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_R_OPEN", + "Segments": [ + 0, + 0, + 1, + 3.444, + 0, + 6.889, + 0, + 10.333, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_MOUTH_OPEN_Y", + "Segments": [ + 0, + 0, + 1, + 0.333, + 0, + 0.667, + 0.42, + 1, + 0.42, + 1, + 1.6, + 0.42, + 2.2, + 0, + 2.8, + 0, + 1, + 3.178, + 0, + 3.556, + 0.42, + 3.933, + 0.42, + 1, + 4.656, + 0.42, + 5.378, + 0, + 6.1, + 0, + 1, + 6.489, + 0, + 6.878, + 0.35, + 7.267, + 0.35, + 1, + 7.6, + 0.35, + 7.933, + 0, + 8.267, + 0, + 1, + 8.567, + 0, + 8.867, + 0.34, + 9.167, + 0.34, + 1, + 9.556, + 0.34, + 9.944, + 0, + 10.333, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 3.444, + 0, + 6.889, + 0, + 10.333, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 2.422, + 0, + 4.844, + 0, + 7.267, + 0, + 1, + 7.378, + 0, + 7.489, + -6, + 7.6, + -6, + 1, + 7.778, + -6, + 7.956, + -6, + 8.133, + -6, + 1, + 8.867, + -6, + 9.6, + 0, + 10.333, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 3.444, + 0, + 6.889, + 0, + 10.333, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BREATH", + "Segments": [ + 0, + 0, + 1, + 0.333, + 0, + 0.667, + 0.64, + 1, + 0.64, + 1, + 1.6, + 0.64, + 2.2, + 0, + 2.8, + 0, + 1, + 3.178, + 0, + 3.556, + 0.73, + 3.933, + 0.73, + 1, + 4.656, + 0.73, + 5.378, + 0, + 6.1, + 0, + 1, + 6.489, + 0, + 6.878, + 0.73, + 7.267, + 0.73, + 1, + 7.556, + 0.73, + 7.844, + 0, + 8.133, + 0, + 1, + 8.478, + 0, + 8.822, + 0.39, + 9.167, + 0.39, + 1, + 9.556, + 0.39, + 9.944, + 0, + 10.333, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_LID", + "Segments": [ + 0, + 50, + 1, + 3.444, + 50, + 6.889, + 50, + 10.333, + 50, + 0, + 10.367, + 50 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_01", + "Segments": [ + 0, + 0, + 1, + 3.444, + 0, + 6.889, + 0, + 10.333, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_02", + "Segments": [ + 0, + 0, + 1, + 3.444, + 0, + 6.889, + 0, + 10.333, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EFFECT", + "Segments": [ + 0, + 0, + 1, + 3.444, + 0, + 6.889, + 0, + 10.333, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_L", + "Segments": [ + 0, + 0, + 1, + 3.444, + 0, + 6.889, + 0, + 10.333, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_R", + "Segments": [ + 0, + 0, + 1, + 3.444, + 0, + 6.889, + 0, + 10.333, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_L", + "Segments": [ + 0, + 0, + 1, + 3.444, + 0, + 6.889, + 0, + 10.333, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_R", + "Segments": [ + 0, + 0, + 1, + 3.444, + 0, + 6.889, + 0, + 10.333, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_SWING", + "Segments": [ + 0, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_SWING", + "Segments": [ + 0, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_FACE_01", + "Segments": [ + 0, + 0, + 1, + 3.444, + 0, + 6.889, + 0, + 10.333, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BASE_X", + "Segments": [ + 0, + 0, + 0, + 10.367, + 0 + ] + } + ] +} \ No newline at end of file diff --git a/Sample/src/main/assets/Wanko/motions/shake_01.motion3.json b/Sample/src/main/assets/Wanko/motions/shake_01.motion3.json new file mode 100644 index 0000000..a2055bb --- /dev/null +++ b/Sample/src/main/assets/Wanko/motions/shake_01.motion3.json @@ -0,0 +1,748 @@ +{ + "Version": 3, + "Meta": { + "Duration": 2.5, + "Fps": 30.0, + "Loop": true, + "AreBeziersRestricted": true, + "CurveCount": 22, + "TotalSegmentCount": 92, + "TotalPointCount": 254, + "UserDataCount": 0, + "TotalUserDataSize": 0 + }, + "Curves": [ + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_X", + "Segments": [ + 0, + -9, + 1, + 0.044, + -9, + 0.089, + -7.426, + 0.133, + 0, + 1, + 0.2, + 11.14, + 0.267, + 20, + 0.333, + 20, + 1, + 0.456, + 20, + 0.578, + -18, + 0.7, + -18, + 1, + 0.822, + -18, + 0.944, + 16, + 1.067, + 16, + 1, + 1.178, + 16, + 1.289, + -8, + 1.4, + -8, + 1, + 1.489, + -8, + 1.578, + 0, + 1.667, + 0, + 1, + 1.933, + 0, + 2.2, + 0, + 2.467, + 0, + 0, + 2.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Y", + "Segments": [ + 0, + 14, + 1, + 0.044, + 14, + 0.089, + 30, + 0.133, + 30, + 1, + 0.2, + 30, + 0.267, + 30, + 0.333, + 30, + 1, + 0.456, + 30, + 0.578, + 23.223, + 0.7, + 13, + 1, + 0.822, + 2.777, + 0.944, + -1, + 1.067, + -1, + 1, + 1.178, + -1, + 1.289, + 3, + 1.4, + 3, + 1, + 1.489, + 3, + 1.578, + 0, + 1.667, + 0, + 1, + 1.933, + 0, + 2.2, + 0, + 2.467, + 0, + 0, + 2.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.133, + 0, + 0.267, + 30, + 0.4, + 30, + 1, + 0.522, + 30, + 0.644, + -25, + 0.767, + -25, + 1, + 0.889, + -25, + 1.011, + 26, + 1.133, + 26, + 1, + 1.222, + 26, + 1.311, + -10, + 1.4, + -10, + 1, + 1.544, + -10, + 1.689, + 0, + 1.833, + 0, + 1, + 2.044, + 0, + 2.256, + 0, + 2.467, + 0, + 0, + 2.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_L_OPEN", + "Segments": [ + 0, + 0, + 1, + 0.378, + 0, + 0.756, + 0, + 1.133, + 0, + 1, + 1.311, + 0, + 1.489, + 1, + 1.667, + 1, + 1, + 1.933, + 1, + 2.2, + 1, + 2.467, + 1, + 0, + 2.5, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_R_OPEN", + "Segments": [ + 0, + 0, + 1, + 0.378, + 0, + 0.756, + 0, + 1.133, + 0, + 1, + 1.311, + 0, + 1.489, + 1, + 1.667, + 1, + 1, + 1.933, + 1, + 2.2, + 1, + 2.467, + 1, + 0, + 2.5, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_MOUTH_OPEN_Y", + "Segments": [ + 0, + 1, + 1, + 0.822, + 1, + 1.644, + 1, + 2.467, + 1, + 0, + 2.5, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 4, + 0.333, + 4, + 1, + 0.456, + 4, + 0.578, + -4, + 0.7, + -4, + 1, + 0.822, + -4, + 0.944, + 3, + 1.067, + 3, + 1, + 1.178, + 3, + 1.289, + -1, + 1.4, + -1, + 1, + 1.489, + -1, + 1.578, + 0, + 1.667, + 0, + 1, + 1.767, + 0, + 1.867, + 0, + 1.967, + 0, + 1, + 2.133, + 0, + 2.3, + 0, + 2.467, + 0, + 0, + 2.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.133, + 0, + 0.267, + 10, + 0.4, + 10, + 1, + 0.522, + 10, + 0.644, + -10, + 0.767, + -10, + 1, + 0.889, + -10, + 1.011, + 5, + 1.133, + 5, + 1, + 1.222, + 5, + 1.311, + -3, + 1.4, + -3, + 1, + 1.511, + -3, + 1.622, + 1, + 1.733, + 1, + 1, + 1.978, + 1, + 2.222, + 0, + 2.467, + 0, + 0, + 2.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 0.578, + 0, + 1.156, + 0, + 1.733, + 0, + 1, + 1.978, + 0, + 2.222, + 0, + 2.467, + 0, + 0, + 2.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BREATH", + "Segments": [ + 0, + 0, + 1, + 0.822, + 0, + 1.644, + 0, + 2.467, + 0, + 0, + 2.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_LID", + "Segments": [ + 0, + 50, + 1, + 0.822, + 50, + 1.644, + 50, + 2.467, + 50, + 0, + 2.5, + 50 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_01", + "Segments": [ + 0, + 0, + 1, + 0.822, + 0, + 1.644, + 0, + 2.467, + 0, + 0, + 2.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_02", + "Segments": [ + 0, + 0, + 1, + 0.822, + 0, + 1.644, + 0, + 2.467, + 0, + 0, + 2.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EFFECT", + "Segments": [ + 0, + 0, + 1, + 0.822, + 0, + 1.644, + 0, + 2.467, + 0, + 0, + 2.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_L", + "Segments": [ + 0, + 0, + 1, + 0.044, + 0, + 0.089, + -1, + 0.133, + -1, + 1, + 0.222, + -1, + 0.311, + 1, + 0.4, + 1, + 1, + 0.511, + 1, + 0.622, + -1, + 0.733, + -1, + 1, + 0.811, + -1, + 0.889, + 1, + 0.967, + 1, + 1, + 1.067, + 1, + 1.167, + -1, + 1.267, + -1, + 1, + 1.367, + -1, + 1.467, + 1, + 1.567, + 1, + 1, + 1.667, + 1, + 1.767, + -0.35, + 1.867, + -0.35, + 1, + 1.922, + -0.35, + 1.978, + 0.08, + 2.033, + 0.08, + 1, + 2.1, + 0.08, + 2.167, + -0.08, + 2.233, + -0.08, + 1, + 2.311, + -0.08, + 2.389, + 0, + 2.467, + 0, + 0, + 2.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_R", + "Segments": [ + 0, + 0, + 1, + 0.044, + 0, + 0.089, + -0.96, + 0.133, + -0.96, + 1, + 0.222, + -0.96, + 0.311, + 1, + 0.4, + 1, + 1, + 0.511, + 1, + 0.622, + -1, + 0.733, + -1, + 1, + 0.811, + -1, + 0.889, + 1, + 0.967, + 1, + 1, + 1.067, + 1, + 1.167, + -1, + 1.267, + -1, + 1, + 1.367, + -1, + 1.467, + 1, + 1.567, + 1, + 1, + 1.667, + 1, + 1.767, + -0.32, + 1.867, + -0.32, + 1, + 1.922, + -0.32, + 1.978, + 0.07, + 2.033, + 0.07, + 1, + 2.1, + 0.07, + 2.167, + -0.08, + 2.233, + -0.08, + 1, + 2.311, + -0.08, + 2.389, + 0, + 2.467, + 0, + 0, + 2.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_L", + "Segments": [ + 0, + 0, + 1, + 0.822, + 0, + 1.644, + 0, + 2.467, + 0, + 0, + 2.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_R", + "Segments": [ + 0, + 0, + 1, + 0.822, + 0, + 1.644, + 0, + 2.467, + 0, + 0, + 2.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_SWING", + "Segments": [ + 0, + 0, + 0, + 2.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_SWING", + "Segments": [ + 0, + 0, + 0, + 2.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_FACE_01", + "Segments": [ + 0, + 0, + 1, + 0.822, + 0, + 1.644, + 0, + 2.467, + 0, + 0, + 2.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BASE_X", + "Segments": [ + 0, + 0, + 0, + 2.5, + 0 + ] + } + ] +} \ No newline at end of file diff --git a/Sample/src/main/assets/Wanko/motions/shake_02.motion3.json b/Sample/src/main/assets/Wanko/motions/shake_02.motion3.json new file mode 100644 index 0000000..a850a88 --- /dev/null +++ b/Sample/src/main/assets/Wanko/motions/shake_02.motion3.json @@ -0,0 +1,867 @@ +{ + "Version": 3, + "Meta": { + "Duration": 2.533, + "Fps": 30.0, + "Loop": true, + "AreBeziersRestricted": true, + "CurveCount": 22, + "TotalSegmentCount": 109, + "TotalPointCount": 305, + "UserDataCount": 0, + "TotalUserDataSize": 0 + }, + "Curves": [ + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.411, + 0, + 0.489, + 0, + 0.567, + 0, + 1, + 0.656, + 0, + 0.744, + 0, + 0.833, + 0, + 1, + 1.389, + 0, + 1.944, + 0, + 2.5, + 0, + 0, + 2.533, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Y", + "Segments": [ + 0, + 30, + 1, + 0.111, + 30, + 0.222, + 30, + 0.333, + 30, + 1, + 0.411, + 30, + 0.489, + 30, + 0.567, + 30, + 1, + 0.656, + 30, + 0.744, + 30, + 0.833, + 30, + 1, + 1.389, + 30, + 1.944, + 30, + 2.5, + 30, + 0, + 2.533, + 30 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.033, + 0, + 0.067, + -30, + 0.1, + -30, + 1, + 0.211, + -30, + 0.322, + 30, + 0.433, + 30, + 1, + 0.511, + 30, + 0.589, + -11, + 0.667, + -11, + 1, + 0.756, + -11, + 0.844, + 30, + 0.933, + 30, + 1, + 1.011, + 30, + 1.089, + -14, + 1.167, + -14, + 1, + 1.256, + -14, + 1.344, + 9, + 1.433, + 9, + 1, + 1.522, + 9, + 1.611, + -4, + 1.7, + -4, + 1, + 1.8, + -4, + 1.9, + 0, + 2, + 0, + 1, + 2.167, + 0, + 2.333, + 0, + 2.5, + 0, + 0, + 2.533, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_L_OPEN", + "Segments": [ + 0, + 0, + 1, + 0.189, + 0, + 0.378, + 0, + 0.567, + 0, + 1, + 0.844, + 0, + 1.122, + 0, + 1.4, + 0, + 1, + 1.456, + 0, + 1.511, + 1, + 1.567, + 1, + 1, + 1.878, + 1, + 2.189, + 1, + 2.5, + 1, + 0, + 2.533, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_R_OPEN", + "Segments": [ + 0, + 0, + 1, + 0.189, + 0, + 0.378, + 0, + 0.567, + 0, + 1, + 0.844, + 0, + 1.122, + 0, + 1.4, + 0, + 1, + 1.456, + 0, + 1.511, + 1, + 1.567, + 1, + 1, + 1.878, + 1, + 2.189, + 1, + 2.5, + 1, + 0, + 2.533, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_MOUTH_OPEN_Y", + "Segments": [ + 0, + 0, + 1, + 0.189, + 0, + 0.378, + 0, + 0.567, + 0, + 1, + 0.811, + 0, + 1.056, + 0, + 1.3, + 0, + 1, + 1.333, + 0, + 1.367, + 1, + 1.4, + 1, + 1, + 1.444, + 1, + 1.489, + 0, + 1.533, + 0, + 1, + 1.856, + 0, + 2.178, + 0, + 2.5, + 0, + 0, + 2.533, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.189, + 0, + 0.378, + 0, + 0.567, + 0, + 1, + 1.211, + 0, + 1.856, + 0, + 2.5, + 0, + 0, + 2.533, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Z", + "Segments": [ + 0, + -10, + 1, + 0.111, + -10, + 0.222, + 10, + 0.333, + 10, + 1, + 0.411, + 10, + 0.489, + -10, + 0.567, + -10, + 1, + 0.656, + -10, + 0.744, + 10, + 0.833, + 10, + 1, + 0.956, + 10, + 1.078, + -3, + 1.2, + -3, + 1, + 1.333, + -3, + 1.467, + -3, + 1.6, + -3, + 1, + 1.722, + -3, + 1.844, + 0, + 1.967, + 0, + 1, + 2.144, + 0, + 2.322, + 0, + 2.5, + 0, + 0, + 2.533, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Y", + "Segments": [ + 0, + 10, + 1, + 0.067, + 10, + 0.133, + -2, + 0.2, + -2, + 1, + 0.244, + -2, + 0.289, + -2.18, + 0.333, + 0, + 1, + 0.411, + 3.815, + 0.489, + 10, + 0.567, + 10, + 1, + 0.622, + 10, + 0.678, + -2, + 0.733, + -2, + 1, + 0.767, + -2, + 0.8, + -1.988, + 0.833, + 0, + 1, + 0.922, + 5.303, + 1.011, + 10, + 1.1, + 10, + 1, + 1.167, + 10, + 1.233, + -2, + 1.3, + -2, + 1, + 1.333, + -2, + 1.367, + 2, + 1.4, + 2, + 1, + 1.444, + 2, + 1.489, + 0, + 1.533, + 0, + 1, + 1.856, + 0, + 2.178, + 0, + 2.5, + 0, + 0, + 2.533, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BREATH", + "Segments": [ + 0, + 0, + 1, + 0.833, + 0, + 1.667, + 0, + 2.5, + 0, + 0, + 2.533, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_LID", + "Segments": [ + 0, + 50, + 1, + 0.833, + 50, + 1.667, + 50, + 2.5, + 50, + 0, + 2.533, + 50 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_01", + "Segments": [ + 0, + 0, + 1, + 0.833, + 0, + 1.667, + 0, + 2.5, + 0, + 0, + 2.533, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_02", + "Segments": [ + 0, + 0, + 1, + 0.833, + 0, + 1.667, + 0, + 2.5, + 0, + 0, + 2.533, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EFFECT", + "Segments": [ + 0, + 0, + 1, + 0.833, + 0, + 1.667, + 0, + 2.5, + 0, + 0, + 2.533, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_L", + "Segments": [ + 0, + 0, + 1, + 0.044, + 0, + 0.089, + 0.65, + 0.133, + 0.65, + 1, + 0.211, + 0.65, + 0.289, + -0.76, + 0.367, + -0.76, + 1, + 0.467, + -0.76, + 0.567, + 1, + 0.667, + 1, + 1, + 0.778, + 1, + 0.889, + -1, + 1, + -1, + 1, + 1.089, + -1, + 1.178, + 1, + 1.267, + 1, + 1, + 1.333, + 1, + 1.4, + 0, + 1.467, + 0, + 1, + 1.522, + 0, + 1.578, + 1, + 1.633, + 1, + 1, + 1.711, + 1, + 1.789, + -0.96, + 1.867, + -0.96, + 1, + 1.922, + -0.96, + 1.978, + 0.17, + 2.033, + 0.17, + 1, + 2.1, + 0.17, + 2.167, + 0, + 2.233, + 0, + 1, + 2.322, + 0, + 2.411, + 0, + 2.5, + 0, + 0, + 2.533, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_R", + "Segments": [ + 0, + 0, + 1, + 0.044, + 0, + 0.089, + 0.81, + 0.133, + 0.81, + 1, + 0.211, + 0.81, + 0.289, + -1, + 0.367, + -1, + 1, + 0.467, + -1, + 0.567, + 1, + 0.667, + 1, + 1, + 0.778, + 1, + 0.889, + -1, + 1, + -1, + 1, + 1.089, + -1, + 1.178, + 1, + 1.267, + 1, + 1, + 1.333, + 1, + 1.4, + 0.721, + 1.467, + 0, + 1, + 1.522, + -0.601, + 1.578, + -1, + 1.633, + -1, + 1, + 1.711, + -1, + 1.789, + 1, + 1.867, + 1, + 1, + 1.922, + 1, + 1.978, + -0.16, + 2.033, + -0.16, + 1, + 2.1, + -0.16, + 2.167, + 0, + 2.233, + 0, + 1, + 2.322, + 0, + 2.411, + 0, + 2.5, + 0, + 0, + 2.533, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_L", + "Segments": [ + 0, + 0, + 1, + 0.189, + 0, + 0.378, + 0, + 0.567, + 0, + 1, + 0.822, + 0, + 1.078, + 0, + 1.333, + 0, + 1, + 1.378, + 0, + 1.422, + 1, + 1.467, + 1, + 1, + 1.5, + 1, + 1.533, + 0, + 1.567, + 0, + 1, + 1.878, + 0, + 2.189, + 0, + 2.5, + 0, + 0, + 2.533, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_R", + "Segments": [ + 0, + 0, + 1, + 0.189, + 0, + 0.378, + 0, + 0.567, + 0, + 1, + 0.822, + 0, + 1.078, + 0, + 1.333, + 0, + 1, + 1.378, + 0, + 1.422, + 1, + 1.467, + 1, + 1, + 1.5, + 1, + 1.533, + 0, + 1.567, + 0, + 1, + 1.878, + 0, + 2.189, + 0, + 2.5, + 0, + 0, + 2.533, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_SWING", + "Segments": [ + 0, + 0, + 0, + 2.533, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_SWING", + "Segments": [ + 0, + 0, + 0, + 2.533, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_FACE_01", + "Segments": [ + 0, + 0, + 1, + 0.833, + 0, + 1.667, + 0, + 2.5, + 0, + 0, + 2.533, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BASE_X", + "Segments": [ + 0, + 0, + 0, + 2.533, + 0 + ] + } + ] +} \ No newline at end of file diff --git a/Sample/src/main/assets/Wanko/motions/touch_01.motion3.json b/Sample/src/main/assets/Wanko/motions/touch_01.motion3.json new file mode 100644 index 0000000..5f0ab46 --- /dev/null +++ b/Sample/src/main/assets/Wanko/motions/touch_01.motion3.json @@ -0,0 +1,594 @@ +{ + "Version": 3, + "Meta": { + "Duration": 2, + "Fps": 30.0, + "Loop": true, + "AreBeziersRestricted": true, + "CurveCount": 22, + "TotalSegmentCount": 70, + "TotalPointCount": 188, + "UserDataCount": 0, + "TotalUserDataSize": 0 + }, + "Curves": [ + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.122, + 0, + 0.244, + 0, + 0.367, + 0, + 1, + 0.622, + 0, + 0.878, + 0, + 1.133, + 0, + 1, + 1.411, + 0, + 1.689, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 0.122, + 0, + 0.244, + 0, + 0.367, + 0, + 1, + 0.422, + 0, + 0.478, + 30, + 0.533, + 30, + 1, + 0.633, + 30, + 0.733, + 0, + 0.833, + 0, + 1, + 0.933, + 0, + 1.033, + 0, + 1.133, + 0, + 1, + 1.411, + 0, + 1.689, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.122, + 0, + 0.244, + 0, + 0.367, + 0, + 1, + 0.522, + 0, + 0.678, + 30, + 0.833, + 30, + 1, + 0.933, + 30, + 1.033, + 30, + 1.133, + 30, + 1, + 1.411, + 30, + 1.689, + 30, + 1.967, + 30, + 0, + 2, + 30 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_L_OPEN", + "Segments": [ + 0, + 1, + 1, + 0.656, + 1, + 1.311, + 1, + 1.967, + 1, + 0, + 2, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_R_OPEN", + "Segments": [ + 0, + 1, + 1, + 0.656, + 1, + 1.311, + 1, + 1.967, + 1, + 0, + 2, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_MOUTH_OPEN_Y", + "Segments": [ + 0, + 1, + 1, + 0.656, + 1, + 1.311, + 1, + 1.967, + 1, + 0, + 2, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.122, + 0, + 0.244, + 0, + 0.367, + 0, + 1, + 0.522, + 0, + 0.678, + 2, + 0.833, + 2, + 1, + 0.933, + 2, + 1.033, + 2, + 1.133, + 2, + 1, + 1.411, + 2, + 1.689, + 2, + 1.967, + 2, + 0, + 2, + 2 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.378, + 0, + 0.756, + 0, + 1.133, + 0, + 1, + 1.411, + 0, + 1.689, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 0.122, + 0, + 0.244, + 0, + 0.367, + 0, + 1, + 0.422, + 0, + 0.478, + 6, + 0.533, + 6, + 1, + 0.633, + 6, + 0.733, + 0, + 0.833, + 0, + 1, + 0.933, + 0, + 1.033, + 0, + 1.133, + 0, + 1, + 1.411, + 0, + 1.689, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BREATH", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_LID", + "Segments": [ + 0, + 50, + 1, + 0.656, + 50, + 1.311, + 50, + 1.967, + 50, + 0, + 2, + 50 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_01", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_02", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EFFECT", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_L", + "Segments": [ + 0, + 0, + 1, + 0.122, + 0, + 0.244, + 0, + 0.367, + 0, + 1, + 0.444, + 0, + 0.522, + 1, + 0.6, + 1, + 1, + 0.667, + 1, + 0.733, + -1, + 0.8, + -1, + 1, + 0.856, + -1, + 0.911, + 0.31, + 0.967, + 0.31, + 1, + 1.022, + 0.31, + 1.078, + -0.2, + 1.133, + -0.2, + 1, + 1.2, + -0.2, + 1.267, + 0, + 1.333, + 0, + 1, + 1.544, + 0, + 1.756, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_R", + "Segments": [ + 0, + 0, + 1, + 0.122, + 0, + 0.244, + 0, + 0.367, + 0, + 1, + 0.444, + 0, + 0.522, + -1, + 0.6, + -1, + 1, + 0.667, + -1, + 0.733, + 1, + 0.8, + 1, + 1, + 0.856, + 1, + 0.911, + -0.34, + 0.967, + -0.34, + 1, + 1.022, + -0.34, + 1.078, + 0.16, + 1.133, + 0.16, + 1, + 1.2, + 0.16, + 1.267, + 0, + 1.333, + 0, + 1, + 1.544, + 0, + 1.756, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_L", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_R", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_SWING", + "Segments": [ + 0, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_SWING", + "Segments": [ + 0, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_FACE_01", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BASE_X", + "Segments": [ + 0, + 0, + 0, + 2, + 0 + ] + } + ] +} \ No newline at end of file diff --git a/Sample/src/main/assets/Wanko/motions/touch_02.motion3.json b/Sample/src/main/assets/Wanko/motions/touch_02.motion3.json new file mode 100644 index 0000000..06b11f9 --- /dev/null +++ b/Sample/src/main/assets/Wanko/motions/touch_02.motion3.json @@ -0,0 +1,699 @@ +{ + "Version": 3, + "Meta": { + "Duration": 2, + "Fps": 30.0, + "Loop": true, + "AreBeziersRestricted": true, + "CurveCount": 22, + "TotalSegmentCount": 85, + "TotalPointCount": 233, + "UserDataCount": 0, + "TotalUserDataSize": 0 + }, + "Curves": [ + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.389, + 0, + 0.444, + 0, + 0.5, + 0, + 1, + 0.589, + 0, + 0.678, + 0, + 0.767, + 0, + 1, + 0.878, + 0, + 0.989, + 0, + 1.1, + 0, + 1, + 1.389, + 0, + 1.678, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.389, + 0, + 0.444, + 25, + 0.5, + 25, + 1, + 0.589, + 25, + 0.678, + 0, + 0.767, + 0, + 1, + 0.878, + 0, + 0.989, + 0, + 1.1, + 0, + 1, + 1.389, + 0, + 1.678, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.389, + 0, + 0.444, + 7, + 0.5, + 7, + 1, + 0.589, + 7, + 0.678, + 0, + 0.767, + 0, + 1, + 0.878, + 0, + 0.989, + 0, + 1.1, + 0, + 1, + 1.389, + 0, + 1.678, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_L_OPEN", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.589, + 0, + 0.844, + 0, + 1.1, + 0, + 1, + 1.389, + 0, + 1.678, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_R_OPEN", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.589, + 0, + 0.844, + 0, + 1.1, + 0, + 1, + 1.389, + 0, + 1.678, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_MOUTH_OPEN_Y", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.389, + 0, + 0.444, + 7, + 0.5, + 7, + 1, + 0.589, + 7, + 0.678, + -3, + 0.767, + -3, + 1, + 0.833, + -3, + 0.9, + 1, + 0.967, + 1, + 1, + 1.011, + 1, + 1.056, + -1, + 1.1, + -1, + 1, + 1.178, + -1, + 1.256, + 0, + 1.333, + 0, + 1, + 1.544, + 0, + 1.756, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.389, + 0, + 0.444, + 8, + 0.5, + 8, + 1, + 0.589, + 8, + 0.678, + -3, + 0.767, + -3, + 1, + 0.833, + -3, + 0.9, + 1, + 0.967, + 1, + 1, + 1.011, + 1, + 1.056, + -1, + 1.1, + -1, + 1, + 1.178, + -1, + 1.256, + 0, + 1.333, + 0, + 1, + 1.544, + 0, + 1.756, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BREATH", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_LID", + "Segments": [ + 0, + 50, + 1, + 0.656, + 50, + 1.311, + 50, + 1.967, + 50, + 0, + 2, + 50 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_01", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_02", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EFFECT", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_L", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.422, + 0, + 0.511, + 1, + 0.6, + 1, + 1, + 0.678, + 1, + 0.756, + -1, + 0.833, + -1, + 1, + 0.911, + -1, + 0.989, + 0.67, + 1.067, + 0.67, + 1, + 1.122, + 0.67, + 1.178, + -0.48, + 1.233, + -0.48, + 1, + 1.3, + -0.48, + 1.367, + 0, + 1.433, + 0, + 1, + 1.611, + 0, + 1.789, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_R", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.422, + 0, + 0.511, + -1, + 0.6, + -1, + 1, + 0.678, + -1, + 0.756, + 1, + 0.833, + 1, + 1, + 0.911, + 1, + 0.989, + -0.53, + 1.067, + -0.53, + 1, + 1.122, + -0.53, + 1.178, + 0.47, + 1.233, + 0.47, + 1, + 1.3, + 0.47, + 1.367, + 0, + 1.433, + 0, + 1, + 1.611, + 0, + 1.789, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_L", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.589, + 0, + 0.844, + 0, + 1.1, + 0, + 1, + 1.389, + 0, + 1.678, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_R", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.589, + 0, + 0.844, + 0, + 1.1, + 0, + 1, + 1.389, + 0, + 1.678, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_SWING", + "Segments": [ + 0, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_SWING", + "Segments": [ + 0, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_FACE_01", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BASE_X", + "Segments": [ + 0, + 0, + 0, + 2, + 0 + ] + } + ] +} \ No newline at end of file diff --git a/Sample/src/main/assets/Wanko/motions/touch_03.motion3.json b/Sample/src/main/assets/Wanko/motions/touch_03.motion3.json new file mode 100644 index 0000000..cdfb4c5 --- /dev/null +++ b/Sample/src/main/assets/Wanko/motions/touch_03.motion3.json @@ -0,0 +1,643 @@ +{ + "Version": 3, + "Meta": { + "Duration": 2, + "Fps": 30.0, + "Loop": true, + "AreBeziersRestricted": true, + "CurveCount": 22, + "TotalSegmentCount": 77, + "TotalPointCount": 209, + "UserDataCount": 0, + "TotalUserDataSize": 0 + }, + "Curves": [ + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_X", + "Segments": [ + 0, + -3, + 1, + 0.133, + -3, + 0.267, + -3, + 0.4, + -3, + 1, + 0.467, + -3, + 0.533, + 17, + 0.6, + 17, + 1, + 0.656, + 17, + 0.711, + -22, + 0.767, + -22, + 1, + 0.833, + -22, + 0.9, + 9, + 0.967, + 9, + 1, + 1.033, + 9, + 1.1, + 0, + 1.167, + 0, + 1, + 1.433, + 0, + 1.7, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Y", + "Segments": [ + 0, + 15, + 1, + 0.133, + 15, + 0.267, + 15, + 0.4, + 15, + 1, + 0.467, + 15, + 0.533, + 17, + 0.6, + 17, + 1, + 0.789, + 17, + 0.978, + 0, + 1.167, + 0, + 1, + 1.433, + 0, + 1.7, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_L_OPEN", + "Segments": [ + 0, + 0, + 1, + 0.133, + 0, + 0.267, + 0, + 0.4, + 0, + 1, + 0.922, + 0, + 1.444, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_R_OPEN", + "Segments": [ + 0, + 0, + 1, + 0.133, + 0, + 0.267, + 0, + 0.4, + 0, + 1, + 0.922, + 0, + 1.444, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_MOUTH_OPEN_Y", + "Segments": [ + 0, + 1, + 1, + 0.656, + 1, + 1.311, + 1, + 1.967, + 1, + 0, + 2, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.133, + 0, + 0.267, + 0, + 0.4, + 0, + 1, + 0.467, + 0, + 0.533, + -3, + 0.6, + -3, + 1, + 0.656, + -3, + 0.711, + 2, + 0.767, + 2, + 1, + 0.833, + 2, + 0.9, + -1, + 0.967, + -1, + 1, + 1.033, + -1, + 1.1, + 0, + 1.167, + 0, + 1, + 1.433, + 0, + 1.7, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.133, + 0, + 0.267, + 0, + 0.4, + 0, + 1, + 0.467, + 0, + 0.533, + 7, + 0.6, + 7, + 1, + 0.656, + 7, + 0.711, + -2, + 0.767, + -2, + 1, + 0.833, + -2, + 0.9, + 1, + 0.967, + 1, + 1, + 1.033, + 1, + 1.1, + 0, + 1.167, + 0, + 1, + 1.433, + 0, + 1.7, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 0.133, + 0, + 0.267, + 0, + 0.4, + 0, + 1, + 0.656, + 0, + 0.911, + -3, + 1.167, + -3, + 1, + 1.433, + -3, + 1.7, + -3, + 1.967, + -3, + 0, + 2, + -3 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BREATH", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_LID", + "Segments": [ + 0, + 50, + 1, + 0.656, + 50, + 1.311, + 50, + 1.967, + 50, + 0, + 2, + 50 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_01", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_02", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EFFECT", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_L", + "Segments": [ + 0, + 0, + 1, + 0.189, + 0, + 0.378, + 0, + 0.567, + 0, + 1, + 0.611, + 0, + 0.656, + 1, + 0.7, + 1, + 1, + 0.767, + 1, + 0.833, + -0.94, + 0.9, + -0.94, + 1, + 0.956, + -0.94, + 1.011, + 0.49, + 1.067, + 0.49, + 1, + 1.144, + 0.49, + 1.222, + -0.4, + 1.3, + -0.4, + 1, + 1.367, + -0.4, + 1.433, + 0, + 1.5, + 0, + 1, + 1.656, + 0, + 1.811, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_R", + "Segments": [ + 0, + 0, + 1, + 0.189, + 0, + 0.378, + 0, + 0.567, + 0, + 1, + 0.611, + 0, + 0.656, + -1, + 0.7, + -1, + 1, + 0.767, + -1, + 0.833, + 1, + 0.9, + 1, + 1, + 0.956, + 1, + 1.011, + -0.43, + 1.067, + -0.43, + 1, + 1.144, + -0.43, + 1.222, + 0.34, + 1.3, + 0.34, + 1, + 1.367, + 0.34, + 1.433, + 0, + 1.5, + 0, + 1, + 1.656, + 0, + 1.811, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_L", + "Segments": [ + 0, + 0, + 1, + 0.133, + 0, + 0.267, + 0, + 0.4, + 0, + 1, + 0.922, + 0, + 1.444, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_R", + "Segments": [ + 0, + 0, + 1, + 0.133, + 0, + 0.267, + 0, + 0.4, + 0, + 1, + 0.922, + 0, + 1.444, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_SWING", + "Segments": [ + 0, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_SWING", + "Segments": [ + 0, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_FACE_01", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BASE_X", + "Segments": [ + 0, + 0, + 0, + 2, + 0 + ] + } + ] +} \ No newline at end of file diff --git a/Sample/src/main/assets/Wanko/motions/touch_04.motion3.json b/Sample/src/main/assets/Wanko/motions/touch_04.motion3.json new file mode 100644 index 0000000..e2b7725 --- /dev/null +++ b/Sample/src/main/assets/Wanko/motions/touch_04.motion3.json @@ -0,0 +1,615 @@ +{ + "Version": 3, + "Meta": { + "Duration": 2, + "Fps": 30.0, + "Loop": true, + "AreBeziersRestricted": true, + "CurveCount": 22, + "TotalSegmentCount": 73, + "TotalPointCount": 197, + "UserDataCount": 0, + "TotalUserDataSize": 0 + }, + "Curves": [ + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.144, + 0, + 0.289, + 0, + 0.433, + 0, + 1, + 0.5, + 0, + 0.567, + 0, + 0.633, + 0, + 1, + 0.844, + 0, + 1.056, + 0, + 1.267, + 0, + 1, + 1.5, + 0, + 1.733, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 0.144, + 0, + 0.289, + 0, + 0.433, + 0, + 1, + 0.5, + 0, + 0.567, + -11, + 0.633, + -11, + 1, + 0.733, + -11, + 0.833, + 10, + 0.933, + 10, + 1, + 1.044, + 10, + 1.156, + 0, + 1.267, + 0, + 1, + 1.5, + 0, + 1.733, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_L_OPEN", + "Segments": [ + 0, + 0, + 1, + 0.144, + 0, + 0.289, + 0, + 0.433, + 0, + 1, + 0.711, + 0, + 0.989, + 0, + 1.267, + 0, + 1, + 1.5, + 0, + 1.733, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_R_OPEN", + "Segments": [ + 0, + 0, + 1, + 0.144, + 0, + 0.289, + 0, + 0.433, + 0, + 1, + 0.711, + 0, + 0.989, + 0, + 1.267, + 0, + 1, + 1.5, + 0, + 1.733, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_MOUTH_OPEN_Y", + "Segments": [ + 0, + 0, + 1, + 0.144, + 0, + 0.289, + 0, + 0.433, + 0, + 1, + 0.6, + 0, + 0.767, + 0, + 0.933, + 0, + 1, + 1.044, + 0, + 1.156, + 0, + 1.267, + 0, + 1, + 1.5, + 0, + 1.733, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 0.144, + 0, + 0.289, + 0, + 0.433, + 0, + 1, + 0.5, + 0, + 0.567, + -6, + 0.633, + -6, + 1, + 0.733, + -6, + 0.833, + 4, + 0.933, + 4, + 1, + 1.044, + 4, + 1.156, + 0, + 1.267, + 0, + 1, + 1.5, + 0, + 1.733, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BREATH", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_LID", + "Segments": [ + 0, + 50, + 1, + 0.656, + 50, + 1.311, + 50, + 1.967, + 50, + 0, + 2, + 50 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_01", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_02", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EFFECT", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_L", + "Segments": [ + 0, + 0, + 1, + 0.122, + 0, + 0.244, + 0, + 0.367, + 0, + 1, + 0.444, + 0, + 0.522, + 1, + 0.6, + 1, + 1, + 0.678, + 1, + 0.756, + -1, + 0.833, + -1, + 1, + 0.911, + -1, + 0.989, + 0.8, + 1.067, + 0.8, + 1, + 1.122, + 0.8, + 1.178, + -0.13, + 1.233, + -0.13, + 1, + 1.289, + -0.13, + 1.344, + 0, + 1.4, + 0, + 1, + 1.589, + 0, + 1.778, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_R", + "Segments": [ + 0, + 0, + 1, + 0.122, + 0, + 0.244, + 0, + 0.367, + 0, + 1, + 0.444, + 0, + 0.522, + -1, + 0.6, + -1, + 1, + 0.678, + -1, + 0.756, + 1, + 0.833, + 1, + 1, + 0.911, + 1, + 0.989, + -0.81, + 1.067, + -0.81, + 1, + 1.122, + -0.81, + 1.178, + 0.11, + 1.233, + 0.11, + 1, + 1.289, + 0.11, + 1.344, + 0, + 1.4, + 0, + 1, + 1.589, + 0, + 1.778, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_L", + "Segments": [ + 0, + 0, + 1, + 0.211, + 0, + 0.422, + 0, + 0.633, + 0, + 1, + 1.078, + 0, + 1.522, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_R", + "Segments": [ + 0, + 0, + 1, + 0.211, + 0, + 0.422, + 0, + 0.633, + 0, + 1, + 1.078, + 0, + 1.522, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_SWING", + "Segments": [ + 0, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_SWING", + "Segments": [ + 0, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_FACE_01", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BASE_X", + "Segments": [ + 0, + 0, + 0, + 2, + 0 + ] + } + ] +} \ No newline at end of file diff --git a/Sample/src/main/assets/Wanko/motions/touch_05.motion3.json b/Sample/src/main/assets/Wanko/motions/touch_05.motion3.json new file mode 100644 index 0000000..6e714e0 --- /dev/null +++ b/Sample/src/main/assets/Wanko/motions/touch_05.motion3.json @@ -0,0 +1,510 @@ +{ + "Version": 3, + "Meta": { + "Duration": 1.5, + "Fps": 30.0, + "Loop": true, + "AreBeziersRestricted": true, + "CurveCount": 22, + "TotalSegmentCount": 58, + "TotalPointCount": 152, + "UserDataCount": 0, + "TotalUserDataSize": 0 + }, + "Curves": [ + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.067, + 0, + 0.133, + 0, + 0.2, + 0, + 1, + 0.4, + 0, + 0.6, + 0, + 0.8, + 0, + 1, + 1.022, + 0, + 1.244, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Y", + "Segments": [ + 0, + -11, + 1, + 0.067, + -11, + 0.133, + -11, + 0.2, + -11, + 1, + 0.3, + -11, + 0.4, + 10, + 0.5, + 10, + 1, + 0.6, + 10, + 0.7, + 0, + 0.8, + 0, + 1, + 1.022, + 0, + 1.244, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.489, + 0, + 0.978, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_L_OPEN", + "Segments": [ + 0, + 0, + 1, + 0.067, + 0, + 0.133, + 0, + 0.2, + 0, + 1, + 0.4, + 0, + 0.6, + 0, + 0.8, + 0, + 1, + 1.022, + 0, + 1.244, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_R_OPEN", + "Segments": [ + 0, + 0, + 1, + 0.067, + 0, + 0.133, + 0, + 0.2, + 0, + 1, + 0.4, + 0, + 0.6, + 0, + 0.8, + 0, + 1, + 1.022, + 0, + 1.244, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_MOUTH_OPEN_Y", + "Segments": [ + 0, + 0, + 1, + 0.067, + 0, + 0.133, + 0, + 0.2, + 0, + 1, + 0.3, + 0, + 0.4, + 0, + 0.5, + 0, + 1, + 0.6, + 0, + 0.7, + 0, + 0.8, + 0, + 1, + 1.022, + 0, + 1.244, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.489, + 0, + 0.978, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.489, + 0, + 0.978, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 0.067, + 0, + 0.133, + 0, + 0.2, + 0, + 1, + 0.3, + 0, + 0.4, + 4, + 0.5, + 4, + 1, + 0.6, + 4, + 0.7, + 0, + 0.8, + 0, + 1, + 1.022, + 0, + 1.244, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BREATH", + "Segments": [ + 0, + 0, + 1, + 0.489, + 0, + 0.978, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_LID", + "Segments": [ + 0, + 50, + 1, + 0.489, + 50, + 0.978, + 50, + 1.467, + 50, + 0, + 1.5, + 50 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_01", + "Segments": [ + 0, + 0, + 1, + 0.489, + 0, + 0.978, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_02", + "Segments": [ + 0, + 0, + 1, + 0.489, + 0, + 0.978, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EFFECT", + "Segments": [ + 0, + 0, + 1, + 0.489, + 0, + 0.978, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_L", + "Segments": [ + 0, + 0, + 1, + 0.489, + 0, + 0.978, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_R", + "Segments": [ + 0, + 0, + 1, + 0.489, + 0, + 0.978, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_L", + "Segments": [ + 0, + 0, + 1, + 0.067, + 0, + 0.133, + 0, + 0.2, + 0, + 1, + 0.622, + 0, + 1.044, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_R", + "Segments": [ + 0, + 0, + 1, + 0.067, + 0, + 0.133, + 0, + 0.2, + 0, + 1, + 0.622, + 0, + 1.044, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_SWING", + "Segments": [ + 0, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_SWING", + "Segments": [ + 0, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_FACE_01", + "Segments": [ + 0, + 0, + 1, + 0.489, + 0, + 0.978, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BASE_X", + "Segments": [ + 0, + 0, + 0, + 1.5, + 0 + ] + } + ] +} \ No newline at end of file diff --git a/Sample/src/main/assets/Wanko/motions/touch_06.motion3.json b/Sample/src/main/assets/Wanko/motions/touch_06.motion3.json new file mode 100644 index 0000000..3d890c2 --- /dev/null +++ b/Sample/src/main/assets/Wanko/motions/touch_06.motion3.json @@ -0,0 +1,720 @@ +{ + "Version": 3, + "Meta": { + "Duration": 1.867, + "Fps": 30.0, + "Loop": true, + "AreBeziersRestricted": true, + "CurveCount": 22, + "TotalSegmentCount": 88, + "TotalPointCount": 242, + "UserDataCount": 0, + "TotalUserDataSize": 0 + }, + "Curves": [ + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.456, + 0, + 0.578, + 3, + 0.7, + 3, + 1, + 0.778, + 3, + 0.856, + -2, + 0.933, + -2, + 1, + 1.233, + -2, + 1.533, + -2, + 1.833, + -2, + 0, + 1.867, + -2 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.378, + 0, + 0.422, + 18, + 0.467, + 18, + 1, + 0.544, + 18, + 0.622, + -30, + 0.7, + -30, + 1, + 0.778, + -30, + 0.856, + -13, + 0.933, + -13, + 1, + 1.011, + -13, + 1.089, + -30, + 1.167, + -30, + 1, + 1.389, + -30, + 1.611, + -30, + 1.833, + -30, + 0, + 1.867, + -30 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.456, + 0, + 0.578, + -7.716, + 0.7, + -17, + 1, + 0.778, + -22.908, + 0.856, + -24, + 0.933, + -24, + 1, + 1.233, + -24, + 1.533, + -24, + 1.833, + -24, + 0, + 1.867, + -24 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_L_OPEN", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.456, + 0, + 0.578, + 0, + 0.7, + 0, + 1, + 0.778, + 0, + 0.856, + 0, + 0.933, + 0, + 1, + 1.233, + 0, + 1.533, + 0, + 1.833, + 0, + 0, + 1.867, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_R_OPEN", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.456, + 0, + 0.578, + 0, + 0.7, + 0, + 1, + 0.778, + 0, + 0.856, + 0, + 0.933, + 0, + 1, + 1.233, + 0, + 1.533, + 0, + 1.833, + 0, + 0, + 1.867, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_MOUTH_OPEN_Y", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.456, + 0, + 0.578, + 0, + 0.7, + 0, + 1, + 0.778, + 0, + 0.856, + 0, + 0.933, + 0, + 1, + 1.233, + 0, + 1.533, + 0, + 1.833, + 0, + 0, + 1.867, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.611, + 0, + 0.889, + -6, + 1.167, + -6, + 1, + 1.389, + -6, + 1.611, + -6, + 1.833, + -6, + 0, + 1.867, + -6 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.456, + 0, + 0.578, + -2, + 0.7, + -2, + 1, + 0.778, + -2, + 0.856, + -2, + 0.933, + -2, + 1, + 1.233, + -2, + 1.533, + -2, + 1.833, + -2, + 0, + 1.867, + -2 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.378, + 0, + 0.422, + 3, + 0.467, + 3, + 1, + 0.544, + 3, + 0.622, + -6, + 0.7, + -6, + 1, + 0.778, + -6, + 0.856, + -6, + 0.933, + -6, + 1, + 1.233, + -6, + 1.533, + -6, + 1.833, + -6, + 0, + 1.867, + -6 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BREATH", + "Segments": [ + 0, + 0, + 1, + 0.611, + 0, + 1.222, + 0, + 1.833, + 0, + 0, + 1.867, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_LID", + "Segments": [ + 0, + 50, + 1, + 0.611, + 50, + 1.222, + 50, + 1.833, + 50, + 0, + 1.867, + 50 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_01", + "Segments": [ + 0, + 0, + 1, + 0.611, + 0, + 1.222, + 0, + 1.833, + 0, + 0, + 1.867, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_02", + "Segments": [ + 0, + 0, + 1, + 0.611, + 0, + 1.222, + 0, + 1.833, + 0, + 0, + 1.867, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EFFECT", + "Segments": [ + 0, + 0, + 1, + 0.611, + 0, + 1.222, + 0, + 1.833, + 0, + 0, + 1.867, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_L", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.389, + 0, + 0.444, + -1, + 0.5, + -1, + 1, + 0.556, + -1, + 0.611, + 1, + 0.667, + 1, + 1, + 0.733, + 1, + 0.8, + -0.95, + 0.867, + -0.95, + 1, + 0.922, + -0.95, + 0.978, + 0.45, + 1.033, + 0.45, + 1, + 1.089, + 0.45, + 1.144, + -0.17, + 1.2, + -0.17, + 1, + 1.267, + -0.17, + 1.333, + 0, + 1.4, + 0, + 1, + 1.544, + 0, + 1.689, + 0, + 1.833, + 0, + 0, + 1.867, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_R", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.389, + 0, + 0.444, + 1, + 0.5, + 1, + 1, + 0.556, + 1, + 0.611, + -1, + 0.667, + -1, + 1, + 0.733, + -1, + 0.8, + 1, + 0.867, + 1, + 1, + 0.922, + 1, + 0.978, + -0.39, + 1.033, + -0.39, + 1, + 1.089, + -0.39, + 1.144, + 0.13, + 1.2, + 0.13, + 1, + 1.267, + 0.13, + 1.333, + 0, + 1.4, + 0, + 1, + 1.544, + 0, + 1.689, + 0, + 1.833, + 0, + 0, + 1.867, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_L", + "Segments": [ + 0, + 0, + 1, + 0.233, + 0, + 0.467, + 0, + 0.7, + 0, + 1, + 0.778, + 0, + 0.856, + 0, + 0.933, + 0, + 1, + 1.233, + 0, + 1.533, + 0, + 1.833, + 0, + 0, + 1.867, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_R", + "Segments": [ + 0, + 0, + 1, + 0.233, + 0, + 0.467, + 0, + 0.7, + 0, + 1, + 0.778, + 0, + 0.856, + 0, + 0.933, + 0, + 1, + 1.233, + 0, + 1.533, + 0, + 1.833, + 0, + 0, + 1.867, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_SWING", + "Segments": [ + 0, + 0, + 0, + 1.867, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_SWING", + "Segments": [ + 0, + 0, + 0, + 1.867, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_FACE_01", + "Segments": [ + 0, + 0, + 1, + 0.611, + 0, + 1.222, + 0, + 1.833, + 0, + 0, + 1.867, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BASE_X", + "Segments": [ + 0, + 0, + 0, + 1.867, + 0 + ] + } + ] +} \ No newline at end of file diff --git a/Sample/src/main/java/com/live2d/demo/LAppDefine.java b/Sample/src/main/java/com/live2d/demo/LAppDefine.java index 875c358..189555c 100644 --- a/Sample/src/main/java/com/live2d/demo/LAppDefine.java +++ b/Sample/src/main/java/com/live2d/demo/LAppDefine.java @@ -137,35 +137,6 @@ public String getPath() { } } - /** - * Model directory name. - */ - public enum ModelDir { - HARU(0, "Haru"), - HIYORI(1, "Hiyori"), - MARK(2, "Mark"), - NATORI(3, "Natori"), - RICE(4, "Rice"), - MAO(5, "Mao"); - - private final int order; - private final String dirName; - - ModelDir(int order, String dirName) { - this.order = order; - this.dirName = dirName; - } - - public int getOrder() { - return order; - } - - public String getDirName() { - return dirName; - } - - } - /** * Motion group */ diff --git a/Sample/src/minimum/java/com.live2d.demo.minimum/LAppMinimumDelegate.java b/Sample/src/minimum/java/com.live2d.demo.minimum/LAppMinimumDelegate.java index a7d79b2..39fea06 100644 --- a/Sample/src/minimum/java/com.live2d.demo.minimum/LAppMinimumDelegate.java +++ b/Sample/src/minimum/java/com.live2d.demo.minimum/LAppMinimumDelegate.java @@ -11,7 +11,6 @@ import android.opengl.GLES20; import android.os.Build; import com.live2d.demo.LAppDefine; -import com.live2d.demo.LAppDefine.ModelDir; import com.live2d.sdk.cubism.framework.CubismFramework; import static android.opengl.GLES20.*; @@ -49,10 +48,6 @@ public void onStop() { CubismFramework.dispose(); } - public void onPause() { - currentModel = LAppMinimumLive2DManager.getInstance().getCurrentModel(); - } - public void onDestroy() { releaseInstance(); } @@ -203,8 +198,6 @@ public Activity getActivity() { private LAppMinimumDelegate() { - currentModel = ModelDir.values()[0]; - // Set up Cubism SDK framework. cubismOption.logFunction = new LAppMinimumPal.PrintLogFunction(); cubismOption.loggingLevel = LAppDefine.cubismLoggingLevel; @@ -224,11 +217,6 @@ private LAppMinimumDelegate() { private int windowHeight; private boolean isActive; - /** - * モデルシーンインデックス - */ - private ModelDir currentModel; - /** * クリックしているか */ diff --git a/Sample/src/minimum/java/com.live2d.demo.minimum/LAppMinimumLive2DManager.java b/Sample/src/minimum/java/com.live2d.demo.minimum/LAppMinimumLive2DManager.java index 1e82a95..74cbcae 100644 --- a/Sample/src/minimum/java/com.live2d.demo.minimum/LAppMinimumLive2DManager.java +++ b/Sample/src/minimum/java/com.live2d.demo.minimum/LAppMinimumLive2DManager.java @@ -7,7 +7,6 @@ package com.live2d.demo.minimum; -import com.live2d.demo.LAppDefine; import com.live2d.sdk.cubism.framework.math.CubismMatrix44; /** @@ -26,10 +25,10 @@ public static void releaseInstance() { s_instance = null; } - public void loadModel(LAppDefine.ModelDir modelDirectoryName) { - String dir = modelDirectoryName.getDirName() + "/"; + public void loadModel(String modelDirectoryName) { + String dir = modelDirectoryName + "/"; model = new LAppMinimumModel(dir); - model.loadAssets(dir, modelDirectoryName.getDirName() + ".model3.json"); + model.loadAssets(dir, modelDirectoryName + ".model3.json"); } // モデル更新処理及び描画処理を行う @@ -76,31 +75,17 @@ public LAppMinimumModel getModel(int number) { return model; } - /** - * シーンインデックスを返す - * - * @return シーンインデックス - */ - public LAppDefine.ModelDir getCurrentModel() { - return currentModel; - } - /** * シングルトンインスタンス */ private static LAppMinimumLive2DManager s_instance; private LAppMinimumLive2DManager() { - currentModel = LAppDefine.ModelDir.values()[1]; - - loadModel(currentModel); + loadModel("Hiyori"); } private LAppMinimumModel model; - /** - * 表示するシーンのインデックス値 - */ - private final LAppDefine.ModelDir currentModel; + private final CubismMatrix44 viewMatrix = CubismMatrix44.create(); private final CubismMatrix44 projection = CubismMatrix44.create(); } diff --git a/Sample/src/minimum/java/com.live2d.demo.minimum/MainActivityMinimum.java b/Sample/src/minimum/java/com.live2d.demo.minimum/MainActivityMinimum.java index 233e073..dea3f34 100644 --- a/Sample/src/minimum/java/com.live2d.demo.minimum/MainActivityMinimum.java +++ b/Sample/src/minimum/java/com.live2d.demo.minimum/MainActivityMinimum.java @@ -48,7 +48,6 @@ protected void onPause() { super.onPause(); _glSurfaceView.onPause(); - LAppMinimumDelegate.getInstance().onPause(); } @Override diff --git a/build.gradle b/build.gradle index 650d0df..766cd04 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.2' + classpath 'com.android.tools.build:gradle:8.0.2' // classpath 'de.mannodermaus.gradle.plugins:android-junit5:1.8.2.0' // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle.properties b/gradle.properties index 5f1eb01..1312df7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,7 +21,7 @@ android.enableJetifier=true # Android SDK version that will be used as the compiled project PROP_COMPILE_SDK_VERSION=33 # Android SDK version that will be used as the earliest version of android this application can run on -PROP_MIN_SDK_VERSION=16 +PROP_MIN_SDK_VERSION=21 # Android SDK version that will be used as the latest version of android this application has been tested on PROP_TARGET_SDK_VERSION=33 # List of CPU Archtexture to build that application with diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d19e32f..1abd55b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Mar 12 22:39:53 JST 2022 +#Tue Jul 11 17:28:23 JST 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists