Skip to content

Commit

Permalink
Merge branch 'dev' into animation-beta
Browse files Browse the repository at this point in the history
  • Loading branch information
@0b5vr
0b5vr committed Jan 17, 2024
2 parents 9d428fd + 8affe37 commit 867e703
Show file tree
Hide file tree
Showing 66 changed files with 424 additions and 289 deletions.
2 changes: 1 addition & 1 deletion LICENSE
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2019-2023 pixiv Inc.
Copyright (c) 2019-2024 pixiv Inc.

MIT License

Expand Down
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
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"downlevel-dts": "^0.11.0",
"eslint": "^7.12.1",
"eslint-config-mdcs": "^5.0.0",
"eslint-config-prettier": "^8.3.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-html": "^7.1.0",
"husky": "^8.0.2",
"jest": "^26.6.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/three-vrm-animation/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
]
},
"dependencies": {
"@pixiv/three-vrm-core": "2.0.3",
"@pixiv/types-vrmc-vrm-1.0": "2.0.3",
"@pixiv/three-vrm-core": "2.1.0-beta.1",
"@pixiv/types-vrmc-vrm-1.0": "2.0.8",
"@pixiv/types-vrmc-vrm-animation-1.0": "2.1.0-beta.1"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 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 Expand Up @@ -59,7 +59,7 @@
const scene = new THREE.Scene();

// light
const light = new THREE.DirectionalLight( 0xffffff );
const light = new THREE.DirectionalLight( 0xffffff, Math.PI );
light.position.set( 1.0, 1.0, 1.0 ).normalize();
scene.add( light );

Expand Down
6 changes: 3 additions & 3 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 Expand Up @@ -65,7 +65,7 @@
const scene = new THREE.Scene();

// light
const light = new THREE.DirectionalLight( 0xffffff );
const light = new THREE.DirectionalLight( 0xffffff, Math.PI );
light.position.set( 1.0, 1.0, 1.0 ).normalize();
scene.add( light );

Expand Down
6 changes: 3 additions & 3 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 Expand Up @@ -59,7 +59,7 @@
const scene = new THREE.Scene();

// light
const light = new THREE.DirectionalLight( 0xffffff );
const light = new THREE.DirectionalLight( 0xffffff, Math.PI );
light.position.set( 1.0, 1.0, 1.0 ).normalize();
scene.add( light );

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
2 changes: 1 addition & 1 deletion packages/three-vrm-core/examples/humanoidAnimation/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ controls.update();
const scene = new THREE.Scene();

// light
const light = new THREE.DirectionalLight( 0xffffff );
const light = new THREE.DirectionalLight( 0xffffff, Math.PI );
light.position.set( 1.0, 1.0, 1.0 ).normalize();
scene.add( light );

Expand Down
6 changes: 3 additions & 3 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 Expand Up @@ -65,7 +65,7 @@
const scene = new THREE.Scene();

// light
const light = new THREE.DirectionalLight( 0xffffff );
const light = new THREE.DirectionalLight( 0xffffff, Math.PI );
light.position.set( 1.0, 1.0, 1.0 ).normalize();
scene.add( light );

Expand Down
6 changes: 3 additions & 3 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 Expand Up @@ -72,7 +72,7 @@
const scene = new THREE.Scene();

// light
const light = new THREE.DirectionalLight( 0xffffff );
const light = new THREE.DirectionalLight( 0xffffff, Math.PI );
light.position.set( 1.0, 1.0, 1.0 ).normalize();
scene.add( light );

Expand Down
12 changes: 6 additions & 6 deletions packages/three-vrm-core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@
]
},
"dependencies": {
"@pixiv/types-vrm-0.0": "2.0.6",
"@pixiv/types-vrmc-vrm-1.0": "2.0.6"
"@pixiv/types-vrm-0.0": "2.0.8",
"@pixiv/types-vrmc-vrm-1.0": "2.0.8"
},
"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-core/rollup.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import typescript from '@rollup/plugin-typescript';

// == constants ====================================================================================
/** copyright text */
const copyright = '(c) 2020-2023 pixiv Inc.';
const copyright = '(c) 2020-2024 pixiv Inc.';

/** name of the license */
const licenseName = 'MIT License';
Expand Down
6 changes: 3 additions & 3 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 Expand Up @@ -59,7 +59,7 @@
const scene = new THREE.Scene();

// light
const light = new THREE.DirectionalLight( 0xffffff );
const light = new THREE.DirectionalLight( 0xffffff, Math.PI );
scene.add( light );

// gltf and vrm
Expand Down
10 changes: 5 additions & 5 deletions packages/three-vrm-materials-hdr-emissive-multiplier/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@
]
},
"dependencies": {
"@pixiv/types-vrmc-materials-hdr-emissive-multiplier-1.0": "2.0.6"
"@pixiv/types-vrmc-materials-hdr-emissive-multiplier-1.0": "2.0.8"
},
"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-materials-hdr-emissive-multiplier/rollup.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import typescript from '@rollup/plugin-typescript';

// == constants ====================================================================================
/** copyright text */
const copyright = '(c) 2020-2023 pixiv Inc.';
const copyright = '(c) 2020-2024 pixiv Inc.';

/** name of the license */
const licenseName = 'MIT License';
Expand Down
6 changes: 3 additions & 3 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 Expand Up @@ -62,7 +62,7 @@
const scene = new THREE.Scene();

// light
const light = new THREE.DirectionalLight( 0xffffff );
const light = new THREE.DirectionalLight( 0xffffff, Math.PI );
scene.add( light );

// gltf and vrm
Expand Down
6 changes: 3 additions & 3 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 Expand Up @@ -58,7 +58,7 @@
const scene = new THREE.Scene();

// light
const light = new THREE.DirectionalLight( 0xffffff );
const light = new THREE.DirectionalLight( 0xffffff, Math.PI );
scene.add( light );

// test objects
Expand Down
6 changes: 3 additions & 3 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 Expand Up @@ -59,7 +59,7 @@
const scene = new THREE.Scene();

// light
const light = new THREE.DirectionalLight( 0xffffff );
const light = new THREE.DirectionalLight( 0xffffff, Math.PI );
scene.add( light );

// gltf and vrm
Expand Down
12 changes: 6 additions & 6 deletions packages/three-vrm-materials-mtoon/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@
]
},
"dependencies": {
"@pixiv/types-vrm-0.0": "2.0.6",
"@pixiv/types-vrmc-materials-mtoon-1.0": "2.0.6"
"@pixiv/types-vrm-0.0": "2.0.8",
"@pixiv/types-vrmc-materials-mtoon-1.0": "2.0.8"
},
"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-materials-mtoon/rollup.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import typescript from '@rollup/plugin-typescript';

// == constants ====================================================================================
/** copyright text */
const copyright = '(c) 2020-2023 pixiv Inc.';
const copyright = '(c) 2020-2024 pixiv Inc.';

/** name of the license */
const licenseName = 'MIT License';
Expand Down
2 changes: 1 addition & 1 deletion packages/three-vrm-materials-mtoon/src/MToonMaterial.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ export class MToonMaterial extends THREE.ShaderMaterial {
uvAnimationScrollYOffset: { value: 0.0 },
uvAnimationRotationPhase: { value: 0.0 },
},
parameters.uniforms,
parameters.uniforms ?? {},
]);

// == finally compile the shader program =======================================================
Expand Down
Loading

0 comments on commit 867e703

Please sign in to comment.