diff --git a/CHANGELOG.md b/CHANGELOG.md index 512a8e3..ed9d222 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ 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/). +## [4-r.3] - 2021-06-10 + +### Fixed + +* Fixed the model path. It was causing a 404 when an exact path was required. + ## [4-r.3-beta.1] - 2021-05-13 ### Added @@ -81,6 +87,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). * Fix issue with reloading model images in WebKit. +[4-r.3]: https://github.com/Live2D/CubismWebSamples/compare/4-r.3-beta.1...4-r.3 [4-r.3-beta.1]: https://github.com/Live2D/CubismWebSamples/compare/4-r.2...4-r.3-beta.1 [4-r.2]: https://github.com/Live2D/CubismWebSamples/compare/4-r.1...4-r.2 [4-r.1]: https://github.com/Live2D/CubismWebSamples/compare/4-beta.2...4-r.1 diff --git a/Framework b/Framework index 8ac72d4..50de62e 160000 --- a/Framework +++ b/Framework @@ -1 +1 @@ -Subproject commit 8ac72d40bc0a22eb06742c7062614457589bc822 +Subproject commit 50de62e30608ffc03ebcf09d7797ea141e9174c7 diff --git a/README.md b/README.md index 38a82ff..5794d78 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,9 @@ -# \[Beta Version\] Cubism Web Samples +# Cubism Web Samples Live2D Cubism 4 Editor で出力したモデルを表示するアプリケーションのサンプル実装です。 Cubism Web Framework および Live2D Cubism Core と組み合わせて使用します。 -**本 SDK は、 Beta バージョンとなります。先行して新機能を取り込んでいるため、不安定な挙動を示す場合がございます。安定した製品をお求めの方は、公式サイトから配布されている正式版のパッケージ又は `develop` `master` ブランチをご利用ください。** - -**[Beta Version] の SDK の不具合、各種ご意見等に関しましては、 Live2D コミュニティ にてご連絡ください。直接のコードに対する指摘、修正等は、直接 Pull requests としてご投稿ください。** - ## ライセンス @@ -84,32 +80,29 @@ NOTE: デバック用の設定は、`.vscode/launch.json` に記述していま ### Node.js -* 15.14.0 -* 14.16.1 +* 16.1.0 +* 14.17.0 * 12.22.1 -* 10.24.1 ## 動作確認環境 | プラットフォーム | ブラウザ | バージョン | | --- | --- | --- | -| Android | Google Chrome | 88.0.4324.181 | -| Android | Microsoft Edge | 46.01.4.5140 | -| Android | Mozilla Firefox | 86.1.1 | -| iOS / iPadOS | Google Chrome | 87.0.4280.77 | -| iOS / iPadOS | Microsoft Edge | 46.1.10 | -| iOS / iPadOS | Mozilla Firefox | 32.0 | -| iOS / iPadOS | Safari | 604.1 | -| Linux | Google Chrome | 89.0.4389.72 | -| Linux | Mozilla Firefox | 86.0 | -| macOS | Google Chrome | 88.0.4324.192 | -| macOS | Microsoft Edge | 88.0.705.81 | -| macOS | Mozilla Firefox | 86.0 | -| macOS | Safari | 14.0.2 | -| Windows | Google Chrome | 88.0.4324.190 | -| Windows | Internet Explorer 11 | 20H2(19042.685) | -| Windows | Microsoft Edge | 88.0.705.74 | -| Windows | Mozilla Firefox | 86.0 | +| Android | Google Chrome | 90.0.4430.210 | +| Android | Microsoft Edge | 46.04.4.5157 | +| Android | Mozilla Firefox | 88.1.4 | +| iOS / iPadOS | Google Chrome | 90.0.4430.216 | +| iOS / iPadOS | Microsoft Edge | 46.3.13 | +| iOS / iPadOS | Mozilla Firefox | 33.1 | +| iOS / iPadOS | Safari | 14.1 | +| macOS | Google Chrome | 91.0.4472.77 | +| macOS | Microsoft Edge | 90.0.818.66 | +| macOS | Mozilla Firefox | 88.0.1 | +| macOS | Safari | 14.1 | +| Windows | Google Chrome | 91.0.4472.77 | +| Windows | Internet Explorer 11 | 19041.928 | +| Windows | Microsoft Edge | 90.0.818.66 | +| Windows | Mozilla Firefox | 88.0.1 | Note: 動作確認時のサーバの起動は `./Samples/TypeScript/Demo/package.json` の `serve` スクリプトを使用して行っています。 diff --git a/Samples/TypeScript/Demo/src/lappmodel.ts b/Samples/TypeScript/Demo/src/lappmodel.ts index aee725a..5c7f84a 100644 --- a/Samples/TypeScript/Demo/src/lappmodel.ts +++ b/Samples/TypeScript/Demo/src/lappmodel.ts @@ -79,7 +79,7 @@ export class LAppModel extends CubismUserModel { public loadAssets(dir: string, fileName: string): void { this._modelHomeDir = dir; - fetch(`${this._modelHomeDir}/${fileName}`) + fetch(`${this._modelHomeDir}${fileName}`) .then(response => response.arrayBuffer()) .then(arrayBuffer => { const setting: ICubismModelSetting = new CubismModelSettingJson( @@ -111,7 +111,7 @@ export class LAppModel extends CubismUserModel { if (this._modelSetting.getModelFileName() != '') { const modelFileName = this._modelSetting.getModelFileName(); - fetch(`${this._modelHomeDir}/${modelFileName}`) + fetch(`${this._modelHomeDir}${modelFileName}`) .then(response => response.arrayBuffer()) .then(arrayBuffer => { this.loadModel(arrayBuffer); @@ -137,7 +137,7 @@ export class LAppModel extends CubismUserModel { i ); - fetch(`${this._modelHomeDir}/${expressionFileName}`) + fetch(`${this._modelHomeDir}${expressionFileName}`) .then(response => response.arrayBuffer()) .then(arrayBuffer => { const motion: ACubismMotion = this.loadExpression( @@ -179,7 +179,7 @@ export class LAppModel extends CubismUserModel { if (this._modelSetting.getPhysicsFileName() != '') { const physicsFileName = this._modelSetting.getPhysicsFileName(); - fetch(`${this._modelHomeDir}/${physicsFileName}`) + fetch(`${this._modelHomeDir}${physicsFileName}`) .then(response => response.arrayBuffer()) .then(arrayBuffer => { this.loadPhysics(arrayBuffer, arrayBuffer.byteLength); @@ -203,7 +203,7 @@ export class LAppModel extends CubismUserModel { if (this._modelSetting.getPoseFileName() != '') { const poseFileName = this._modelSetting.getPoseFileName(); - fetch(`${this._modelHomeDir}/${poseFileName}`) + fetch(`${this._modelHomeDir}${poseFileName}`) .then(response => response.arrayBuffer()) .then(arrayBuffer => { this.loadPose(arrayBuffer, arrayBuffer.byteLength); @@ -274,7 +274,7 @@ export class LAppModel extends CubismUserModel { if (this._modelSetting.getUserDataFile() != '') { const userDataFile = this._modelSetting.getUserDataFile(); - fetch(`${this._modelHomeDir}/${userDataFile}`) + fetch(`${this._modelHomeDir}${userDataFile}`) .then(response => response.arrayBuffer()) .then(arrayBuffer => { this.loadUserData(arrayBuffer, arrayBuffer.byteLength); @@ -557,7 +557,7 @@ export class LAppModel extends CubismUserModel { let autoDelete = false; if (motion == null) { - fetch(`${this._modelHomeDir}/${motionFileName}`) + fetch(`${this._modelHomeDir}${motionFileName}`) .then(response => response.arrayBuffer()) .then(arrayBuffer => { motion = this.loadMotion( @@ -723,7 +723,7 @@ export class LAppModel extends CubismUserModel { ); } - fetch(`${this._modelHomeDir}/${motionFileName}`) + fetch(`${this._modelHomeDir}${motionFileName}`) .then(response => response.arrayBuffer()) .then(arrayBuffer => { const tmpMotion: CubismMotion = this.loadMotion(