@zephyr3d/scene 0.9.25 → 0.9.26

package/dist/material/mixins/texture.js

@@ -1,5 +1,24 @@
 import { DRef } from '@zephyr3d/base';
 
+function getMaterialAutoSamplerKey(sampler) {
+    return [
+        'material',
+        sampler.addressModeU,
+        sampler.addressModeV,
+        sampler.addressModeW,
+        sampler.magFilter,
+        sampler.minFilter,
+        sampler.mipFilter,
+        sampler.lodMin,
+        sampler.lodMax,
+        sampler.compare ?? 'none',
+        sampler.maxAnisotropy
+    ].join('_');
+}
+function getTextureAutoSamplerKey(texture, sampler) {
+    const resolvedSampler = sampler ?? texture?.getDefaultSampler(false);
+    return resolvedSampler ? getMaterialAutoSamplerKey(resolvedSampler) : null;
+}
 /**
  * Texture property mixin
  * @param name - Texture name
@@ -8,7 +27,7 @@ import { DRef } from '@zephyr3d/base';
  * @public
  */ function mixinTextureProps(name) {
     return function(BaseCls, vertex = false) {
-        var _computedKey, _computedKey1, _computedKey2;
+        var _computedKey, _computedKey1, _computedKey2, _computedKey3;
         const capName = `${name[0].toUpperCase()}${name.slice(1)}`;
         const id = `mixinTexture${capName}`;
         let feature = 0;
@@ -17,7 +36,7 @@ import { DRef } from '@zephyr3d/base';
         if (BaseCls[id]) {
             return BaseCls;
         }
-        _computedKey = `sample${capName}Texture`, _computedKey1 = `get${capName}TextureUniform`, _computedKey2 = `get${capName}TexCoord`;
+        _computedKey = `sample${capName}Texture`, _computedKey1 = `has${capName}Texture`, _computedKey2 = `get${capName}TextureUniform`, _computedKey3 = `get${capName}TexCoord`;
         const cls = class extends BaseCls {
             constructor(){
                 super();
@@ -31,12 +50,18 @@ import { DRef } from '@zephyr3d/base';
                     },
                     set: function(newValue) {
                         if (texture.get() !== newValue) {
+                            const oldAutoSamplerKey = getTextureAutoSamplerKey(texture.get(), sampler);
                             texture.set(newValue);
                             this.useFeature(feature, !!newValue);
                             if (newValue) {
                                 this.useFeature(featureTexIndex, texCoord);
                                 this.useFeature(featureTexMatrix, !!matrix);
-                                this.uniformChanged();
+                                const newAutoSamplerKey = getTextureAutoSamplerKey(newValue, sampler);
+                                if (oldAutoSamplerKey !== newAutoSamplerKey) {
+                                    this.optionChanged(true);
+                                } else {
+                                    this.uniformChanged();
+                                }
                             }
                         }
                     },
@@ -49,8 +74,14 @@ import { DRef } from '@zephyr3d/base';
                     },
                     set: function(newValue) {
                         if (sampler !== newValue) {
+                            const oldAutoSamplerKey = getTextureAutoSamplerKey(texture.get(), sampler);
                             sampler = newValue;
-                            this.uniformChanged();
+                            const newAutoSamplerKey = getTextureAutoSamplerKey(texture.get(), sampler);
+                            if (oldAutoSamplerKey !== newAutoSamplerKey) {
+                                this.optionChanged(true);
+                            } else {
+                                this.uniformChanged();
+                            }
                         }
                     },
                     enumerable: true,
@@ -90,10 +121,14 @@ import { DRef } from '@zephyr3d/base';
                 const coord = texCoord ?? this[`get${capName}TexCoord`](scope);
                 return scope.$builder.textureSample(tex, coord);
             }
-            [_computedKey1](scope) {
-                return scope.$builder.shaderKind === 'fragment' ? scope[`z${capName}Tex`] : null;
+            [_computedKey1]() {
+                const textureEnabled = typeof this.isMaterialTextureEnabled === 'function' ? this.isMaterialTextureEnabled(name) !== false : true;
+                return this.featureUsed(feature) && !!this[`${name}Texture`] && textureEnabled;
             }
             [_computedKey2](scope) {
+                return scope.$builder.shaderKind === 'fragment' ? scope[`z${capName}Tex`] : null;
+            }
+            [_computedKey3](scope) {
                 const texCoord = this[`${name}TexCoordIndex`];
                 if (texCoord < 0) {
                     return null;
@@ -117,7 +152,7 @@ import { DRef } from '@zephyr3d/base';
                 if (vertex || this.needFragmentColorInput()) {
                     const pb = scope.$builder;
                     const that = this;
-                    if (this.featureUsed(feature)) {
+                    if (that[`has${capName}Texture`]()) {
                         const texCoordIndex = that[`${name}TexCoordIndex`];
                         if (texCoordIndex >= 0) {
                             const semantic = `texCoord${that[`${name}TexCoordIndex`]}`;
@@ -140,16 +175,18 @@ import { DRef } from '@zephyr3d/base';
                 super.fragmentShader(scope);
                 if (this.needFragmentColorInput()) {
                     const pb = scope.$builder;
-                    if (this.featureUsed(feature)) {
-                        scope[`z${capName}Tex`] = pb.tex2D().uniform(2);
+                    const that = this;
+                    if (that[`has${capName}Texture`]()) {
+                        const exp = pb.tex2D().uniform(2);
+                        scope[`z${capName}Tex`] = exp;
                     }
                 }
             }
             applyUniformValues(bindGroup, ctx, pass) {
                 super.applyUniformValues(bindGroup, ctx, pass);
                 if (this.needFragmentColorInput(ctx)) {
-                    if (this.featureUsed(feature)) {
-                        const that = this;
+                    const that = this;
+                    if (that[`has${capName}Texture`]()) {
                         bindGroup.setTexture(`z${capName}Tex`, that[`${name}Texture`], that[`${name}TextureSampler`]);
                         if (this.featureUsed(featureTexMatrix)) {
                             bindGroup.setValue(`z${capName}TextureMatrix`, that[`${name}TexCoordMatrix`]);

package/dist/material/mixins/texture.js.map

@@ -1 +1 @@
-{"version":3,"file":"texture.js","sources":["../../../src/material/mixins/texture.ts"],"sourcesContent":["import type {\r\n  BindGroup,\r\n  PBFunctionScope,\r\n  PBInsideFunctionScope,\r\n  PBShaderExp,\r\n  Texture2D,\r\n  TextureSampler\r\n} from '@zephyr3d/device';\r\nimport type { MeshMaterial, applyMaterialMixins } from '../meshmaterial';\r\nimport type { Matrix4x4, Nullable } from '@zephyr3d/base';\r\nimport { DRef } from '@zephyr3d/base';\r\nimport type { DrawContext } from '../../render';\r\n\r\n/**\r\n * ToMixedTextureType\r\n *\r\n * @public\r\n */\r\nexport type ToMixedTextureType<T> = T extends [infer First, ...infer Rest]\r\n  ? [First extends string ? ReturnType<typeof mixinTextureProps<First>> : never, ...ToMixedTextureType<Rest>]\r\n  : [];\r\n\r\n/**\r\n * TextureMixinTypes\r\n *\r\n * @public\r\n */\r\nexport type TextureMixinTypes<T> = ReturnType<\r\n  typeof applyMaterialMixins<ToMixedTextureType<T>, typeof MeshMaterial>\r\n>;\r\n\r\n/**\r\n * TextureMixinInstanceTypes\r\n *\r\n * @public\r\n */\r\nexport type TextureMixinInstanceTypes<T> =\r\n  TextureMixinTypes<T> extends { new (...args: any[]): infer U } ? U : never;\r\n\r\n/**\r\n * TextureProp\r\n *\r\n * @public\r\n */\r\nexport type TextureProp<U extends string> = {\r\n  [P in 'Texture' | 'TextureSampler' | 'TexCoordIndex' | 'TexCoordMatrix' as `${U}${P}`]: P extends 'Texture'\r\n    ? Nullable<Texture2D>\r\n    : P extends 'TextureSampler'\r\n      ? Nullable<TextureSampler>\r\n      : P extends 'TexCoordIndex'\r\n        ? number\r\n        : P extends 'TexCoordMatrix'\r\n          ? Nullable<Matrix4x4>\r\n          : never;\r\n};\r\n\r\n/**\r\n * TexturePropUniforms\r\n *\r\n * @public\r\n */\r\nexport type TexturePropUniforms<U extends string> = {\r\n  [P in 'TextureUniform' | 'TexCoord' as `get${Capitalize<U>}${P}`]: (\r\n    scope: PBInsideFunctionScope\r\n  ) => PBShaderExp;\r\n} & {\r\n  [P in 'Texture' as `sample${Capitalize<U>}${P}`]: (\r\n    scope: PBInsideFunctionScope,\r\n    texCoord?: PBShaderExp\r\n  ) => PBShaderExp;\r\n};\r\n\r\n/**\r\n * Texture property mixin\r\n * @param name - Texture name\r\n * @returns Texture mixin\r\n *\r\n * @public\r\n */\r\nexport function mixinTextureProps<U extends string>(name: U) {\r\n  return function <T extends typeof MeshMaterial>(BaseCls: T, vertex = false) {\r\n    const capName = `${name[0].toUpperCase()}${name.slice(1)}`;\r\n    const id = `mixinTexture${capName}`;\r\n    let feature = 0;\r\n    let featureTexIndex = 0;\r\n    let featureTexMatrix = 0;\r\n    if ((BaseCls as any)[id]) {\r\n      return BaseCls as unknown as T & {\r\n        new (...args: any[]): TextureProp<U> & TexturePropUniforms<U>;\r\n      };\r\n    }\r\n    const cls = class extends (BaseCls as typeof MeshMaterial) {\r\n      constructor() {\r\n        super();\r\n        const texture = new DRef<Texture2D>();\r\n        let sampler: Nullable<TextureSampler> = null;\r\n        let texCoord = 0;\r\n        let matrix: Nullable<Matrix4x4> = null;\r\n        Object.defineProperty(this, `${name}Texture`, {\r\n          get: function () {\r\n            return texture.get();\r\n          },\r\n          set: function (newValue: Texture2D) {\r\n            if (texture.get() !== newValue) {\r\n              texture.set(newValue);\r\n              this.useFeature(feature, !!newValue);\r\n              if (newValue) {\r\n                this.useFeature(featureTexIndex, texCoord);\r\n                this.useFeature(featureTexMatrix, !!matrix);\r\n                this.uniformChanged();\r\n              }\r\n            }\r\n          },\r\n          enumerable: true,\r\n          configurable: true\r\n        });\r\n        Object.defineProperty(this, `${name}TextureSampler`, {\r\n          get: function () {\r\n            return sampler;\r\n          },\r\n          set: function (newValue: TextureSampler) {\r\n            if (sampler !== newValue) {\r\n              sampler = newValue;\r\n              this.uniformChanged();\r\n            }\r\n          },\r\n          enumerable: true,\r\n          configurable: true\r\n        });\r\n        Object.defineProperty(this, `${name}TexCoordMatrix`, {\r\n          get: function () {\r\n            return matrix;\r\n          },\r\n          set: function (newValue: Matrix4x4) {\r\n            matrix = newValue;\r\n            this.useFeature(featureTexMatrix, !!matrix);\r\n            this.uniformChanged();\r\n          },\r\n          enumerable: true,\r\n          configurable: true\r\n        });\r\n        Object.defineProperty(this, `${name}TexCoordIndex`, {\r\n          get: function () {\r\n            return texCoord;\r\n          },\r\n          set: function (newValue: number) {\r\n            if (texCoord !== newValue) {\r\n              texCoord = newValue;\r\n              this.useFeature(featureTexIndex, texCoord);\r\n              this.uniformChanged();\r\n            }\r\n          },\r\n          enumerable: true,\r\n          configurable: true\r\n        });\r\n      }\r\n      [`sample${capName}Texture`](scope: PBInsideFunctionScope, texCoord?: PBShaderExp) {\r\n        // @ts-ignore\r\n        const tex = this[`get${capName}TextureUniform`](scope);\r\n        // @ts-ignore\r\n        const coord = texCoord ?? this[`get${capName}TexCoord`](scope);\r\n        return scope.$builder.textureSample(tex, coord);\r\n      }\r\n      [`get${capName}TextureUniform`](scope: PBInsideFunctionScope) {\r\n        return scope.$builder.shaderKind === 'fragment' ? scope[`z${capName}Tex`] : null;\r\n      }\r\n      [`get${capName}TexCoord`](scope: PBInsideFunctionScope) {\r\n        const texCoord = (this as any)[`${name}TexCoordIndex`];\r\n        if (texCoord < 0) {\r\n          return null;\r\n        }\r\n        const pb = scope.$builder;\r\n        if ((pb.shaderKind === 'vertex') !== !!vertex) {\r\n          throw new Error(\r\n            `mixinTextureProps.get${capName}TexCoord(): must be called in ${\r\n              vertex ? 'vertex' : 'fragment'\r\n            } stage`\r\n          );\r\n        }\r\n        return scope.$builder.shaderKind === 'fragment'\r\n          ? scope.$inputs[`z${capName}TexCoord`]\r\n          : this.featureUsed(featureTexMatrix)\r\n            ? pb.mul(scope[`z${capName}TextureMatrix`], pb.vec4(scope.$inputs[`texCoord${texCoord}`], 0, 1))\r\n                .xy\r\n            : scope.$inputs[`texCoord${texCoord}`];\r\n      }\r\n      copyFrom(other: any) {\r\n        super.copyFrom(other);\r\n        const that = this as any;\r\n        that[`${name}Texture`] = other[`${name}Texture`];\r\n        that[`${name}TextureSampler`] = other[`${name}TextureSampler`];\r\n        that[`${name}TexCoordMatrix`] = other[`${name}TexCoordMatrix`];\r\n        that[`${name}TexCoordIndex`] = other[`${name}TexCoordIndex`];\r\n      }\r\n      vertexShader(scope: PBFunctionScope) {\r\n        super.vertexShader(scope);\r\n        if (vertex || this.needFragmentColorInput()) {\r\n          const pb = scope.$builder;\r\n          const that = this as any;\r\n          if (this.featureUsed(feature)) {\r\n            const texCoordIndex: number = that[`${name}TexCoordIndex`];\r\n            if (texCoordIndex >= 0) {\r\n              const semantic = `texCoord${that[`${name}TexCoordIndex`]}` as any;\r\n              if (!scope.$getVertexAttrib(semantic)) {\r\n                scope.$inputs[semantic] = pb.vec2().attrib(semantic);\r\n              }\r\n              if (this.featureUsed(featureTexMatrix)) {\r\n                scope[`z${capName}TextureMatrix`] = pb.mat4().uniform(2);\r\n                if (!vertex) {\r\n                  scope.$outputs[`z${capName}TexCoord`] = pb.mul(\r\n                    scope[`z${capName}TextureMatrix`],\r\n                    pb.vec4(scope.$inputs[semantic], 0, 1)\r\n                  ).xy;\r\n                }\r\n              } else if (!vertex) {\r\n                scope.$outputs[`z${capName}TexCoord`] = scope.$inputs[semantic];\r\n              }\r\n            }\r\n          }\r\n        }\r\n      }\r\n      fragmentShader(scope: PBFunctionScope) {\r\n        super.fragmentShader(scope);\r\n        if (this.needFragmentColorInput()) {\r\n          const pb = scope.$builder;\r\n          if (this.featureUsed(feature)) {\r\n            scope[`z${capName}Tex`] = pb.tex2D().uniform(2);\r\n          }\r\n        }\r\n      }\r\n      applyUniformValues(bindGroup: BindGroup, ctx: DrawContext, pass: number) {\r\n        super.applyUniformValues(bindGroup, ctx, pass);\r\n        if (this.needFragmentColorInput(ctx)) {\r\n          if (this.featureUsed(feature)) {\r\n            const that = this as any;\r\n            bindGroup.setTexture(`z${capName}Tex`, that[`${name}Texture`], that[`${name}TextureSampler`]);\r\n            if (this.featureUsed(featureTexMatrix)) {\r\n              bindGroup.setValue(`z${capName}TextureMatrix`, that[`${name}TexCoordMatrix`]);\r\n            }\r\n          }\r\n        }\r\n      }\r\n      protected onDispose() {\r\n        super.onDispose();\r\n        (this as any)[`${name}Texture`] = null;\r\n      }\r\n    };\r\n    feature = cls.defineFeature();\r\n    featureTexIndex = cls.defineFeature();\r\n    featureTexMatrix = cls.defineFeature();\r\n    // @ts-ignore\r\n    cls[id] = true;\r\n    return cls as unknown as T & {\r\n      new (...args: any[]): TextureProp<U> & TexturePropUniforms<U>;\r\n    };\r\n  };\r\n}\r\n"],"names":["mixinTextureProps","name","BaseCls","vertex","capName","toUpperCase","slice","id","feature","featureTexIndex","featureTexMatrix","cls","texture","DRef","sampler","texCoord","matrix","Object","defineProperty","get","set","newValue","useFeature","uniformChanged","enumerable","configurable","scope","tex","coord","$builder","textureSample","shaderKind","pb","Error","$inputs","featureUsed","mul","vec4","xy","copyFrom","other","that","vertexShader","needFragmentColorInput","texCoordIndex","semantic","$getVertexAttrib","vec2","attrib","mat4","uniform","$outputs","fragmentShader","tex2D","applyUniformValues","bindGroup","ctx","pass","setTexture","setValue","onDispose","defineFeature"],"mappings":"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"}
+{"version":3,"file":"texture.js","sources":["../../../src/material/mixins/texture.ts"],"sourcesContent":["import type {\r\n  BindGroup,\r\n  BaseTexture,\r\n  PBFunctionScope,\r\n  PBInsideFunctionScope,\r\n  PBShaderExp,\r\n  Texture2D,\r\n  TextureSampler\r\n} from '@zephyr3d/device';\r\nimport type { MeshMaterial, applyMaterialMixins } from '../meshmaterial';\r\nimport type { Matrix4x4, Nullable } from '@zephyr3d/base';\r\nimport { DRef } from '@zephyr3d/base';\r\nimport type { DrawContext } from '../../render';\r\n\r\nfunction getMaterialAutoSamplerKey(\r\n  sampler: Pick<\r\n    TextureSampler,\r\n    | 'addressModeU'\r\n    | 'addressModeV'\r\n    | 'addressModeW'\r\n    | 'magFilter'\r\n    | 'minFilter'\r\n    | 'mipFilter'\r\n    | 'lodMin'\r\n    | 'lodMax'\r\n    | 'compare'\r\n    | 'maxAnisotropy'\r\n  >\r\n) {\r\n  return [\r\n    'material',\r\n    sampler.addressModeU,\r\n    sampler.addressModeV,\r\n    sampler.addressModeW,\r\n    sampler.magFilter,\r\n    sampler.minFilter,\r\n    sampler.mipFilter,\r\n    sampler.lodMin,\r\n    sampler.lodMax,\r\n    sampler.compare ?? 'none',\r\n    sampler.maxAnisotropy\r\n  ].join('_');\r\n}\r\n\r\nfunction getTextureAutoSamplerKey(texture: BaseTexture | null, sampler: TextureSampler | null) {\r\n  const resolvedSampler = sampler ?? texture?.getDefaultSampler(false);\r\n  return resolvedSampler ? getMaterialAutoSamplerKey(resolvedSampler) : null;\r\n}\r\n\r\n/**\r\n * ToMixedTextureType\r\n *\r\n * @public\r\n */\r\nexport type ToMixedTextureType<T> = T extends [infer First, ...infer Rest]\r\n  ? [First extends string ? ReturnType<typeof mixinTextureProps<First>> : never, ...ToMixedTextureType<Rest>]\r\n  : [];\r\n\r\n/**\r\n * TextureMixinTypes\r\n *\r\n * @public\r\n */\r\nexport type TextureMixinTypes<T> = ReturnType<\r\n  typeof applyMaterialMixins<ToMixedTextureType<T>, typeof MeshMaterial>\r\n>;\r\n\r\n/**\r\n * TextureMixinInstanceTypes\r\n *\r\n * @public\r\n */\r\nexport type TextureMixinInstanceTypes<T> =\r\n  TextureMixinTypes<T> extends { new (...args: any[]): infer U } ? U : never;\r\n\r\n/**\r\n * TextureProp\r\n *\r\n * @public\r\n */\r\nexport type TextureProp<U extends string> = {\r\n  [P in 'Texture' | 'TextureSampler' | 'TexCoordIndex' | 'TexCoordMatrix' as `${U}${P}`]: P extends 'Texture'\r\n    ? Nullable<Texture2D>\r\n    : P extends 'TextureSampler'\r\n      ? Nullable<TextureSampler>\r\n      : P extends 'TexCoordIndex'\r\n        ? number\r\n        : P extends 'TexCoordMatrix'\r\n          ? Nullable<Matrix4x4>\r\n          : never;\r\n};\r\n\r\n/**\r\n * TexturePropUniforms\r\n *\r\n * @public\r\n */\r\nexport type TexturePropUniforms<U extends string> = {\r\n  [P in 'Texture' as `has${Capitalize<U>}${P}`]: () => boolean;\r\n} & {\r\n  [P in 'TextureUniform' | 'TexCoord' as `get${Capitalize<U>}${P}`]: (\r\n    scope: PBInsideFunctionScope\r\n  ) => PBShaderExp;\r\n} & {\r\n  [P in 'Texture' as `sample${Capitalize<U>}${P}`]: (\r\n    scope: PBInsideFunctionScope,\r\n    texCoord?: PBShaderExp\r\n  ) => PBShaderExp;\r\n};\r\n\r\n/**\r\n * Texture property mixin\r\n * @param name - Texture name\r\n * @returns Texture mixin\r\n *\r\n * @public\r\n */\r\nexport function mixinTextureProps<U extends string>(name: U) {\r\n  return function <T extends typeof MeshMaterial>(BaseCls: T, vertex = false) {\r\n    const capName = `${name[0].toUpperCase()}${name.slice(1)}`;\r\n    const id = `mixinTexture${capName}`;\r\n    let feature = 0;\r\n    let featureTexIndex = 0;\r\n    let featureTexMatrix = 0;\r\n    if ((BaseCls as any)[id]) {\r\n      return BaseCls as unknown as T & {\r\n        new (...args: any[]): TextureProp<U> & TexturePropUniforms<U>;\r\n      };\r\n    }\r\n    const cls = class extends (BaseCls as typeof MeshMaterial) {\r\n      constructor() {\r\n        super();\r\n        const texture = new DRef<Texture2D>();\r\n        let sampler: Nullable<TextureSampler> = null;\r\n        let texCoord = 0;\r\n        let matrix: Nullable<Matrix4x4> = null;\r\n        Object.defineProperty(this, `${name}Texture`, {\r\n          get: function () {\r\n            return texture.get();\r\n          },\r\n          set: function (newValue: Texture2D) {\r\n            if (texture.get() !== newValue) {\r\n              const oldAutoSamplerKey = getTextureAutoSamplerKey(texture.get(), sampler);\r\n              texture.set(newValue);\r\n              this.useFeature(feature, !!newValue);\r\n              if (newValue) {\r\n                this.useFeature(featureTexIndex, texCoord);\r\n                this.useFeature(featureTexMatrix, !!matrix);\r\n                const newAutoSamplerKey = getTextureAutoSamplerKey(newValue, sampler);\r\n                if (oldAutoSamplerKey !== newAutoSamplerKey) {\r\n                  this.optionChanged(true);\r\n                } else {\r\n                  this.uniformChanged();\r\n                }\r\n              }\r\n            }\r\n          },\r\n          enumerable: true,\r\n          configurable: true\r\n        });\r\n        Object.defineProperty(this, `${name}TextureSampler`, {\r\n          get: function () {\r\n            return sampler;\r\n          },\r\n          set: function (newValue: TextureSampler) {\r\n            if (sampler !== newValue) {\r\n              const oldAutoSamplerKey = getTextureAutoSamplerKey(texture.get(), sampler);\r\n              sampler = newValue;\r\n              const newAutoSamplerKey = getTextureAutoSamplerKey(texture.get(), sampler);\r\n              if (oldAutoSamplerKey !== newAutoSamplerKey) {\r\n                this.optionChanged(true);\r\n              } else {\r\n                this.uniformChanged();\r\n              }\r\n            }\r\n          },\r\n          enumerable: true,\r\n          configurable: true\r\n        });\r\n        Object.defineProperty(this, `${name}TexCoordMatrix`, {\r\n          get: function () {\r\n            return matrix;\r\n          },\r\n          set: function (newValue: Matrix4x4) {\r\n            matrix = newValue;\r\n            this.useFeature(featureTexMatrix, !!matrix);\r\n            this.uniformChanged();\r\n          },\r\n          enumerable: true,\r\n          configurable: true\r\n        });\r\n        Object.defineProperty(this, `${name}TexCoordIndex`, {\r\n          get: function () {\r\n            return texCoord;\r\n          },\r\n          set: function (newValue: number) {\r\n            if (texCoord !== newValue) {\r\n              texCoord = newValue;\r\n              this.useFeature(featureTexIndex, texCoord);\r\n              this.uniformChanged();\r\n            }\r\n          },\r\n          enumerable: true,\r\n          configurable: true\r\n        });\r\n      }\r\n      [`sample${capName}Texture`](scope: PBInsideFunctionScope, texCoord?: PBShaderExp) {\r\n        // @ts-ignore\r\n        const tex = this[`get${capName}TextureUniform`](scope);\r\n        // @ts-ignore\r\n        const coord = texCoord ?? this[`get${capName}TexCoord`](scope);\r\n        return scope.$builder.textureSample(tex, coord);\r\n      }\r\n      [`has${capName}Texture`]() {\r\n        const textureEnabled =\r\n          typeof (this as any).isMaterialTextureEnabled === 'function'\r\n            ? (this as any).isMaterialTextureEnabled(name) !== false\r\n            : true;\r\n        return this.featureUsed(feature) && !!(this as any)[`${name}Texture`] && textureEnabled;\r\n      }\r\n      [`get${capName}TextureUniform`](scope: PBInsideFunctionScope) {\r\n        return scope.$builder.shaderKind === 'fragment' ? scope[`z${capName}Tex`] : null;\r\n      }\r\n      [`get${capName}TexCoord`](scope: PBInsideFunctionScope) {\r\n        const texCoord = (this as any)[`${name}TexCoordIndex`];\r\n        if (texCoord < 0) {\r\n          return null;\r\n        }\r\n        const pb = scope.$builder;\r\n        if ((pb.shaderKind === 'vertex') !== !!vertex) {\r\n          throw new Error(\r\n            `mixinTextureProps.get${capName}TexCoord(): must be called in ${\r\n              vertex ? 'vertex' : 'fragment'\r\n            } stage`\r\n          );\r\n        }\r\n        return scope.$builder.shaderKind === 'fragment'\r\n          ? scope.$inputs[`z${capName}TexCoord`]\r\n          : this.featureUsed(featureTexMatrix)\r\n            ? pb.mul(scope[`z${capName}TextureMatrix`], pb.vec4(scope.$inputs[`texCoord${texCoord}`], 0, 1))\r\n                .xy\r\n            : scope.$inputs[`texCoord${texCoord}`];\r\n      }\r\n      copyFrom(other: any) {\r\n        super.copyFrom(other);\r\n        const that = this as any;\r\n        that[`${name}Texture`] = other[`${name}Texture`];\r\n        that[`${name}TextureSampler`] = other[`${name}TextureSampler`];\r\n        that[`${name}TexCoordMatrix`] = other[`${name}TexCoordMatrix`];\r\n        that[`${name}TexCoordIndex`] = other[`${name}TexCoordIndex`];\r\n      }\r\n      vertexShader(scope: PBFunctionScope) {\r\n        super.vertexShader(scope);\r\n        if (vertex || this.needFragmentColorInput()) {\r\n          const pb = scope.$builder;\r\n          const that = this as any;\r\n          if (that[`has${capName}Texture`]()) {\r\n            const texCoordIndex: number = that[`${name}TexCoordIndex`];\r\n            if (texCoordIndex >= 0) {\r\n              const semantic = `texCoord${that[`${name}TexCoordIndex`]}` as any;\r\n              if (!scope.$getVertexAttrib(semantic)) {\r\n                scope.$inputs[semantic] = pb.vec2().attrib(semantic);\r\n              }\r\n              if (this.featureUsed(featureTexMatrix)) {\r\n                scope[`z${capName}TextureMatrix`] = pb.mat4().uniform(2);\r\n                if (!vertex) {\r\n                  scope.$outputs[`z${capName}TexCoord`] = pb.mul(\r\n                    scope[`z${capName}TextureMatrix`],\r\n                    pb.vec4(scope.$inputs[semantic], 0, 1)\r\n                  ).xy;\r\n                }\r\n              } else if (!vertex) {\r\n                scope.$outputs[`z${capName}TexCoord`] = scope.$inputs[semantic];\r\n              }\r\n            }\r\n          }\r\n        }\r\n      }\r\n      fragmentShader(scope: PBFunctionScope) {\r\n        super.fragmentShader(scope);\r\n        if (this.needFragmentColorInput()) {\r\n          const pb = scope.$builder;\r\n          const that = this as any;\r\n          if (that[`has${capName}Texture`]()) {\r\n            const exp = pb.tex2D().uniform(2);\r\n            scope[`z${capName}Tex`] = exp;\r\n          }\r\n        }\r\n      }\r\n      applyUniformValues(bindGroup: BindGroup, ctx: DrawContext, pass: number) {\r\n        super.applyUniformValues(bindGroup, ctx, pass);\r\n        if (this.needFragmentColorInput(ctx)) {\r\n          const that = this as any;\r\n          if (that[`has${capName}Texture`]()) {\r\n            bindGroup.setTexture(`z${capName}Tex`, that[`${name}Texture`], that[`${name}TextureSampler`]);\r\n            if (this.featureUsed(featureTexMatrix)) {\r\n              bindGroup.setValue(`z${capName}TextureMatrix`, that[`${name}TexCoordMatrix`]);\r\n            }\r\n          }\r\n        }\r\n      }\r\n      protected onDispose() {\r\n        super.onDispose();\r\n        (this as any)[`${name}Texture`] = null;\r\n      }\r\n    };\r\n    feature = cls.defineFeature();\r\n    featureTexIndex = cls.defineFeature();\r\n    featureTexMatrix = cls.defineFeature();\r\n    // @ts-ignore\r\n    cls[id] = true;\r\n    return cls as unknown as T & {\r\n      new (...args: any[]): TextureProp<U> & TexturePropUniforms<U>;\r\n    };\r\n  };\r\n}\r\n"],"names":["getMaterialAutoSamplerKey","sampler","addressModeU","addressModeV","addressModeW","magFilter","minFilter","mipFilter","lodMin","lodMax","compare","maxAnisotropy","join","getTextureAutoSamplerKey","texture","resolvedSampler","getDefaultSampler","mixinTextureProps","name","BaseCls","vertex","capName","toUpperCase","slice","id","feature","featureTexIndex","featureTexMatrix","cls","DRef","texCoord","matrix","Object","defineProperty","get","set","newValue","oldAutoSamplerKey","useFeature","newAutoSamplerKey","optionChanged","uniformChanged","enumerable","configurable","scope","tex","coord","$builder","textureSample","textureEnabled","isMaterialTextureEnabled","featureUsed","shaderKind","pb","Error","$inputs","mul","vec4","xy","copyFrom","other","that","vertexShader","needFragmentColorInput","texCoordIndex","semantic","$getVertexAttrib","vec2","attrib","mat4","uniform","$outputs","fragmentShader","exp","tex2D","applyUniformValues","bindGroup","ctx","pass","setTexture","setValue","onDispose","defineFeature"],"mappings":"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"}

package/dist/material/mtoon.js

@@ -410,7 +410,7 @@ const ToonMaterialBase = applyMaterialMixins(MeshMaterial, mixinAlbedoColor, mix
         scope.normalTex = pb.mul(scope.normalTex, pb.vec3(pb.vec3(this.getUniformNormalScale(scope)).xx, 1));
         return pb.normalize(pb.mul(scope.TBN, scope.normalTex));
     }
-    calculateMToonDirectLighting(scope, worldPos, normal, baseColor, shadeColor, shadingShift) {
+    calculateMToonDirectLighting(scope, worldPos, normal, baseColor, shadeColor, shadingShift, geometricNormal) {
         const pb = scope.$builder;
         const that = this;
         const funcName = 'Z_mtoonDirectLighting';
@@ -419,7 +419,8 @@ const ToonMaterialBase = applyMaterialMixins(MeshMaterial, mixinAlbedoColor, mix
             pb.vec3('normal'),
             pb.vec3('baseColor'),
             pb.vec3('shadeColor'),
-            pb.float('shadingShift')
+            pb.float('shadingShift'),
+            pb.vec3('geometricNormal')
         ], function() {
             this.$l.directColor = pb.vec3(0);
             that.forEachLight(this, function(type, posRange, dirCutoff, colorIntensity, extra, shadow) {
@@ -431,14 +432,14 @@ const ToonMaterialBase = applyMaterialMixins(MeshMaterial, mixinAlbedoColor, mix
                 this.$l.shading = pb.clamp(pb.div(pb.sub(this.shiftedShading, pb.add(-1, this.shadingToonyFactor)), pb.max(pb.sub(2, pb.mul(this.shadingToonyFactor, 2)), 0.00001)), 0, 1);
                 this.$l.lightDiffuse = pb.mix(this.shadeColor, this.baseColor, this.shading);
                 if (shadow) {
-                    this.$l.shadowValue = that.calculateShadow(this, this.worldPos, pb.clamp(this.NoL, 0, 1));
+                    this.$l.shadowValue = that.calculateShadow(this, this.worldPos, this.geometricNormal, pb.clamp(this.NoL, 0, 1));
                     this.lightDiffuse = pb.mix(this.shadeColor, this.lightDiffuse, this.shadowValue);
                 }
                 this.directColor = pb.add(this.directColor, pb.mul(this.lightDiffuse, this.lightColor));
             });
             this.$return(this.directColor);
         });
-        return pb.getGlobalScope()[funcName](worldPos, normal, baseColor, shadeColor, shadingShift);
+        return pb.getGlobalScope()[funcName](worldPos, normal, baseColor, shadeColor, shadingShift, geometricNormal);
     }
     calculateMToonGI(scope, normal, baseColor) {
         const pb = scope.$builder;
@@ -574,7 +575,7 @@ const ToonMaterialBase = applyMaterialMixins(MeshMaterial, mixinAlbedoColor, mix
                     }
                     scope.$l.shadeColor = this.sampleShadeColor(scope);
                     scope.$l.viewVec = this.calculateViewVector(scope, scope.$inputs.worldPos);
-                    scope.$l.directLighting = this.calculateMToonDirectLighting(scope, scope.$inputs.worldPos, scope.normal, scope.albedo.rgb, scope.shadeColor, scope.shadingShift);
+                    scope.$l.directLighting = this.calculateMToonDirectLighting(scope, scope.$inputs.worldPos, scope.normal, scope.albedo.rgb, scope.shadeColor, scope.shadingShift, pb.normalize(scope.$inputs.wNorm));
                     scope.$l.giLighting = this.calculateMToonGI(scope, scope.normal, scope.albedo.rgb);
                     scope.$l.lighting = pb.max(scope.directLighting, scope.giLighting);
                     scope.$l.rim = this.calculateMToonRim(scope, scope.normal, scope.viewVec, scope.uv, scope.lighting);