Skip to content

Commit

Permalink
deps: Bump three.js to r160
Browse files Browse the repository at this point in the history 
- The type parameter of `THREE.Object3D` is no longer required (used to be `THREE.Object3D<THREE.Event>`
- `THREE.UniformsUtils.merge` now has more appropriate typing which breaks the existing code, workarounded with `as any`
  • Loading branch information
@0b5vr
0b5vr committed Dec 25, 2023
1 parent d137ae9 commit d4352ed
Show file tree
Hide file tree
Showing 47 changed files with 110 additions and 122 deletions.
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ Code like this:
<script type="importmap">
{
"imports": {
"three": "https://unpkg.com/three@0.154.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.154.0/examples/jsm/",
"three": "https://unpkg.com/three@0.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"@pixiv/three-vrm": "three-vrm.module.js"
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/three-vrm-core/examples/expressions.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
<script type="importmap">
{
"imports": {
"three": "https://unpkg.com/three@0.154.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.154.0/examples/jsm/",
"three": "https://unpkg.com/three@0.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"@pixiv/three-vrm-core": "../lib/three-vrm-core.module.js"
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/three-vrm-core/examples/firstPerson.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
<script type="importmap">
{
"imports": {
"three": "https://unpkg.com/three@0.154.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.154.0/examples/jsm/",
"three": "https://unpkg.com/three@0.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"@pixiv/three-vrm-core": "../lib/three-vrm-core.module.js"
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/three-vrm-core/examples/humanoid.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
<script type="importmap">
{
"imports": {
"three": "https://unpkg.com/three@0.154.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.154.0/examples/jsm/",
"three": "https://unpkg.com/three@0.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"@pixiv/three-vrm-core": "../lib/three-vrm-core.module.js"
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/three-vrm-core/examples/humanoidAnimation/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
{
"imports": {
"fflate": "https://unpkg.com/[email protected]/esm/browser.js",
"three": "https://unpkg.com/three@0.154.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.154.0/examples/jsm/",
"three": "https://unpkg.com/three@0.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"@pixiv/three-vrm-core": "../../lib/three-vrm-core.module.js"
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/three-vrm-core/examples/lookAt.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
<script type="importmap">
{
"imports": {
"three": "https://unpkg.com/three@0.154.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.154.0/examples/jsm/",
"three": "https://unpkg.com/three@0.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"@pixiv/three-vrm-core": "../lib/three-vrm-core.module.js"
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/three-vrm-core/examples/meta.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
<script type="importmap">
{
"imports": {
"three": "https://unpkg.com/three@0.154.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.154.0/examples/jsm/",
"three": "https://unpkg.com/three@0.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"@pixiv/three-vrm-core": "../lib/three-vrm-core.module.js"
}
}
Expand Down
8 changes: 4 additions & 4 deletions packages/three-vrm-core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@
"@pixiv/types-vrmc-vrm-1.0": "2.0.7"
},
"devDependencies": {
"@types/three": "^0.154.0",
"three": "^0.154.0"
"@types/three": "^0.160.0",
"three": "^0.160.0"
},
"peerDependencies": {
"@types/three": "^0.154.0",
"three": "^0.154.0"
"@types/three": "^0.160.0",
"three": "^0.160.0"
}
}
4 changes: 2 additions & 2 deletions packages/three-vrm-materials-hdr-emissive-multiplier/examples/loader-plugin.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
<script type="importmap">
{
"imports": {
"three": "https://unpkg.com/three@0.154.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.154.0/examples/jsm/",
"three": "https://unpkg.com/three@0.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"@pixiv/three-vrm-materials-hdr-emissive-multiplier": "../lib/three-vrm-materials-hdr-emissive-multiplier.module.js"
}
}
Expand Down
8 changes: 4 additions & 4 deletions packages/three-vrm-materials-hdr-emissive-multiplier/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@
"@pixiv/types-vrmc-materials-hdr-emissive-multiplier-1.0": "2.0.7"
},
"devDependencies": {
"@types/three": "^0.154.0",
"three": "^0.154.0"
"@types/three": "^0.160.0",
"three": "^0.160.0"
},
"peerDependencies": {
"@types/three": "^0.154.0",
"three": "^0.154.0"
"@types/three": "^0.160.0",
"three": "^0.160.0"
}
}
4 changes: 2 additions & 2 deletions packages/three-vrm-materials-mtoon/examples/emissive-strength.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
<script type="importmap">
{
"imports": {
"three": "https://unpkg.com/three@0.154.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.154.0/examples/jsm/",
"three": "https://unpkg.com/three@0.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"@pixiv/three-vrm-materials-mtoon": "../lib/three-vrm-materials-mtoon.module.js"
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/three-vrm-materials-mtoon/examples/feature-test.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
<script type="importmap">
{
"imports": {
"three": "https://unpkg.com/three@0.154.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.154.0/examples/jsm/",
"three": "https://unpkg.com/three@0.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"@pixiv/three-vrm-materials-mtoon": "../lib/three-vrm-materials-mtoon.module.js"
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/three-vrm-materials-mtoon/examples/loader-plugin.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
<script type="importmap">
{
"imports": {
"three": "https://unpkg.com/three@0.154.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.154.0/examples/jsm/",
"three": "https://unpkg.com/three@0.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"@pixiv/three-vrm-materials-mtoon": "../lib/three-vrm-materials-mtoon.module.js"
}
}
Expand Down
8 changes: 4 additions & 4 deletions packages/three-vrm-materials-mtoon/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@
"@pixiv/types-vrmc-materials-mtoon-1.0": "2.0.7"
},
"devDependencies": {
"@types/three": "^0.154.0",
"three": "^0.154.0"
"@types/three": "^0.160.0",
"three": "^0.160.0"
},
"peerDependencies": {
"@types/three": "^0.154.0",
"three": "^0.154.0"
"@types/three": "^0.160.0",
"three": "^0.160.0"
}
}
4 changes: 2 additions & 2 deletions packages/three-vrm-materials-mtoon/src/MToonMaterial.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -445,8 +445,8 @@ export class MToonMaterial extends THREE.ShaderMaterial {
uvAnimationScrollYOffset: { value: 0.0 },
uvAnimationRotationPhase: { value: 0.0 },
},
parameters.uniforms,
]);
parameters.uniforms ?? {},
]) as any;

// == finally compile the shader program =======================================================
this.setValues(parameters);
Expand Down
8 changes: 4 additions & 4 deletions packages/three-vrm-materials-v0compat/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@
"@pixiv/types-vrmc-materials-mtoon-1.0": "2.0.7"
},
"devDependencies": {
"@types/three": "^0.154.0",
"three": "^0.154.0"
"@types/three": "^0.160.0",
"three": "^0.160.0"
},
"peerDependencies": {
"@types/three": "^0.154.0",
"three": "^0.154.0"
"@types/three": "^0.160.0",
"three": "^0.160.0"
}
}
4 changes: 2 additions & 2 deletions packages/three-vrm-node-constraint/examples/aim.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
<script type="importmap">
{
"imports": {
"three": "https://unpkg.com/three@0.154.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.154.0/examples/jsm/",
"three": "https://unpkg.com/three@0.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"tweakpane": "https://unpkg.com/[email protected]",
"tweakpane-plugin-rotation": "https://unpkg.com/@0b5vr/[email protected]",
"@pixiv/three-vrm-node-constraint": "../lib/three-vrm-node-constraint.module.js"
Expand Down
4 changes: 2 additions & 2 deletions packages/three-vrm-node-constraint/examples/importer.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
<script type="importmap">
{
"imports": {
"three": "https://unpkg.com/three@0.154.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.154.0/examples/jsm/",
"three": "https://unpkg.com/three@0.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"tweakpane": "https://unpkg.com/[email protected]",
"tweakpane-plugin-rotation": "https://unpkg.com/@0b5vr/[email protected]",
"@pixiv/three-vrm-node-constraint": "../lib/three-vrm-node-constraint.module.js"
Expand Down
4 changes: 2 additions & 2 deletions packages/three-vrm-node-constraint/examples/roll.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
<script type="importmap">
{
"imports": {
"three": "https://unpkg.com/three@0.154.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.154.0/examples/jsm/",
"three": "https://unpkg.com/three@0.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"tweakpane": "https://unpkg.com/[email protected]",
"tweakpane-plugin-rotation": "https://unpkg.com/@0b5vr/[email protected]",
"@pixiv/three-vrm-node-constraint": "../lib/three-vrm-node-constraint.module.js"
Expand Down
4 changes: 2 additions & 2 deletions packages/three-vrm-node-constraint/examples/rotation.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
<script type="importmap">
{
"imports": {
"three": "https://unpkg.com/three@0.154.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.154.0/examples/jsm/",
"three": "https://unpkg.com/three@0.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"tweakpane": "https://unpkg.com/[email protected]",
"tweakpane-plugin-rotation": "https://unpkg.com/@0b5vr/[email protected]",
"@pixiv/three-vrm-node-constraint": "../lib/three-vrm-node-constraint.module.js"
Expand Down
4 changes: 2 additions & 2 deletions packages/three-vrm-node-constraint/examples/upper-arm.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
<script type="importmap">
{
"imports": {
"three": "https://unpkg.com/three@0.154.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.154.0/examples/jsm/",
"three": "https://unpkg.com/three@0.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"tweakpane": "https://unpkg.com/[email protected]",
"tweakpane-plugin-rotation": "https://unpkg.com/@0b5vr/[email protected]",
"@pixiv/three-vrm-node-constraint": "../lib/three-vrm-node-constraint.module.js"
Expand Down
8 changes: 4 additions & 4 deletions packages/three-vrm-node-constraint/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@
"@pixiv/types-vrmc-node-constraint-1.0": "2.0.7"
},
"devDependencies": {
"@types/three": "^0.154.0",
"three": "^0.154.0"
"@types/three": "^0.160.0",
"three": "^0.160.0"
},
"peerDependencies": {
"@types/three": "^0.154.0",
"three": "^0.154.0"
"@types/three": "^0.160.0",
"three": "^0.160.0"
}
}
2 changes: 1 addition & 1 deletion packages/three-vrm-node-constraint/src/VRMAimConstraint.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export class VRMAimConstraint extends VRMNodeConstraint {
*/
private _dstRestQuat: THREE.Quaternion;

public get dependencies(): Set<THREE.Object3D<THREE.Event>> {
public get dependencies(): Set<THREE.Object3D> {
const set = new Set<THREE.Object3D>([this.source]);

if (this.destination.parent) {
Expand Down
2 changes: 1 addition & 1 deletion packages/three-vrm-node-constraint/src/VRMRollConstraint.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export class VRMRollConstraint extends VRMNodeConstraint {
*/
private _invSrcRestQuatMulDstRestQuat: THREE.Quaternion;

public get dependencies(): Set<THREE.Object3D<THREE.Event>> {
public get dependencies(): Set<THREE.Object3D> {
return new Set([this.source]);
}

Expand Down
2 changes: 1 addition & 1 deletion packages/three-vrm-node-constraint/src/VRMRotationConstraint.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export class VRMRotationConstraint extends VRMNodeConstraint {
*/
private _invSrcRestQuat: THREE.Quaternion;

public get dependencies(): Set<THREE.Object3D<THREE.Event>> {
public get dependencies(): Set<THREE.Object3D> {
return new Set([this.source]);
}

Expand Down
2 changes: 1 addition & 1 deletion packages/three-vrm-node-constraint/src/tests/VRMMockedConstraint.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as THREE from 'three';
import { VRMNodeConstraint } from '../VRMNodeConstraint';

export class VRMMockedConstraint extends VRMNodeConstraint {
public dependencies: Set<THREE.Object3D<THREE.Event>>;
public dependencies: Set<THREE.Object3D>;

public onSetInitState?: () => void;
public onUpdate?: () => void;
Expand Down
4 changes: 2 additions & 2 deletions packages/three-vrm-springbone/examples/collider.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
<script type="importmap">
{
"imports": {
"three": "https://unpkg.com/three@0.154.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.154.0/examples/jsm/",
"three": "https://unpkg.com/three@0.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"@pixiv/three-vrm-springbone": "../lib/three-vrm-springbone.module.js"
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/three-vrm-springbone/examples/loader-plugin.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
<script type="importmap">
{
"imports": {
"three": "https://unpkg.com/three@0.154.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.154.0/examples/jsm/",
"three": "https://unpkg.com/three@0.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"@pixiv/three-vrm-springbone": "../lib/three-vrm-springbone.module.js"
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/three-vrm-springbone/examples/multiple.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
<script type="importmap">
{
"imports": {
"three": "https://unpkg.com/three@0.154.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.154.0/examples/jsm/",
"three": "https://unpkg.com/three@0.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"@pixiv/three-vrm-springbone": "../lib/three-vrm-springbone.module.js"
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/three-vrm-springbone/examples/single.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
<script type="importmap">
{
"imports": {
"three": "https://unpkg.com/three@0.154.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.154.0/examples/jsm/",
"three": "https://unpkg.com/three@0.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"@pixiv/three-vrm-springbone": "../lib/three-vrm-springbone.module.js"
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/three-vrm-springbone/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@
"@pixiv/types-vrmc-springbone-1.0": "2.0.7"
},
"devDependencies": {
"three": "^0.154.0"
"three": "^0.160.0"
},
"peerDependencies": {
"three": "^0.154.0"
"three": "^0.160.0"
}
}
4 changes: 2 additions & 2 deletions packages/three-vrm/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ Code like this:
<script type="importmap">
{
"imports": {
"three": "https://unpkg.com/three@0.154.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.154.0/examples/jsm/",
"three": "https://unpkg.com/three@0.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"@pixiv/three-vrm": "three-vrm.module.js"
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/three-vrm/examples/animations.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
<script type="importmap">
{
"imports": {
"three": "https://unpkg.com/three@0.154.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.154.0/examples/jsm/",
"three": "https://unpkg.com/three@0.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"@pixiv/three-vrm": "../lib/three-vrm.module.js"
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/three-vrm/examples/basic.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
<script type="importmap">
{
"imports": {
"three": "https://unpkg.com/three@0.154.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.154.0/examples/jsm/",
"three": "https://unpkg.com/three@0.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"@pixiv/three-vrm": "../lib/three-vrm.module.js"
}
}
Expand Down
Loading

0 comments on commit d4352ed

Please sign in to comment.