@zephyr3d/scene 0.8.2 → 0.9.1

package/dist/utility/serialization/scene/material.js

@@ -5,7 +5,7 @@ import { UnlitMaterial } from '../../../material/unlit.js';
 import { ParticleMaterial } from '../../../material/particle.js';
 import '@zephyr3d/device';
 import '../../../values.js';
-import { Vector4, Vector3 } from '@zephyr3d/base';
+import { Vector3, Vector2, Vector4 } from '@zephyr3d/base';
 import { MeshMaterial } from '../../../material/meshmaterial.js';
 import '../../../material/grassmaterial.js';
 import '../../../material/terrain-cm.js';
@@ -568,6 +568,20 @@ function getUnlitMaterialProps(manager) {
                             return !this.$isInstance;
                         }
                     },
+                    {
+                        name: 'AlphaDither',
+                        type: 'bool',
+                        default: false,
+                        get (value) {
+                            value.bool[0] = this.alphaDither;
+                        },
+                        set (value) {
+                            this.alphaDither = value.bool[0];
+                        },
+                        isValid () {
+                            return !this.$isInstance && this.alphaCutoff > 0;
+                        }
+                    },
                     {
                         name: 'BlendMode',
                         type: 'string',
@@ -854,6 +868,222 @@ function getUnlitMaterialProps(manager) {
                         set (value) {
                             this.doubleSidedLighting = value.bool[0];
                         }
+                    },
+                    {
+                        name: 'Reflection',
+                        type: 'string',
+                        default: 'ggx',
+                        options: {
+                            enum: {
+                                labels: [
+                                    'None',
+                                    'GGX',
+                                    'Anisotropic',
+                                    'Glint'
+                                ],
+                                values: [
+                                    'none',
+                                    'ggx',
+                                    'anisotropic',
+                                    'glint'
+                                ]
+                            }
+                        },
+                        get (value) {
+                            value.str[0] = this.reflectionMode;
+                        },
+                        set (value) {
+                            this.reflectionMode = value.str[0];
+                        },
+                        getDefaultValue () {
+                            return this.$isInstance ? this.coreMaterial.reflectionMode : 'ggx';
+                        }
+                    },
+                    {
+                        name: 'SubsurfaceScattering',
+                        type: 'bool',
+                        phase: 0,
+                        default: false,
+                        get (value) {
+                            value.bool[0] = this.subsurfaceScattering;
+                        },
+                        set (value) {
+                            this.subsurfaceScattering = value.bool[0];
+                        },
+                        isValid () {
+                            return !this.$isInstance;
+                        }
+                    },
+                    {
+                        name: 'SubsurfaceColor',
+                        type: 'rgb',
+                        phase: 1,
+                        default: [
+                            1,
+                            0.3,
+                            0.2
+                        ],
+                        options: {
+                            animatable: true
+                        },
+                        get (value) {
+                            value.num[0] = this.subsurfaceColor.x;
+                            value.num[1] = this.subsurfaceColor.y;
+                            value.num[2] = this.subsurfaceColor.z;
+                        },
+                        set (value) {
+                            this.subsurfaceColor = new Vector3(value.num[0], value.num[1], value.num[2]);
+                        },
+                        getDefaultValue () {
+                            return this.$isInstance ? this.coreMaterial.subsurfaceColor : [
+                                1,
+                                0.3,
+                                0.2
+                            ];
+                        },
+                        isValid () {
+                            return this.subsurfaceScattering;
+                        }
+                    },
+                    {
+                        name: 'SubsurfaceScale',
+                        type: 'float',
+                        phase: 1,
+                        default: 0.5,
+                        options: {
+                            animatable: true,
+                            minValue: 0,
+                            maxValue: 8
+                        },
+                        get (value) {
+                            value.num[0] = this.subsurfaceScale;
+                        },
+                        set (value) {
+                            this.subsurfaceScale = value.num[0];
+                        },
+                        getDefaultValue () {
+                            return this.$isInstance ? this.coreMaterial.subsurfaceScale : 0.5;
+                        },
+                        isValid () {
+                            return this.subsurfaceScattering;
+                        }
+                    },
+                    {
+                        name: 'SubsurfacePower',
+                        type: 'float',
+                        phase: 1,
+                        default: 1.5,
+                        options: {
+                            animatable: true,
+                            minValue: 0,
+                            maxValue: 16
+                        },
+                        get (value) {
+                            value.num[0] = this.subsurfacePower;
+                        },
+                        set (value) {
+                            this.subsurfacePower = value.num[0];
+                        },
+                        getDefaultValue () {
+                            return this.$isInstance ? this.coreMaterial.subsurfacePower : 1.5;
+                        },
+                        isValid () {
+                            return this.subsurfaceScattering;
+                        }
+                    },
+                    {
+                        name: 'SubsurfaceIntensity',
+                        type: 'float',
+                        phase: 1,
+                        default: 0.5,
+                        options: {
+                            animatable: true,
+                            minValue: 0,
+                            maxValue: 4
+                        },
+                        get (value) {
+                            value.num[0] = this.subsurfaceIntensity;
+                        },
+                        set (value) {
+                            this.subsurfaceIntensity = value.num[0];
+                        },
+                        getDefaultValue () {
+                            return this.$isInstance ? this.coreMaterial.subsurfaceIntensity : 0.5;
+                        },
+                        isValid () {
+                            return this.subsurfaceScattering;
+                        }
+                    },
+                    {
+                        name: 'Anisotropy',
+                        type: 'float',
+                        default: 0.75,
+                        options: {
+                            animatable: true,
+                            minValue: -0.95,
+                            maxValue: 0.95
+                        },
+                        get (value) {
+                            value.num[0] = this.anisotropy;
+                        },
+                        set (value) {
+                            this.anisotropy = value.num[0];
+                        },
+                        getDefaultValue () {
+                            return this.$isInstance ? this.coreMaterial.anisotropy : 0.75;
+                        },
+                        isValid () {
+                            return this.reflectionMode === 'anisotropic';
+                        }
+                    },
+                    {
+                        name: 'AnisotropyDirection',
+                        type: 'float',
+                        default: 0,
+                        options: {
+                            animatable: true,
+                            minValue: 0,
+                            maxValue: 360
+                        },
+                        get (value) {
+                            value.num[0] = this.anisotropyDirection;
+                        },
+                        set (value) {
+                            this.anisotropyDirection = value.num[0];
+                        },
+                        getDefaultValue () {
+                            return this.$isInstance ? this.coreMaterial.anisotropyDirection : 0;
+                        },
+                        isValid () {
+                            return this.reflectionMode === 'anisotropic';
+                        }
+                    },
+                    {
+                        name: 'AnisotropyDirectionScaleBias',
+                        type: 'vec2',
+                        default: [
+                            1,
+                            0
+                        ],
+                        options: {
+                            animatable: true
+                        },
+                        get (value) {
+                            value.num[0] = this.anisotropyDirectionScaleBias.x;
+                            value.num[1] = this.anisotropyDirectionScaleBias.y;
+                        },
+                        set (value) {
+                            this.anisotropyDirectionScaleBias = new Vector2(value.num[0], value.num[1]);
+                        },
+                        getDefaultValue () {
+                            return this.$isInstance ? this.coreMaterial.anisotropyDirectionScaleBias : [
+                                1,
+                                0
+                            ];
+                        },
+                        isValid () {
+                            return this.reflectionMode === 'anisotropic';
+                        }
                     }
                 ]);
             }
@@ -1063,6 +1293,228 @@ function getUnlitMaterialProps(manager) {
                             ];
                         }
                     },
+                    {
+                        name: 'Reflection',
+                        type: 'string',
+                        default: 'ggx',
+                        options: {
+                            enum: {
+                                labels: [
+                                    'None',
+                                    'GGX',
+                                    'Anisotropic',
+                                    'Glint'
+                                ],
+                                values: [
+                                    'none',
+                                    'ggx',
+                                    'anisotropic',
+                                    'glint'
+                                ]
+                            }
+                        },
+                        get (value) {
+                            value.str[0] = this.reflectionMode;
+                        },
+                        set (value) {
+                            this.reflectionMode = value.str[0];
+                        },
+                        getDefaultValue () {
+                            return this.$isInstance ? this.coreMaterial.reflectionMode : 'ggx';
+                        }
+                    },
+                    {
+                        name: 'Anisotropy',
+                        type: 'float',
+                        default: 0.75,
+                        options: {
+                            animatable: true,
+                            minValue: -0.95,
+                            maxValue: 0.95
+                        },
+                        get (value) {
+                            value.num[0] = this.anisotropy;
+                        },
+                        set (value) {
+                            this.anisotropy = value.num[0];
+                        },
+                        getDefaultValue () {
+                            return this.$isInstance ? this.coreMaterial.anisotropy : 0.75;
+                        },
+                        isValid () {
+                            return this.reflectionMode === 'anisotropic';
+                        }
+                    },
+                    {
+                        name: 'AnisotropyDirection',
+                        type: 'float',
+                        default: 0,
+                        options: {
+                            animatable: true,
+                            minValue: 0,
+                            maxValue: 360
+                        },
+                        get (value) {
+                            value.num[0] = this.anisotropyDirection;
+                        },
+                        set (value) {
+                            this.anisotropyDirection = value.num[0];
+                        },
+                        getDefaultValue () {
+                            return this.$isInstance ? this.coreMaterial.anisotropyDirection : 0;
+                        },
+                        isValid () {
+                            return this.reflectionMode === 'anisotropic';
+                        }
+                    },
+                    ...getTextureProps(manager, 'anisotropyDirectionTexture', '2D', false, 0, function() {
+                        return this.reflectionMode === 'anisotropic';
+                    }),
+                    {
+                        name: 'AnisotropyDirectionScaleBias',
+                        type: 'vec2',
+                        default: [
+                            1,
+                            0
+                        ],
+                        options: {
+                            animatable: true
+                        },
+                        get (value) {
+                            value.num[0] = this.anisotropyDirectionScaleBias.x;
+                            value.num[1] = this.anisotropyDirectionScaleBias.y;
+                        },
+                        set (value) {
+                            this.anisotropyDirectionScaleBias = new Vector2(value.num[0], value.num[1]);
+                        },
+                        getDefaultValue () {
+                            return this.$isInstance ? this.coreMaterial.anisotropyDirectionScaleBias : [
+                                1,
+                                0
+                            ];
+                        },
+                        isValid () {
+                            return !this.$isInstance && this.reflectionMode === 'anisotropic' && !!this.anisotropyDirectionTexture;
+                        }
+                    },
+                    {
+                        name: 'SubsurfaceScattering',
+                        type: 'bool',
+                        phase: 0,
+                        default: false,
+                        get (value) {
+                            value.bool[0] = this.subsurfaceScattering;
+                        },
+                        set (value) {
+                            this.subsurfaceScattering = value.bool[0];
+                        },
+                        isValid () {
+                            return !this.$isInstance;
+                        }
+                    },
+                    {
+                        name: 'SubsurfaceColor',
+                        type: 'rgb',
+                        phase: 1,
+                        default: [
+                            1,
+                            0.3,
+                            0.2
+                        ],
+                        options: {
+                            animatable: true
+                        },
+                        get (value) {
+                            value.num[0] = this.subsurfaceColor.x;
+                            value.num[1] = this.subsurfaceColor.y;
+                            value.num[2] = this.subsurfaceColor.z;
+                        },
+                        set (value) {
+                            this.subsurfaceColor = new Vector3(value.num[0], value.num[1], value.num[2]);
+                        },
+                        getDefaultValue () {
+                            return this.$isInstance ? this.coreMaterial.subsurfaceColor : [
+                                1,
+                                0.3,
+                                0.2
+                            ];
+                        },
+                        isValid () {
+                            return this.subsurfaceScattering;
+                        }
+                    },
+                    {
+                        name: 'SubsurfaceScale',
+                        type: 'float',
+                        phase: 1,
+                        default: 0.5,
+                        options: {
+                            animatable: true,
+                            minValue: 0,
+                            maxValue: 8
+                        },
+                        get (value) {
+                            value.num[0] = this.subsurfaceScale;
+                        },
+                        set (value) {
+                            this.subsurfaceScale = value.num[0];
+                        },
+                        getDefaultValue () {
+                            return this.$isInstance ? this.coreMaterial.subsurfaceScale : 0.5;
+                        },
+                        isValid () {
+                            return this.subsurfaceScattering;
+                        }
+                    },
+                    {
+                        name: 'SubsurfacePower',
+                        type: 'float',
+                        phase: 1,
+                        default: 1.5,
+                        options: {
+                            animatable: true,
+                            minValue: 0,
+                            maxValue: 16
+                        },
+                        get (value) {
+                            value.num[0] = this.subsurfacePower;
+                        },
+                        set (value) {
+                            this.subsurfacePower = value.num[0];
+                        },
+                        getDefaultValue () {
+                            return this.$isInstance ? this.coreMaterial.subsurfacePower : 1.5;
+                        },
+                        isValid () {
+                            return this.subsurfaceScattering;
+                        }
+                    },
+                    {
+                        name: 'SubsurfaceIntensity',
+                        type: 'float',
+                        phase: 1,
+                        default: 0.5,
+                        options: {
+                            animatable: true,
+                            minValue: 0,
+                            maxValue: 4
+                        },
+                        get (value) {
+                            value.num[0] = this.subsurfaceIntensity;
+                        },
+                        set (value) {
+                            this.subsurfaceIntensity = value.num[0];
+                        },
+                        getDefaultValue () {
+                            return this.$isInstance ? this.coreMaterial.subsurfaceIntensity : 0.5;
+                        },
+                        isValid () {
+                            return this.subsurfaceScattering;
+                        }
+                    },
+                    ...getTextureProps(manager, 'subsurfaceTexture', '2D', false, 1, function() {
+                        return this.subsurfaceScattering;
+                    }),
                     ...getTextureProps(manager, 'metallicRoughnessTexture', '2D', false, 0),
                     ...getTextureProps(manager, 'specularColorTexture', '2D', true, 0),
                     ...getPBRCommonProps(manager)