Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: pixiv/three-vrm
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.1.1
Choose a base ref
...
head repository: pixiv/three-vrm
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.1.2
Choose a head ref
4 contributors
Loading
Showing with 267 additions and 469 deletions.
  1. +18 −18 .github/workflows/inspect.yml
  2. +3 −3 .github/workflows/publish.yml
  3. +1 −1 .node-version
  4. +5 −7 README.md
  5. +1 −1 lerna.json
  6. +3 −7 packages/three-vrm-animation/examples/dnd.html
  7. +3 −7 packages/three-vrm-animation/examples/loader-plugin.html
  8. +9 −9 packages/three-vrm-animation/package.json
  9. +2 −6 packages/three-vrm-core/examples/expressions.html
  10. +2 −6 packages/three-vrm-core/examples/firstPerson.html
  11. +2 −6 packages/three-vrm-core/examples/humanoid.html
  12. +3 −7 packages/three-vrm-core/examples/humanoidAnimation/index.html
  13. +2 −6 packages/three-vrm-core/examples/lookAt.html
  14. +2 −6 packages/three-vrm-core/examples/meta.html
  15. +7 −7 packages/three-vrm-core/package.json
  16. +2 −6 packages/three-vrm-materials-hdr-emissive-multiplier/examples/loader-plugin.html
  17. +6 −6 packages/three-vrm-materials-hdr-emissive-multiplier/package.json
  18. +3 −3 packages/three-vrm-materials-mtoon/examples/emissive-strength.html
  19. +2 −6 packages/three-vrm-materials-mtoon/examples/feature-test.html
  20. +2 −6 packages/three-vrm-materials-mtoon/examples/loader-plugin.html
  21. +7 −7 packages/three-vrm-materials-mtoon/package.json
  22. +5 −5 packages/three-vrm-materials-mtoon/src/MToonMaterial.ts
  23. +1 −1 packages/three-vrm-materials-mtoon/src/shaders/mtoon.frag
  24. +7 −7 packages/three-vrm-materials-v0compat/package.json
  25. +26 −18 packages/three-vrm-materials-v0compat/src/VRMMaterialsV0CompatPlugin.ts
  26. +5 −5 packages/three-vrm-node-constraint/examples/aim.html
  27. +5 −5 packages/three-vrm-node-constraint/examples/importer.html
  28. +5 −5 packages/three-vrm-node-constraint/examples/roll.html
  29. +5 −5 packages/three-vrm-node-constraint/examples/rotation.html
  30. +5 −5 packages/three-vrm-node-constraint/examples/upper-arm.html
  31. +6 −6 packages/three-vrm-node-constraint/package.json
  32. +3 −3 packages/three-vrm-springbone/examples/collider.html
  33. +3 −3 packages/three-vrm-springbone/examples/loader-plugin.html
  34. +3 −3 packages/three-vrm-springbone/examples/multiple.html
  35. +3 −3 packages/three-vrm-springbone/examples/single.html
  36. +5 −5 packages/three-vrm-springbone/package.json
  37. +5 −7 packages/three-vrm/README.md
  38. +2 −6 packages/three-vrm/examples/animations.html
  39. +2 −6 packages/three-vrm/examples/basic.html
  40. +2 −6 packages/three-vrm/examples/bones.html
  41. +2 −6 packages/three-vrm/examples/debug.html
  42. +2 −6 packages/three-vrm/examples/dnd.html
  43. +2 −6 packages/three-vrm/examples/expressions.html
  44. +2 −6 packages/three-vrm/examples/firstperson.html
  45. +3 −7 packages/three-vrm/examples/humanoidAnimation/index.html
  46. +2 −6 packages/three-vrm/examples/lookat-advanced.html
  47. +2 −6 packages/three-vrm/examples/lookat.html
  48. +2 −6 packages/three-vrm/examples/materials-debug.html
  49. +2 −6 packages/three-vrm/examples/meta.html
  50. +2 −6 packages/three-vrm/examples/mouse.html
  51. +11 −11 packages/three-vrm/package.json
  52. +1 −1 packages/types-vrm-0.0/package.json
  53. +1 −1 packages/types-vrmc-materials-hdr-emissive-multiplier-1.0/package.json
  54. +1 −1 packages/types-vrmc-materials-mtoon-1.0/package.json
  55. +1 −1 packages/types-vrmc-node-constraint-1.0/package.json
  56. +1 −1 packages/types-vrmc-springbone-1.0/package.json
  57. +1 −1 packages/types-vrmc-vrm-1.0/package.json
  58. +1 −1 packages/types-vrmc-vrm-animation-1.0/package.json
  59. +45 −155 yarn.lock
36 changes: 18 additions & 18 deletions .github/workflows/inspect.yml
View file
Original file line number Diff line number Diff line change
@@ -11,13 +11,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: './.node-version'
- name: Cache Deps
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
node_modules
@@ -33,13 +33,13 @@ jobs:
needs: fetch
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: './.node-version'
- name: Cache Deps
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
node_modules
@@ -63,13 +63,13 @@ jobs:
needs: build
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: './.node-version'
- name: Cache Deps
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
node_modules
@@ -90,13 +90,13 @@ jobs:
needs: build
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: './.node-version'
- name: Cache Deps
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
node_modules
@@ -117,13 +117,13 @@ jobs:
needs: build
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: './.node-version'
- name: Cache Deps
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
node_modules
@@ -153,13 +153,13 @@ jobs:
- docs
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: './.node-version'
- name: Cache Deps
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
node_modules
6 changes: 3 additions & 3 deletions .github/workflows/publish.yml
View file
Original file line number Diff line number Diff line change
@@ -23,14 +23,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: './.node-version'
registry-url: 'https://registry.npmjs.org'
- name: Cache Deps
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
node_modules
2 changes: 1 addition & 1 deletion .node-version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.10.0
20.13.1
12 changes: 5 additions & 7 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -32,22 +32,20 @@ You will need:

- [Three.js build](https://github.com/mrdoob/three.js/blob/master/build/three.js)
- [GLTFLoader](https://github.com/mrdoob/three.js/blob/master/examples/js/loaders/GLTFLoader.js)
- [A build of @pixiv/three-vrm](https://unpkg.com/browse/@pixiv/three-vrm/lib/)
- [A build of @pixiv/three-vrm](https://www.jsdelivr.com/package/npm/@pixiv/three-vrm?tab=files&path=lib)
- `.module` ones are ESM, otherwise it's UMD and injects its modules into global `THREE`
- `.min` ones are minified (for production), otherwise it's not minified and it comes with source maps

You can import all of them via CDN. See the example below.

Code like this:

```html
<!-- About import maps, see the Three.js official docs: -->
<!-- https://threejs.org/docs/#manual/en/introduction/Installation -->
<script async src="https://unpkg.com/es-module-shims@1.3.6/dist/es-module-shims.js"></script>

<script type="importmap">
{
"imports": {
"three": "https://unpkg.com/three@0.162.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.162.0/examples/jsm/",
"three": "https://cdn.jsdelivr.net/npm/three@0.164.1/build/three.module.js",
"three/addons/": "https://cdn.jsdelivr.net/npm/three@0.164.1/examples/jsm/",
"@pixiv/three-vrm": "three-vrm.module.js"
}
}
2 changes: 1 addition & 1 deletion lerna.json
View file
Original file line number Diff line number Diff line change
@@ -2,5 +2,5 @@
"npmClient": "yarn",
"useWorkspaces": true,
"packages": ["packages/*"],
"version": "2.1.1"
"version": "2.1.2"
}
10 changes: 3 additions & 7 deletions packages/three-vrm-animation/examples/dnd.html
View file
Original file line number Diff line number Diff line change
@@ -19,16 +19,12 @@
</head>

<body>
<!-- Import maps polyfill -->
<!-- Remove this when import maps will be widely supported -->
<script async src="https://unpkg.com/es-module-shims@1.3.6/dist/es-module-shims.js"></script>

<script type="importmap">
{
"imports": {
"three": "https://unpkg.com/three@0.162.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.162.0/examples/jsm/",
"@pixiv/three-vrm": "https://unpkg.com/@pixiv/three-vrm@2.1.0/lib/three-vrm.module.js",
"three": "https://cdn.jsdelivr.net/npm/three@0.164.1/build/three.module.js",
"three/addons/": "https://cdn.jsdelivr.net/npm/three@0.164.1/examples/jsm/",
"@pixiv/three-vrm": "https://cdn.jsdelivr.net/npm/@pixiv/three-vrm@2.1.0/lib/three-vrm.module.js",
"@pixiv/three-vrm-animation": "../lib/three-vrm-animation.module.js"
}
}
10 changes: 3 additions & 7 deletions packages/three-vrm-animation/examples/loader-plugin.html
View file
Original file line number Diff line number Diff line change
@@ -19,16 +19,12 @@
</head>

<body>
<!-- Import maps polyfill -->
<!-- Remove this when import maps will be widely supported -->
<script async src="https://unpkg.com/es-module-shims@1.3.6/dist/es-module-shims.js"></script>

<script type="importmap">
{
"imports": {
"three": "https://unpkg.com/three@0.162.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.162.0/examples/jsm/",
"@pixiv/three-vrm": "https://unpkg.com/@pixiv/three-vrm@2.1.0/lib/three-vrm.module.js",
"three": "https://cdn.jsdelivr.net/npm/three@0.164.1/build/three.module.js",
"three/addons/": "https://cdn.jsdelivr.net/npm/three@0.164.1/examples/jsm/",
"@pixiv/three-vrm": "https://cdn.jsdelivr.net/npm/@pixiv/three-vrm@2.1.0/lib/three-vrm.module.js",
"@pixiv/three-vrm-animation": "../lib/three-vrm-animation.module.js"
}
}
18 changes: 9 additions & 9 deletions packages/three-vrm-animation/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@pixiv/three-vrm-animation",
"version": "2.1.1",
"version": "2.1.2",
"description": "The implementation of VRM Animation",
"license": "MIT",
"author": "pixiv",
@@ -46,17 +46,17 @@
]
},
"dependencies": {
"@pixiv/three-vrm-core": "2.1.1",
"@pixiv/types-vrmc-vrm-1.0": "2.1.1",
"@pixiv/types-vrmc-vrm-animation-1.0": "2.1.1"
"@pixiv/three-vrm-core": "2.1.2",
"@pixiv/types-vrmc-vrm-1.0": "2.1.2",
"@pixiv/types-vrmc-vrm-animation-1.0": "2.1.2"
},
"devDependencies": {
"@types/three": "^0.162.0",
"lint-staged": "13.1.2",
"three": "^0.162.0"
"@types/three": "^0.164.0",
"lint-staged": "15.2.2",
"three": "^0.164.1"
},
"peerDependencies": {
"@types/three": "^0.162.0",
"three": "^0.162.0"
"@types/three": "^0.164.0",
"three": "^0.164.1"
}
}
8 changes: 2 additions & 6 deletions packages/three-vrm-core/examples/expressions.html
View file
Original file line number Diff line number Diff line change
@@ -19,15 +19,11 @@
</head>

<body>
<!-- Import maps polyfill -->
<!-- Remove this when import maps will be widely supported -->
<script async src="https://unpkg.com/es-module-shims@1.3.6/dist/es-module-shims.js"></script>

<script type="importmap">
{
"imports": {
"three": "https://unpkg.com/three@0.162.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.162.0/examples/jsm/",
"three": "https://cdn.jsdelivr.net/npm/three@0.164.1/build/three.module.js",
"three/addons/": "https://cdn.jsdelivr.net/npm/three@0.164.1/examples/jsm/",
"@pixiv/three-vrm-core": "../lib/three-vrm-core.module.js"
}
}
8 changes: 2 additions & 6 deletions packages/three-vrm-core/examples/firstPerson.html
View file
Original file line number Diff line number Diff line change
@@ -25,15 +25,11 @@
<body>
<span id="info"></span>

<!-- Import maps polyfill -->
<!-- Remove this when import maps will be widely supported -->
<script async src="https://unpkg.com/es-module-shims@1.3.6/dist/es-module-shims.js"></script>

<script type="importmap">
{
"imports": {
"three": "https://unpkg.com/three@0.162.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.162.0/examples/jsm/",
"three": "https://cdn.jsdelivr.net/npm/three@0.164.1/build/three.module.js",
"three/addons/": "https://cdn.jsdelivr.net/npm/three@0.164.1/examples/jsm/",
"@pixiv/three-vrm-core": "../lib/three-vrm-core.module.js"
}
}
8 changes: 2 additions & 6 deletions packages/three-vrm-core/examples/humanoid.html
View file
Original file line number Diff line number Diff line change
@@ -19,15 +19,11 @@
</head>

<body>
<!-- Import maps polyfill -->
<!-- Remove this when import maps will be widely supported -->
<script async src="https://unpkg.com/es-module-shims@1.3.6/dist/es-module-shims.js"></script>

<script type="importmap">
{
"imports": {
"three": "https://unpkg.com/three@0.162.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.162.0/examples/jsm/",
"three": "https://cdn.jsdelivr.net/npm/three@0.164.1/build/three.module.js",
"three/addons/": "https://cdn.jsdelivr.net/npm/three@0.164.1/examples/jsm/",
"@pixiv/three-vrm-core": "../lib/three-vrm-core.module.js"
}
}
10 changes: 3 additions & 7 deletions packages/three-vrm-core/examples/humanoidAnimation/index.html
View file
Original file line number Diff line number Diff line change
@@ -30,16 +30,12 @@
drag and drop <a href="https://www.mixamo.com/" target="_blank" rel="noopener noreferrer">mixamo</a> animation (.fbx)<br />
</div>

<!-- Import maps polyfill -->
<!-- Remove this when import maps will be widely supported -->
<script async src="https://unpkg.com/es-module-shims@1.3.6/dist/es-module-shims.js"></script>

<script type="importmap">
{
"imports": {
"fflate": "https://unpkg.com/fflate@0.7.4/esm/browser.js",
"three": "https://unpkg.com/three@0.162.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.162.0/examples/jsm/",
"fflate": "https://cdn.jsdelivr.net/npm/fflate@0.7.4/esm/browser.js",
"three": "https://cdn.jsdelivr.net/npm/three@0.164.1/build/three.module.js",
"three/addons/": "https://cdn.jsdelivr.net/npm/three@0.164.1/examples/jsm/",
"@pixiv/three-vrm-core": "../../lib/three-vrm-core.module.js"
}
}
8 changes: 2 additions & 6 deletions packages/three-vrm-core/examples/lookAt.html
View file
Original file line number Diff line number Diff line change
@@ -25,15 +25,11 @@
<body>
<span id="info"></span>

<!-- Import maps polyfill -->
<!-- Remove this when import maps will be widely supported -->
<script async src="https://unpkg.com/es-module-shims@1.3.6/dist/es-module-shims.js"></script>

<script type="importmap">
{
"imports": {
"three": "https://unpkg.com/three@0.162.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.162.0/examples/jsm/",
"three": "https://cdn.jsdelivr.net/npm/three@0.164.1/build/three.module.js",
"three/addons/": "https://cdn.jsdelivr.net/npm/three@0.164.1/examples/jsm/",
"@pixiv/three-vrm-core": "../lib/three-vrm-core.module.js"
}
}
8 changes: 2 additions & 6 deletions packages/three-vrm-core/examples/meta.html
View file
Original file line number Diff line number Diff line change
@@ -32,15 +32,11 @@
<span id="meta"></span>
<img id="thumbnail" alt="thumbnail" />

<!-- Import maps polyfill -->
<!-- Remove this when import maps will be widely supported -->
<script async src="https://unpkg.com/es-module-shims@1.3.6/dist/es-module-shims.js"></script>

<script type="importmap">
{
"imports": {
"three": "https://unpkg.com/three@0.162.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.162.0/examples/jsm/",
"three": "https://cdn.jsdelivr.net/npm/three@0.164.1/build/three.module.js",
"three/addons/": "https://cdn.jsdelivr.net/npm/three@0.164.1/examples/jsm/",
"@pixiv/three-vrm-core": "../lib/three-vrm-core.module.js"
}
}
14 changes: 7 additions & 7 deletions packages/three-vrm-core/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@pixiv/three-vrm-core",
"version": "2.1.1",
"version": "2.1.2",
"description": "The implementation of core features of VRM, for @pixiv/three-vrm",
"license": "MIT",
"author": "pixiv",
@@ -50,15 +50,15 @@
]
},
"dependencies": {
"@pixiv/types-vrm-0.0": "2.1.1",
"@pixiv/types-vrmc-vrm-1.0": "2.1.1"
"@pixiv/types-vrm-0.0": "2.1.2",
"@pixiv/types-vrmc-vrm-1.0": "2.1.2"
},
"devDependencies": {
"@types/three": "^0.162.0",
"three": "^0.162.0"
"@types/three": "^0.164.0",
"three": "^0.164.1"
},
"peerDependencies": {
"@types/three": "^0.162.0",
"three": "^0.162.0"
"@types/three": "^0.164.0",
"three": "^0.164.1"
}
}
8 changes: 2 additions & 6 deletions packages/three-vrm-materials-hdr-emissive-multiplier/examples/loader-plugin.html
View file
Original file line number Diff line number Diff line change
@@ -19,15 +19,11 @@
</head>

<body>
<!-- Import maps polyfill -->
<!-- Remove this when import maps will be widely supported -->
<script async src="https://unpkg.com/es-module-shims@1.3.6/dist/es-module-shims.js"></script>

<script type="importmap">
{
"imports": {
"three": "https://unpkg.com/three@0.162.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.162.0/examples/jsm/",
"three": "https://cdn.jsdelivr.net/npm/three@0.164.1/build/three.module.js",
"three/addons/": "https://cdn.jsdelivr.net/npm/three@0.164.1/examples/jsm/",
"@pixiv/three-vrm-materials-hdr-emissive-multiplier": "../lib/three-vrm-materials-hdr-emissive-multiplier.module.js"
}
}
Loading