@zephyr3d/scene 0.7.0 → 0.8.0

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

@@ -8,16 +8,18 @@ import '../../../values.js';
 import { Vector4, Vector3 } from '@zephyr3d/base';
 import { MeshMaterial } from '../../../material/meshmaterial.js';
 import '../../../material/grassmaterial.js';
-import '../../../material/terrainmaterial.js';
 import '../../../material/terrain-cm.js';
 import { PBRMetallicRoughnessMaterial } from '../../../material/pbrmr.js';
 import { PBRSpecularGlossinessMaterial } from '../../../material/pbrsg.js';
 import { PBRBluePrintMaterial } from '../../../material/pbrblueprint.js';
-import { getTextureProps } from './common.js';
-import { getMeshMaterialInstanceUniformsClass } from './mesh.js';
+import { SpriteMaterial } from '../../../material/sprite.js';
+import { StandardSpriteMaterial } from '../../../material/sprite_std.js';
+import { SpriteBlueprintMaterial } from '../../../material/spriteblueprint.js';
+import { defineProps } from '../types.js';
+import { getMeshMaterialInstanceUniformsClass, getTextureProps } from './common.js';
 
 function getPBRCommonProps(manager) {
-    return [
+    return defineProps([
         {
             name: 'IOR',
             type: 'float',
@@ -432,11 +434,25 @@ function getPBRCommonProps(manager) {
             return this.sheen;
         }),
         ...getLitMaterialProps(manager)
-    ];
+    ]);
 }
 function getLitMaterialProps(manager) {
-    return [
+    return defineProps([
         ...getUnlitMaterialProps(manager),
+        {
+            name: 'doubleSidedLighting',
+            type: 'bool',
+            default: false,
+            isValid () {
+                return !this.$isInstance && this.cullMode !== 'back';
+            },
+            get (value) {
+                value.bool[0] = this.doubleSidedLighting;
+            },
+            set (value) {
+                this.doubleSidedLighting = value.bool[0];
+            }
+        },
         {
             name: 'vertexNormal',
             type: 'bool',
@@ -466,10 +482,10 @@ function getLitMaterialProps(manager) {
             }
         },
         ...getTextureProps(manager, 'normalTexture', '2D', false, 0)
-    ];
+    ]);
 }
 function getUnlitMaterialProps(manager) {
-    return [
+    return defineProps([
         {
             name: 'vertexColor',
             type: 'bool',
@@ -510,7 +526,7 @@ function getUnlitMaterialProps(manager) {
             }
         },
         ...getTextureProps(manager, 'albedoTexture', '2D', true, 0)
-    ];
+    ]);
 }
 /** @internal */ function getMeshMaterialClass() {
     return [
@@ -518,7 +534,7 @@ function getUnlitMaterialProps(manager) {
             ctor: MeshMaterial,
             name: 'MeshMaterial',
             getProps () {
-                return [
+                return defineProps([
                     {
                         name: 'AlphaCutoff',
                         type: 'float',
@@ -645,12 +661,84 @@ function getUnlitMaterialProps(manager) {
                             return !this.$isInstance;
                         }
                     }
-                ];
+                ]);
             }
         },
         getMeshMaterialInstanceUniformsClass(MeshMaterial)
     ];
 }
+/** @internal */ function getSpriteMaterialClass(_manager) {
+    return [
+        {
+            ctor: SpriteMaterial,
+            name: 'SpriteMaterial',
+            parent: MeshMaterial,
+            getProps () {
+                return [];
+            }
+        },
+        getMeshMaterialInstanceUniformsClass(SpriteMaterial)
+    ];
+}
+/** @internal */ function getStandardSpriteMaterialClass(manager) {
+    return [
+        {
+            ctor: StandardSpriteMaterial,
+            name: 'StandardSpriteMaterial',
+            parent: SpriteMaterial,
+            getProps () {
+                return defineProps([
+                    {
+                        name: 'SpriteTexture',
+                        type: 'object',
+                        default: '',
+                        options: {
+                            mimeTypes: [
+                                'image/jpeg',
+                                'image/png',
+                                'image/tga',
+                                'image/vnd.radiance',
+                                'image/x-dds',
+                                'image/webp'
+                            ]
+                        },
+                        isNullable () {
+                            return true;
+                        },
+                        get (value) {
+                            value.str[0] = manager.getAssetId(this.spriteTexture) ?? '';
+                        },
+                        async set (value) {
+                            if (!value || !value.str[0]) {
+                                this.spriteTexture = null;
+                            } else {
+                                const assetId = value.str[0];
+                                let tex;
+                                try {
+                                    tex = await manager.fetchTexture(assetId, {
+                                        linearColorSpace: false
+                                    });
+                                } catch (err) {
+                                    console.error(`Load asset failed: ${value.str[0]}: ${err}`);
+                                    tex = null;
+                                }
+                                if (tex?.isTexture2D()) {
+                                    this.spriteTexture = tex;
+                                } else {
+                                    console.error('Invalid texture type');
+                                }
+                            }
+                        },
+                        isValid () {
+                            return !this.$isInstance;
+                        }
+                    }
+                ]);
+            }
+        },
+        getMeshMaterialInstanceUniformsClass(StandardSpriteMaterial)
+    ];
+}
 /** @internal */ function getParticleMaterialClass(manager) {
     return [
         {
@@ -658,11 +746,11 @@ function getUnlitMaterialProps(manager) {
             name: 'ParticleMaterial',
             parent: MeshMaterial,
             getProps () {
-                return [
+                return defineProps([
                     {
                         name: 'AlphaMap',
                         type: 'object',
-                        default: null,
+                        default: '',
                         options: {
                             mimeTypes: [
                                 'image/jpeg',
@@ -680,9 +768,11 @@ function getUnlitMaterialProps(manager) {
                             value.str[0] = manager.getAssetId(this.alphaMap) ?? '';
                         },
                         async set (value) {
-                            if (value.str[0]) {
+                            if (!value || !value.str[0]) {
+                                this.alphaMap = null;
+                            } else {
                                 const assetId = value.str[0];
-                                let tex;
+                                let tex = null;
                                 try {
                                     tex = await manager.fetchTexture(assetId, {
                                         linearColorSpace: true
@@ -701,7 +791,7 @@ function getUnlitMaterialProps(manager) {
                     {
                         name: 'RampMap',
                         type: 'object',
-                        default: null,
+                        default: '',
                         options: {
                             mimeTypes: [
                                 'image/jpeg',
@@ -719,9 +809,11 @@ function getUnlitMaterialProps(manager) {
                             value.str[0] = manager.getAssetId(this.rampMap) ?? '';
                         },
                         async set (value) {
-                            if (value.str[0]) {
+                            if (!value || !value.str[0]) {
+                                this.rampMap = null;
+                            } else {
                                 const assetId = value.str[0];
-                                let tex;
+                                let tex = null;
                                 try {
                                     tex = await manager.fetchTexture(assetId);
                                 } catch (err) {
@@ -735,7 +827,7 @@ function getUnlitMaterialProps(manager) {
                             }
                         }
                     }
-                ];
+                ]);
             }
         },
         getMeshMaterialInstanceUniformsClass(ParticleMaterial)
@@ -743,9 +835,45 @@ function getUnlitMaterialProps(manager) {
 }
 /** @internal */ function getPBRBluePrintMaterialClass() {
     return [
+        {
+            ctor: PBRBluePrintMaterial,
+            parent: MeshMaterial,
+            name: 'PBRBluePrintMaterial',
+            getProps () {
+                return defineProps([
+                    {
+                        name: 'doubleSidedLighting',
+                        type: 'bool',
+                        default: false,
+                        isValid () {
+                            return !this.$isInstance && this.cullMode !== 'back';
+                        },
+                        get (value) {
+                            value.bool[0] = this.doubleSidedLighting;
+                        },
+                        set (value) {
+                            this.doubleSidedLighting = value.bool[0];
+                        }
+                    }
+                ]);
+            }
+        },
         getMeshMaterialInstanceUniformsClass(PBRBluePrintMaterial)
     ];
 }
+/** @internal */ function getSpriteBlueprintMaterialClass() {
+    return [
+        {
+            ctor: SpriteBlueprintMaterial,
+            parent: MeshMaterial,
+            name: 'SpriteBlueprintMaterial',
+            getProps () {
+                return [];
+            }
+        },
+        getMeshMaterialInstanceUniformsClass(SpriteBlueprintMaterial)
+    ];
+}
 /** @internal */ function getUnlitMaterialClass(manager) {
     return [
         {
@@ -779,7 +907,7 @@ function getUnlitMaterialProps(manager) {
             parent: MeshMaterial,
             name: 'BlinnMaterial',
             getProps () {
-                return [
+                return defineProps([
                     {
                         name: 'Shininess',
                         type: 'float',
@@ -798,8 +926,70 @@ function getUnlitMaterialProps(manager) {
                             return this.$isInstance ? this.coreMaterial.shininess : 32;
                         }
                     },
+                    {
+                        name: 'ScatterWrap',
+                        type: 'float',
+                        options: {
+                            animatable: true,
+                            minValue: 0,
+                            maxValue: 1
+                        },
+                        get (value) {
+                            value.num[0] = this.scatterWrap;
+                        },
+                        set (value) {
+                            this.scatterWrap = value.num[0];
+                        },
+                        getDefaultValue () {
+                            return this.$isInstance ? this.coreMaterial.scatterWrap : 0;
+                        }
+                    },
+                    {
+                        name: 'ScatterWidth',
+                        type: 'float',
+                        options: {
+                            animatable: true,
+                            minValue: 0,
+                            maxValue: 1
+                        },
+                        get (value) {
+                            value.num[0] = this.scatterWidth;
+                        },
+                        set (value) {
+                            this.scatterWidth = value.num[0];
+                        },
+                        getDefaultValue () {
+                            return this.$isInstance ? this.coreMaterial.scatterWidth : 0;
+                        }
+                    },
+                    {
+                        name: 'ScatterColor',
+                        type: 'rgb',
+                        options: {
+                            animatable: true
+                        },
+                        get (value) {
+                            value.num[0] = this.scatterColor.x;
+                            value.num[1] = this.scatterColor.y;
+                            value.num[2] = this.scatterColor.z;
+                        },
+                        set (value) {
+                            this.scatterColor = new Vector4(value.num[0], value.num[1], value.num[2], 1);
+                        },
+                        getDefaultValue () {
+                            return this.$isInstance ? [
+                                this.coreMaterial.scatterColor.x,
+                                this.coreMaterial.scatterColor.y,
+                                this.coreMaterial.scatterColor.z
+                            ] : [
+                                0,
+                                0,
+                                0
+                            ];
+                        }
+                    },
                     ...getLitMaterialProps(manager)
-                ];
+                ]);
             }
         },
         getMeshMaterialInstanceUniformsClass(BlinnMaterial)
@@ -812,7 +1002,7 @@ function getUnlitMaterialProps(manager) {
             parent: MeshMaterial,
             name: 'PBRMetallicRoughnessMaterial',
             getProps () {
-                return [
+                return defineProps([
                     {
                         name: 'Metallic',
                         type: 'float',
@@ -876,7 +1066,7 @@ function getUnlitMaterialProps(manager) {
                     ...getTextureProps(manager, 'metallicRoughnessTexture', '2D', false, 0),
                     ...getTextureProps(manager, 'specularColorTexture', '2D', true, 0),
                     ...getPBRCommonProps(manager)
-                ];
+                ]);
             }
         },
         getMeshMaterialInstanceUniformsClass(PBRMetallicRoughnessMaterial)
@@ -889,7 +1079,7 @@ function getUnlitMaterialProps(manager) {
             name: 'PBRSpecularGlossinessMaterial',
             parent: MeshMaterial,
             getProps () {
-                return [
+                return defineProps([
                     {
                         name: 'SpecularFactor',
                         type: 'rgb',
@@ -931,12 +1121,12 @@ function getUnlitMaterialProps(manager) {
                         }
                     },
                     ...getPBRCommonProps(manager)
-                ];
+                ]);
             }
         },
         getMeshMaterialInstanceUniformsClass(PBRSpecularGlossinessMaterial)
     ];
 }
 
-export { getBlinnMaterialClass, getLambertMaterialClass, getMeshMaterialClass, getPBRBluePrintMaterialClass, getPBRMetallicRoughnessMaterialClass, getPBRSpecularGlossinessMaterialClass, getParticleMaterialClass, getUnlitMaterialClass };
+export { getBlinnMaterialClass, getLambertMaterialClass, getMeshMaterialClass, getPBRBluePrintMaterialClass, getPBRMetallicRoughnessMaterialClass, getPBRSpecularGlossinessMaterialClass, getParticleMaterialClass, getSpriteBlueprintMaterialClass, getSpriteMaterialClass, getStandardSpriteMaterialClass, getUnlitMaterialClass };
 //# sourceMappingURL=material.js.map