diff --git a/packages/stage-ui-mmd/src/utils/mmd-materials.test.ts b/packages/stage-ui-mmd/src/utils/mmd-materials.test.ts index 9de40c01b..5cae92795 100644 --- a/packages/stage-ui-mmd/src/utils/mmd-materials.test.ts +++ b/packages/stage-ui-mmd/src/utils/mmd-materials.test.ts @@ -22,10 +22,11 @@ import { setMMDMaterialGlow, } from './mmd-materials' -function createDescriptor(name: string, opacity = 1, transparent = false): MMDMaterialDescriptor { +function createDescriptor(name: string, opacity = 1): MMDMaterialDescriptor { return { ambient: new Color(0.1, 0.2, 0.3), diffuse: new Color(0.4, 0.5, 0.6), + doubleSided: false, fog: true, isDefaultToonTexture: true, name, @@ -40,7 +41,6 @@ function createDescriptor(name: string, opacity = 1, transparent = false): MMDMa specular: new Color(0.2, 0.3, 0.4), toonMap: new Texture(), toonMapFileName: 'toon01.bmp', - transparent, } } @@ -53,7 +53,7 @@ function countDisposals(resource: BufferGeometry | MeshBasicMaterial | MeshDepth describe('mmd surface materials', () => { it('keeps generated outline materials out of the settings catalog and live controls', () => { const root = new Group() - const surface = new MMDToonMaterial(createDescriptor('skin', 0.8, true)) + const surface = new MMDToonMaterial(createDescriptor('skin', 0.8)) const outline = new MeshPhongMaterial({ opacity: 0.35, transparent: true }) outline.name = 'skin:outline' const mesh = new Mesh(new BufferGeometry(), surface) @@ -75,7 +75,7 @@ describe('mmd surface materials', () => { }) it('restores each surface material authored opacity and transparency', () => { - const surface = new MMDToonMaterial(createDescriptor('glass', 0.6, true)) + const surface = new MMDToonMaterial(createDescriptor('glass', 0.6)) const root = new Mesh(new BufferGeometry(), surface) applyMMDMaterialOpacity(root, { glass: 0.2 }) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fe863e5cf..b21409a10 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -253,11 +253,11 @@ catalogs: specifier: 0.1.0-beta.17 version: 0.1.0-beta.17 '@moeru/three-mmd': - specifier: 0.1.2 - version: 0.1.2 + specifier: 0.2.0-beta.2 + version: 0.2.0-beta.2 '@moeru/three-mmd-physics-ammo': - specifier: 0.1.2 - version: 0.1.2 + specifier: 0.2.0-beta.2 + version: 0.2.0-beta.2 '@napi-rs/image': specifier: ^1.14.0 version: 1.14.0 @@ -4960,10 +4960,10 @@ importers: version: 0.1.0-beta.17 '@moeru/three-mmd': specifier: 'catalog:' - version: 0.1.2(@types/three@0.185.4)(three@0.185.1) + version: 0.2.0-beta.2(@types/three@0.185.4)(three@0.185.1) '@moeru/three-mmd-physics-ammo': specifier: 'catalog:' - version: 0.1.2(@moeru/three-mmd@0.1.2(@types/three@0.185.4)(three@0.185.1))(@types/three@0.185.4)(three@0.185.1) + version: 0.2.0-beta.2(@moeru/three-mmd@0.2.0-beta.2(@types/three@0.185.4)(three@0.185.1))(@types/three@0.185.4)(three@0.185.1) '@proj-airi/model-driver-lipsync': specifier: workspace:^ version: link:../model-driver-lipsync @@ -8470,15 +8470,15 @@ packages: '@moeru/std@0.1.0-beta.20': resolution: {integrity: sha512-09Nunc5dLT0+oAaLV18nIGHLkQO3LOUGOpGcQ2VIFTqWybJojT9geawhTVtuclYcJtIApgIt+3BLWI1K9dYpFw==} - '@moeru/three-mmd-physics-ammo@0.1.2': - resolution: {integrity: sha512-XDtmMuoPmqIzJUdM4r7/PpsDQhYFxjuePuvZxIICkekX3L5sAJnHfIrVMVpDgUFtQtulji6d0HK6iHovE6rnWg==} + '@moeru/three-mmd-physics-ammo@0.2.0-beta.2': + resolution: {integrity: sha512-nou6wQX6NlEVkohbcOIebTpKePBPRnKhSydfL2MwTpdJjkzwgKixDOV/yTfW2wFKFkLxh2qaEwEaj2D1AkID7Q==} peerDependencies: - '@moeru/three-mmd': ^0.1.2 + '@moeru/three-mmd': ^0.2.0-beta.2 '@types/three': '>=0.184.0' three: '>=0.184.0' - '@moeru/three-mmd@0.1.2': - resolution: {integrity: sha512-VHqVrZQVbzIjJaUe1DEtu8oN8sA3k7JZTvHnZ5BAeGEw1ZFi8UmEorb/A99VPKMmWQdqk92DtYH0SwwQG4OSpA==} + '@moeru/three-mmd@0.2.0-beta.2': + resolution: {integrity: sha512-P8gzxEPpf/k8N/282xfYHvGyiGvYqT7kb9CtIh6Tz1LuJF/pA3EigHbNxsa6/ni5H8JcUOVVifMfBodsKFiQ7w==} peerDependencies: '@types/three': '>=0.184.0' three: '>=0.184.0' @@ -22919,14 +22919,14 @@ snapshots: '@moeru/std@0.1.0-beta.20': {} - '@moeru/three-mmd-physics-ammo@0.1.2(@moeru/three-mmd@0.1.2(@types/three@0.185.4)(three@0.185.1))(@types/three@0.185.4)(three@0.185.1)': + '@moeru/three-mmd-physics-ammo@0.2.0-beta.2(@moeru/three-mmd@0.2.0-beta.2(@types/three@0.185.4)(three@0.185.1))(@types/three@0.185.4)(three@0.185.1)': dependencies: - '@moeru/three-mmd': 0.1.2(@types/three@0.185.4)(three@0.185.1) + '@moeru/three-mmd': 0.2.0-beta.2(@types/three@0.185.4)(three@0.185.1) '@types/three': 0.185.4 ammojs-typed: 1.0.6 three: 0.185.1 - '@moeru/three-mmd@0.1.2(@types/three@0.185.4)(three@0.185.1)': + '@moeru/three-mmd@0.2.0-beta.2(@types/three@0.185.4)(three@0.185.1)': dependencies: '@types/three': 0.185.4 three: 0.185.1 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index e34d759bf..382e38579 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -125,8 +125,8 @@ catalog: '@moeru/eslint-config': 0.1.0-beta.19 '@moeru/eventa': 1.0.0 '@moeru/std': 0.1.0-beta.17 - '@moeru/three-mmd': 0.1.2 - '@moeru/three-mmd-physics-ammo': 0.1.2 + '@moeru/three-mmd': 0.2.0-beta.2 + '@moeru/three-mmd-physics-ammo': 0.2.0-beta.2 '@napi-rs/image': ^1.14.0 '@nekopaw/tempora': 0.4.0-alpha.1 '@opentelemetry/api': ^1.9.1