Merge pull request #36 from Live2D/develop

Update to Cubism 4 SDK for Web R2
Live2D · Mar 9, 2021 · af623ca · af623ca
2 parents 118ba95 + 4902c91
commit af623ca
Show file tree

Hide file tree

Showing 19 changed files with 10,675 additions and 2,469 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,11 +1,13 @@
 # Core directory files
-/Core/*
-!Please_copy_cubism_core_for_web
+/Core/**/.js
+/Core/**/.ts
 # Package files
 node_modules/
 # Build files
+build/
 dist/
 # Other files
+temp/
 .vs/
 .idea/
 *.iml
@@ -14,4 +16,5 @@ dist/
 .vscode/*
 !/.vscode/extensions.json
 !/.vscode/launch.json
+!/.vscode/settings.json
 !/.vscode/tasks.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+  "typescript.tsdk": "./Samples/TypeScript/Demo/node_modules/typescript/lib"
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,18 @@ 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.2] - 2021-03-09
+
+### Added
+
+* Add dynamic screen size and touch detection support.
+
+### Fixed
+
+* Adjust size calculation for models displayed in a window and fix to use a view matrix.
+* Avoiding needless namespace syntax to simplify imports by [@cocor-au-lait](https://github.com/cocor-au-lait)
+
+
 ## [4-r.1] - 2020-01-30
 
 ### Added
@@ -62,6 +74,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.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
 [4-beta.2]: https://github.com/Live2D/CubismWebSamples/compare/4-beta.1...4-beta.2
 [4-beta.1]: https://github.com/Live2D/CubismWebSamples/compare/e36ab2233a89de9225f64e5a02d521bc7235bd03...4-beta.1
diff --git a/Framework b/Framework
diff --git a/README.md b/README.md
@@ -80,31 +80,32 @@ NOTE: デバック用の設定は、`.vscode/launch.json` に記述していま
 
 ### Node.js
 
-* 13.7.0
-* 12.14.1
-* 10.18.1
+* 15.11.0
+* 14.16.0
+* 12.21.0
+* 10.24.0
 
 
 ## 動作確認環境
 
 | プラットフォーム | ブラウザ | バージョン |
 | --- | --- | --- |
-| Android | Google Chrome | 79.0.3945.136 |
-| Android | Microsoft Edge | 42.0.4.3989 |
-| Android | Mozilla Firefox | 68.2.0 |
-| iOS / iPadOS | Google Chrome | 79.0.3945.73 |
-| iOS / iPadOS | Microsoft Edge | 44.11.15 |
-| iOS / iPadOS | Mozilla Firefox | 21.0 |
-| iOS / iPadOS | Safari | 13.0.4 |
-| Linux | Google Chrome | 79.0.3945.130 |
-| Linux | Mozilla Firefox | 72.0.1 |
-| macOS | Google Chrome | 79.0.3945.130 |
-| macOS | Microsoft Edge | 79.0.309.71 |
-| macOS | Mozilla Firefox | 72.0.2 |
-| macOS | Safari | 13.0.4 |
-| Windows | Google Chrome | 79.0.3945.130 |
-| Windows | Internet Explorer 11 | 11.592.18362.0 |
-| Windows | Microsoft Edge | 79.0.309.71 |
-| Windows | Mozilla Firefox | 72.0.2 |
+| 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 |
 
 Note: 動作確認時のサーバの起動は `./Samples/TypeScript/Demo/package.json` の `serve` スクリプトを使用して行っています。
diff --git a/Samples/TypeScript/Demo/.eslintrc.yml b/Samples/TypeScript/Demo/.eslintrc.yml
@@ -4,7 +4,7 @@ extends:
   - plugin:@typescript-eslint/recommended
   - plugin:@typescript-eslint/recommended-requiring-type-checking
   - plugin:prettier/recommended
-  - prettier/@typescript-eslint
+  - prettier
 plugins:
   - '@typescript-eslint'
 parser: '@typescript-eslint/parser'
@@ -16,7 +16,12 @@ rules:
   prettier/prettier:
     - error
     - singleQuote: true
-  '@typescript-eslint/camelcase': warn
+      trailingComma: none
+      arrowParens: avoid
+  'camelcase': warn
   '@typescript-eslint/no-use-before-define': off
-  '@typescript-eslint/ban-ts-ignore': off
+  '@typescript-eslint/ban-ts-comment': off
   '@typescript-eslint/unbound-method': off
+  '@typescript-eslint/no-unsafe-assignment': off
+  '@typescript-eslint/no-unsafe-return': off
+  '@typescript-eslint/no-floating-promises': off
diff --git a/Samples/TypeScript/Demo/index.html b/Samples/TypeScript/Demo/index.html
@@ -7,6 +7,7 @@
   <style>
     html, body {
         margin: 0;
+        overflow: hidden;
     }
   </style>
   <!-- Pollyfill script -->