Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Three.js to r162 #1379

Merged
merged 2 commits into from
Mar 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
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.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"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": "three-vrm.module.js"
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/three-vrm-animation/examples/dnd.html
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.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"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/[email protected]/lib/three-vrm.module.js",
"@pixiv/three-vrm-animation": "../lib/three-vrm-animation.module.js"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/three-vrm-animation/examples/loader-plugin.html
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.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"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/[email protected]/lib/three-vrm.module.js",
"@pixiv/three-vrm-animation": "../lib/three-vrm-animation.module.js"
}
Expand Down
8 changes: 4 additions & 4 deletions packages/three-vrm-animation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@
"@pixiv/types-vrmc-vrm-animation-1.0": "2.1.0"
},
"devDependencies": {
"@types/three": "^0.160.0",
"@types/three": "^0.162.0",
"lint-staged": "13.1.2",
"three": "^0.160.0"
"three": "^0.162.0"
},
"peerDependencies": {
"@types/three": "^0.160.0",
"three": "^0.160.0"
"@types/three": "^0.162.0",
"three": "^0.162.0"
}
}
4 changes: 2 additions & 2 deletions packages/three-vrm-core/examples/expressions.html
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.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"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-core": "../lib/three-vrm-core.module.js"
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/three-vrm-core/examples/firstPerson.html
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.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"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-core": "../lib/three-vrm-core.module.js"
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/three-vrm-core/examples/humanoid.html
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.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"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-core": "../lib/three-vrm-core.module.js"
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/three-vrm-core/examples/humanoidAnimation/index.html
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.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"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-core": "../../lib/three-vrm-core.module.js"
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/three-vrm-core/examples/lookAt.html
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.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"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-core": "../lib/three-vrm-core.module.js"
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/three-vrm-core/examples/meta.html
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.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"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-core": "../lib/three-vrm-core.module.js"
}
}
Expand Down
8 changes: 4 additions & 4 deletions packages/three-vrm-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@
"@pixiv/types-vrmc-vrm-1.0": "2.1.0"
},
"devDependencies": {
"@types/three": "^0.160.0",
"three": "^0.160.0"
"@types/three": "^0.162.0",
"three": "^0.162.0"
},
"peerDependencies": {
"@types/three": "^0.160.0",
"three": "^0.160.0"
"@types/three": "^0.162.0",
"three": "^0.162.0"
}
}
1 change: 1 addition & 0 deletions packages/three-vrm-core/src/VRMCoreLoaderPluginOptions.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import type * as THREE from 'three';
import { VRMExpressionLoaderPlugin } from './expressions/VRMExpressionLoaderPlugin';
import { VRMFirstPersonLoaderPlugin } from './firstPerson/VRMFirstPersonLoaderPlugin';
import { VRMHumanoidLoaderPlugin } from './humanoid/VRMHumanoidLoaderPlugin';
Expand Down
1 change: 1 addition & 0 deletions packages/three-vrm-core/src/VRMCoreParameters.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import type * as THREE from 'three';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can also be done as import { type Group } from 'three'; but requires more changes overall. I'm ok with current approach.

import type { VRMExpressionManager } from './expressions/VRMExpressionManager';
import type { VRMFirstPerson } from './firstPerson/VRMFirstPerson';
import type { VRMHumanoid } from './humanoid/VRMHumanoid';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import type * as THREE from 'three';
import type { VRMFirstPersonMeshAnnotationType } from './VRMFirstPersonMeshAnnotationType';

export interface VRMFirstPersonMeshAnnotation {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import type * as THREE from 'three';
import type * as V0VRM from '@pixiv/types-vrm-0.0';
import type * as V1VRMSchema from '@pixiv/types-vrmc-vrm-1.0';
import type { GLTF, GLTFLoaderPlugin, GLTFParser } from 'three/examples/jsm/loaders/GLTFLoader.js';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import type * as THREE from 'three';
export interface VRMHumanoidLoaderPluginOptions {
/**
* Specify an Object3D to add {@link VRMHumanoidHelper}.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import type * as THREE from 'three';
import type * as V0VRM from '@pixiv/types-vrm-0.0';
import type * as V1VRMSchema from '@pixiv/types-vrmc-vrm-1.0';
import type { GLTF, GLTFLoaderPlugin, GLTFParser } from 'three/examples/jsm/loaders/GLTFLoader.js';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import type * as THREE from 'three';

export interface VRMLookAtLoaderPluginOptions {
/**
* Specify an Object3D to add {@link VRMLookAtHelper} s.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import type * as THREE from 'three';
import type { GLTF } from 'three/examples/jsm/loaders/GLTFLoader.js';
import { GLTF as GLTFSchema } from '@gltf-transform/core';

Expand Down
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.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"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-materials-hdr-emissive-multiplier": "../lib/three-vrm-materials-hdr-emissive-multiplier.module.js"
}
}
Expand Down
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.1.0"
},
"devDependencies": {
"@types/three": "^0.160.0",
"three": "^0.160.0"
"@types/three": "^0.162.0",
"three": "^0.162.0"
},
"peerDependencies": {
"@types/three": "^0.160.0",
"three": "^0.160.0"
"@types/three": "^0.162.0",
"three": "^0.162.0"
}
}
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.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"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-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
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.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"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-materials-mtoon": "../lib/three-vrm-materials-mtoon.module.js"
}
}
Expand Down
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.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"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-materials-mtoon": "../lib/three-vrm-materials-mtoon.module.js"
}
}
Expand Down
8 changes: 4 additions & 4 deletions packages/three-vrm-materials-mtoon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@
"@pixiv/types-vrmc-materials-mtoon-1.0": "2.1.0"
},
"devDependencies": {
"@types/three": "^0.160.0",
"three": "^0.160.0"
"@types/three": "^0.162.0",
"three": "^0.162.0"
},
"peerDependencies": {
"@types/three": "^0.160.0",
"three": "^0.160.0"
"@types/three": "^0.162.0",
"three": "^0.162.0"
}
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import type * as THREE from 'three';
import type { MToonMaterialDebugMode } from './MToonMaterialDebugMode';
import type { MToonMaterialOutlineWidthMode } from './MToonMaterialOutlineWidthMode';

Expand Down
8 changes: 4 additions & 4 deletions packages/three-vrm-materials-v0compat/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@
"@pixiv/types-vrmc-materials-mtoon-1.0": "2.1.0"
},
"devDependencies": {
"@types/three": "^0.160.0",
"three": "^0.160.0"
"@types/three": "^0.162.0",
"three": "^0.162.0"
},
"peerDependencies": {
"@types/three": "^0.160.0",
"three": "^0.160.0"
"@types/three": "^0.162.0",
"three": "^0.162.0"
}
}
4 changes: 2 additions & 2 deletions packages/three-vrm-node-constraint/examples/aim.html
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.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"three": "https://unpkg.com/three@0.162.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.162.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
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.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"three": "https://unpkg.com/three@0.162.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.162.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
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.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"three": "https://unpkg.com/three@0.162.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.162.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
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.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"three": "https://unpkg.com/three@0.162.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.162.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
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.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"three": "https://unpkg.com/three@0.162.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.162.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
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@
"@pixiv/types-vrmc-node-constraint-1.0": "2.1.0"
},
"devDependencies": {
"@types/three": "^0.160.0",
"three": "^0.160.0"
"@types/three": "^0.162.0",
"three": "^0.162.0"
},
"peerDependencies": {
"@types/three": "^0.160.0",
"three": "^0.160.0"
"@types/three": "^0.162.0",
"three": "^0.162.0"
}
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import type * as THREE from 'three';

export interface VRMNodeConstraintLoaderPluginOptions {
/**
* Specify an Object3D to add {@link VRMNodeConstraintHelper} s.
Expand Down
4 changes: 2 additions & 2 deletions packages/three-vrm-springbone/examples/collider.html
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.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"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-springbone": "../lib/three-vrm-springbone.module.js"
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/three-vrm-springbone/examples/loader-plugin.html
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.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"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-springbone": "../lib/three-vrm-springbone.module.js"
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/three-vrm-springbone/examples/multiple.html
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.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"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-springbone": "../lib/three-vrm-springbone.module.js"
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/three-vrm-springbone/examples/single.html
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.160.0/build/three.module.js",
"three/addons/": "https://unpkg.com/three@0.160.0/examples/jsm/",
"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-springbone": "../lib/three-vrm-springbone.module.js"
}
}
Expand Down
Loading
Loading