@galacean/engine 1.1.0-beta.24 → 1.1.0-beta.25

package/dist/browser.js

@@ -695,8 +695,11 @@
        * @param out - The center point of this bounding box
        * @returns The center point of this bounding box
        */ _proto.getCenter = function getCenter(out) {
-            Vector3.add(this.min, this.max, out);
-            Vector3.scale(out, 0.5, out);
+            var _this = this, min = _this.min, max = _this.max;
+            var centerX = max._x + min._x;
+            var centerY = max._y + min._y;
+            var centerZ = max._z + min._z;
+            out.set(isNaN(centerX) ? 0 : centerX * 0.5, isNaN(centerY) ? 0 : centerY * 0.5, isNaN(centerZ) ? 0 : centerZ * 0.5);
             return out;
         };
         /**
@@ -704,8 +707,11 @@
        * @param out - The extent of this bounding box
        * @returns The extent of this bounding box
        */ _proto.getExtent = function getExtent(out) {
-            Vector3.subtract(this.max, this.min, out);
-            Vector3.scale(out, 0.5, out);
+            var _this = this, min = _this.min, max = _this.max;
+            var extentX = max._x - min._x;
+            var extentY = max._y - min._y;
+            var extentZ = max._z - min._z;
+            out.set(isNaN(extentX) ? 0 : extentX * 0.5, isNaN(extentY) ? 0 : extentY * 0.5, isNaN(extentZ) ? 0 : extentZ * 0.5);
             return out;
         };
         /**
@@ -815,9 +821,9 @@
             Vector3.transformCoordinate(center, matrix, center);
             var x = extent.x, y = extent.y, z = extent.z;
             var e = matrix.elements;
-            extent.x = Math.abs(x * e[0]) + Math.abs(y * e[4]) + Math.abs(z * e[8]);
-            extent.y = Math.abs(x * e[1]) + Math.abs(y * e[5]) + Math.abs(z * e[9]);
-            extent.z = Math.abs(x * e[2]) + Math.abs(y * e[6]) + Math.abs(z * e[10]);
+            // prettier-ignore
+            var e0 = e[0], e1 = e[1], e2 = e[2], e4 = e[4], e5 = e[5], e6 = e[6], e8 = e[8], e9 = e[9], e10 = e[10];
+            extent.set((e0 === 0 ? 0 : Math.abs(x * e0)) + (e4 === 0 ? 0 : Math.abs(y * e4)) + (e8 === 0 ? 0 : Math.abs(z * e8)), (e1 === 0 ? 0 : Math.abs(x * e1)) + (e5 === 0 ? 0 : Math.abs(y * e5)) + (e9 === 0 ? 0 : Math.abs(z * e9)), (e2 === 0 ? 0 : Math.abs(x * e2)) + (e6 === 0 ? 0 : Math.abs(y * e6)) + (e10 === 0 ? 0 : Math.abs(z * e10)));
             // set min、max
             Vector3.subtract(center, extent, out.min);
             Vector3.add(center, extent, out.max);
@@ -9932,7 +9938,7 @@
     var begin_normal_vert = "#define GLSLIFY 1\n#ifndef MATERIAL_OMIT_NORMAL\n#ifdef RENDERER_HAS_NORMAL\nvec3 normal=vec3(NORMAL);\n#endif\n#ifdef RENDERER_HAS_TANGENT\nvec4 tangent=vec4(TANGENT);\n#endif\n#endif\n"; // eslint-disable-line
     var begin_position_vert = "#define GLSLIFY 1\nvec4 position=vec4(POSITION,1.0);"; // eslint-disable-line
     var blendShape_input = "#define GLSLIFY 1\n#ifdef RENDERER_HAS_BLENDSHAPE\n#ifdef RENDERER_BLENDSHAPE_USE_TEXTURE\nuniform mediump sampler2DArray renderer_BlendShapeTexture;uniform ivec3 renderer_BlendShapeTextureInfo;uniform float renderer_BlendShapeWeights[RENDERER_BLENDSHAPE_COUNT];\n#else\nattribute vec3 POSITION_BS0;attribute vec3 POSITION_BS1;\n#if defined( RENDERER_BLENDSHAPE_HAS_NORMAL ) && defined( RENDERER_BLENDSHAPE_HAS_TANGENT )\nattribute vec3 NORMAL_BS0;attribute vec3 NORMAL_BS1;attribute vec3 TANGENT_BS0;attribute vec3 TANGENT_BS1;uniform float renderer_BlendShapeWeights[2];\n#else\n#if defined( RENDERER_BLENDSHAPE_HAS_NORMAL ) || defined( RENDERER_BLENDSHAPE_HAS_TANGENT )\nattribute vec3 POSITION_BS2;attribute vec3 POSITION_BS3;\n#ifdef RENDERER_BLENDSHAPE_HAS_NORMAL\nattribute vec3 NORMAL_BS0;attribute vec3 NORMAL_BS1;attribute vec3 NORMAL_BS2;attribute vec3 NORMAL_BS3;\n#endif\n#ifdef RENDERER_BLENDSHAPE_HAS_TANGENT\nattribute vec3 TANGENT_BS0;attribute vec3 TANGENT_BS1;attribute vec3 TANGENT_BS2;attribute vec3 TANGENT_BS3;\n#endif\nuniform float renderer_BlendShapeWeights[4];\n#else\nattribute vec3 POSITION_BS2;attribute vec3 POSITION_BS3;attribute vec3 POSITION_BS4;attribute vec3 POSITION_BS5;attribute vec3 POSITION_BS6;attribute vec3 POSITION_BS7;uniform float renderer_BlendShapeWeights[8];\n#endif\n#endif\n#endif\n#ifdef RENDERER_BLENDSHAPE_USE_TEXTURE\nvec3 getBlendShapeVertexElement(int blendShapeIndex,int vertexElementIndex){int y=vertexElementIndex/renderer_BlendShapeTextureInfo.y;int x=vertexElementIndex-y*renderer_BlendShapeTextureInfo.y;ivec3 uv=ivec3(x,y,blendShapeIndex);return texelFetch(renderer_BlendShapeTexture,uv,0).xyz;}\n#endif\n#endif\n"; // eslint-disable-line
-    var blendShape_vert = "#define GLSLIFY 1\n#ifdef RENDERER_HAS_BLENDSHAPE\n#ifdef RENDERER_BLENDSHAPE_USE_TEXTURE\nint vertexOffset=gl_VertexID*renderer_BlendShapeTextureInfo.x;for(int i=0;i<RENDERER_BLENDSHAPE_COUNT;i++){int vertexElementOffset=vertexOffset;float weight=renderer_BlendShapeWeights[i];position.xyz+=getBlendShapeVertexElement(i,vertexElementOffset)*weight;\n#ifndef MATERIAL_OMIT_NORMAL\n#if defined( RENDERER_HAS_NORMAL ) && defined( RENDERER_BLENDSHAPE_HAS_NORMAL )\nvertexElementOffset+=1;normal+=getBlendShapeVertexElement(i,vertexElementOffset)*weight;\n#endif\n#if defined( RENDERER_HAS_TANGENT ) && defined(RENDERER_BLENDSHAPE_HAS_TANGENT) && ( defined(MATERIAL_HAS_NORMALTEXTURE) || defined(MATERIAL_HAS_CLEAR_COAT_NORMAL_TEXTURE) )\nvertexElementOffset+=1;tangent.xyz+=getBlendShapeVertexElement(i,vertexElementOffset)*weight;\n#endif\n#endif\n}\n#else\nposition.xyz+=POSITION_BS0*renderer_BlendShapeWeights[0];position.xyz+=POSITION_BS1*renderer_BlendShapeWeights[1];\n#if defined( RENDERER_BLENDSHAPE_HAS_NORMAL ) && defined( RENDERER_BLENDSHAPE_HAS_TANGENT )\n#ifndef MATERIAL_OMIT_NORMAL\n#ifdef RENDERER_HAS_NORMAL\nnormal+=NORMAL_BS0*renderer_BlendShapeWeights[0];normal+=NORMAL_BS1*renderer_BlendShapeWeights[1];\n#endif\n#if defined( RENDERER_HAS_TANGENT ) && ( defined(MATERIAL_HAS_NORMALTEXTURE) || defined(MATERIAL_HAS_CLEAR_COAT_NORMAL_TEXTURE) )\ntangent.xyz+=TANGENT_BS0*renderer_BlendShapeWeights[0];tangent.xyz+=TANGENT_BS1*renderer_BlendShapeWeights[1];\n#endif\n#endif\n#else\n#if defined( RENDERER_BLENDSHAPE_HAS_NORMAL ) || defined( RENDERER_BLENDSHAPE_HAS_TANGENT )\n#ifndef MATERIAL_OMIT_NORMAL\nposition.xyz+=POSITION_BS2*renderer_BlendShapeWeights[2];position.xyz+=POSITION_BS3*renderer_BlendShapeWeights[3];\n#if defined( RENDERER_BLENDSHAPE_HAS_NORMAL ) && defined( RENDERER_HAS_NORMAL )\nnormal+=NORMAL_BS0*renderer_BlendShapeWeights[0];normal+=NORMAL_BS1*renderer_BlendShapeWeights[1];normal+=NORMAL_BS2*renderer_BlendShapeWeights[2];normal+=NORMAL_BS3*renderer_BlendShapeWeights[3];\n#endif\n#if defined(RENDERER_BLENDSHAPE_HAS_TANGENT) && defined( RENDERER_HAS_TANGENT ) && ( defined(MATERIAL_HAS_NORMALTEXTURE) || defined(MATERIAL_HAS_CLEAR_COAT_NORMAL_TEXTURE) )\ntangent.xyz+=TANGENT_BS0*renderer_BlendShapeWeights[0];tangent.xyz+=TANGENT_BS1*renderer_BlendShapeWeights[1];tangent.xyz+=TANGENT_BS2*renderer_BlendShapeWeights[2];tangent.xyz+=TANGENT_BS3*renderer_BlendShapeWeights[3];\n#endif\n#endif\n#else\nposition.xyz+=POSITION_BS2*renderer_BlendShapeWeights[2];position.xyz+=POSITION_BS3*renderer_BlendShapeWeights[3];position.xyz+=POSITION_BS4*renderer_BlendShapeWeights[4];position.xyz+=POSITION_BS5*renderer_BlendShapeWeights[5];position.xyz+=POSITION_BS6*renderer_BlendShapeWeights[6];position.xyz+=POSITION_BS7*renderer_BlendShapeWeights[7];\n#endif\n#endif\n#endif\n#endif\n"; // eslint-disable-line
+    var blendShape_vert = "#define GLSLIFY 1\n#ifdef RENDERER_HAS_BLENDSHAPE\n#ifdef RENDERER_BLENDSHAPE_USE_TEXTURE\nint vertexOffset=gl_VertexID*renderer_BlendShapeTextureInfo.x;for(int i=0;i<RENDERER_BLENDSHAPE_COUNT;i++){int vertexElementOffset=vertexOffset;float weight=renderer_BlendShapeWeights[i];if(weight!=0.0){position.xyz+=getBlendShapeVertexElement(i,vertexElementOffset)*weight;\n#ifndef MATERIAL_OMIT_NORMAL\n#if defined( RENDERER_HAS_NORMAL ) && defined( RENDERER_BLENDSHAPE_HAS_NORMAL )\nvertexElementOffset+=1;normal+=getBlendShapeVertexElement(i,vertexElementOffset)*weight;\n#endif\n#if defined( RENDERER_HAS_TANGENT ) && defined(RENDERER_BLENDSHAPE_HAS_TANGENT) && ( defined(MATERIAL_HAS_NORMALTEXTURE) || defined(MATERIAL_HAS_CLEAR_COAT_NORMAL_TEXTURE) )\nvertexElementOffset+=1;tangent.xyz+=getBlendShapeVertexElement(i,vertexElementOffset)*weight;\n#endif\n#endif\n}}\n#else\nposition.xyz+=POSITION_BS0*renderer_BlendShapeWeights[0];position.xyz+=POSITION_BS1*renderer_BlendShapeWeights[1];\n#if defined( RENDERER_BLENDSHAPE_HAS_NORMAL ) && defined( RENDERER_BLENDSHAPE_HAS_TANGENT )\n#ifndef MATERIAL_OMIT_NORMAL\n#ifdef RENDERER_HAS_NORMAL\nnormal+=NORMAL_BS0*renderer_BlendShapeWeights[0];normal+=NORMAL_BS1*renderer_BlendShapeWeights[1];\n#endif\n#if defined( RENDERER_HAS_TANGENT ) && ( defined(MATERIAL_HAS_NORMALTEXTURE) || defined(MATERIAL_HAS_CLEAR_COAT_NORMAL_TEXTURE) )\ntangent.xyz+=TANGENT_BS0*renderer_BlendShapeWeights[0];tangent.xyz+=TANGENT_BS1*renderer_BlendShapeWeights[1];\n#endif\n#endif\n#else\n#if defined( RENDERER_BLENDSHAPE_HAS_NORMAL ) || defined( RENDERER_BLENDSHAPE_HAS_TANGENT )\n#ifndef MATERIAL_OMIT_NORMAL\nposition.xyz+=POSITION_BS2*renderer_BlendShapeWeights[2];position.xyz+=POSITION_BS3*renderer_BlendShapeWeights[3];\n#if defined( RENDERER_BLENDSHAPE_HAS_NORMAL ) && defined( RENDERER_HAS_NORMAL )\nnormal+=NORMAL_BS0*renderer_BlendShapeWeights[0];normal+=NORMAL_BS1*renderer_BlendShapeWeights[1];normal+=NORMAL_BS2*renderer_BlendShapeWeights[2];normal+=NORMAL_BS3*renderer_BlendShapeWeights[3];\n#endif\n#if defined(RENDERER_BLENDSHAPE_HAS_TANGENT) && defined( RENDERER_HAS_TANGENT ) && ( defined(MATERIAL_HAS_NORMALTEXTURE) || defined(MATERIAL_HAS_CLEAR_COAT_NORMAL_TEXTURE) )\ntangent.xyz+=TANGENT_BS0*renderer_BlendShapeWeights[0];tangent.xyz+=TANGENT_BS1*renderer_BlendShapeWeights[1];tangent.xyz+=TANGENT_BS2*renderer_BlendShapeWeights[2];tangent.xyz+=TANGENT_BS3*renderer_BlendShapeWeights[3];\n#endif\n#endif\n#else\nposition.xyz+=POSITION_BS2*renderer_BlendShapeWeights[2];position.xyz+=POSITION_BS3*renderer_BlendShapeWeights[3];position.xyz+=POSITION_BS4*renderer_BlendShapeWeights[4];position.xyz+=POSITION_BS5*renderer_BlendShapeWeights[5];position.xyz+=POSITION_BS6*renderer_BlendShapeWeights[6];position.xyz+=POSITION_BS7*renderer_BlendShapeWeights[7];\n#endif\n#endif\n#endif\n#endif\n"; // eslint-disable-line
     var color_vert = "#define GLSLIFY 1\n#ifdef RENDERER_ENABLE_VERTEXCOLOR\nv_color=COLOR_0;\n#endif\n"; // eslint-disable-line
     var FogVertex = "#define GLSLIFY 1\n#if SCENE_FOG_MODE != 0\nvec4 positionVS=renderer_MVMat*position;v_positionVS=positionVS.xyz/positionVS.w;\n#endif\n"; // eslint-disable-line
     var normal_vert = "#define GLSLIFY 1\n#ifndef MATERIAL_OMIT_NORMAL\n#ifdef RENDERER_HAS_NORMAL\nv_normal=normalize(mat3(renderer_NormalMat)*normal);\n#if defined(RENDERER_HAS_TANGENT) && ( defined(MATERIAL_HAS_NORMALTEXTURE) || defined(MATERIAL_HAS_CLEAR_COAT_NORMAL_TEXTURE) )\nvec3 normalW=normalize(mat3(renderer_NormalMat)*normal.xyz);vec3 tangentW=normalize(mat3(renderer_NormalMat)*tangent.xyz);vec3 bitangentW=cross(normalW,tangentW)*tangent.w;v_TBN=mat3(tangentW,bitangentW,normalW);\n#endif\n#endif\n#endif\n"; // eslint-disable-line
@@ -11527,6 +11533,9 @@
                     throw "ShaderLab has not been set up yet.";
                 }
                 var shaderInfo = Shader._shaderLab.parseShader(nameOrShaderSource);
+                if (shaderMap[shaderInfo.name]) {
+                    throw 'Shader named "' + shaderInfo.name + '" already exists.';
+                }
                 var subShaderList = shaderInfo.subShaders.map(function(subShaderInfo) {
                     var passList = subShaderInfo.passes.map(function(passInfo) {
                         if (typeof passInfo === "string") {
@@ -32284,15 +32293,17 @@
                 throw new Error("Gradient can only have 4 color keys");
             }
             var key = typeof timeOrKey === "number" ? new GradientColorKey(timeOrKey, color) : timeOrKey;
+            key._onValueChanged = this._setColorTypeArrayDirty.bind(this);
             this._addKey(colorKeys, key);
             this._colorTypeArrayDirty = true;
         };
         _proto.addAlphaKey = function addAlphaKey(timeOrKey, alpha) {
             var alphaKeys = this._alphaKeys;
             if (alphaKeys.length === 4) {
-                throw new Error("Gradient can only have 4 color keys");
+                throw new Error("Gradient can only have 4 alpha keys");
             }
             var key = typeof timeOrKey === "number" ? new GradientAlphaKey(timeOrKey, alpha) : timeOrKey;
+            key._onValueChanged = this._setAlphaTypeArrayDirty.bind(this);
             this._addKey(alphaKeys, key);
             this._alphaTypeArrayDirty = true;
         };
@@ -32300,6 +32311,7 @@
        * Remove a color key from the gradient.
        * @param index - The remove color key index
        */ _proto.removeColorKey = function removeColorKey(index) {
+            this._colorKeys[index]._onValueChanged = null;
             this._removeKey(this._colorKeys, index);
             this._colorTypeArrayDirty = true;
         };
@@ -32307,6 +32319,7 @@
        * Remove an alpha key from the gradient.
        * @param index - The remove alpha key index
        */ _proto.removeAlphaKey = function removeAlphaKey(index) {
+            this._alphaKeys[index]._onValueChanged = null;
             this._removeKey(this._alphaKeys, index);
             this._alphaTypeArrayDirty = true;
         };
@@ -32315,13 +32328,21 @@
        * @param colorKeys - The color keys
        * @param alphaKeys - The alpha keys
        */ _proto.setKeys = function setKeys(colorKeys, alphaKeys) {
-            this._alphaKeys.length = 0;
-            this._colorKeys.length = 0;
-            for(var i = 0, n = colorKeys.length; i < n; i++){
-                this._addKey(this._colorKeys, colorKeys[i]);
+            var currentColorKeys = this._colorKeys;
+            var currentAlphaKeys = this._alphaKeys;
+            for(var i = 0, n = currentColorKeys.length; i < n; i++){
+                currentColorKeys[i]._onValueChanged = null;
             }
-            for(var i1 = 0, n1 = alphaKeys.length; i1 < n1; i1++){
-                this._addKey(this._alphaKeys, alphaKeys[i1]);
+            for(var i1 = 0, n1 = currentAlphaKeys.length; i1 < n1; i1++){
+                currentAlphaKeys[i1]._onValueChanged = null;
+            }
+            currentColorKeys.length = 0;
+            currentAlphaKeys.length = 0;
+            for(var i2 = 0, n2 = colorKeys.length; i2 < n2; i2++){
+                this._addKey(currentColorKeys, colorKeys[i2]);
+            }
+            for(var i3 = 0, n3 = alphaKeys.length; i3 < n3; i3++){
+                this._addKey(currentAlphaKeys, alphaKeys[i3]);
             }
             this._alphaTypeArrayDirty = true;
             this._colorTypeArrayDirty = true;
@@ -32382,6 +32403,12 @@
         _proto._removeKey = function _removeKey(keys, index) {
             keys.splice(index, 1);
         };
+        _proto._setColorTypeArrayDirty = function _setColorTypeArrayDirty() {
+            this._colorTypeArrayDirty = true;
+        };
+        _proto._setAlphaTypeArrayDirty = function _setAlphaTypeArrayDirty() {
+            this._alphaTypeArrayDirty = true;
+        };
         _create_class$3(ParticleGradient, [
             {
                 key: "colorKeys",
@@ -32416,16 +32443,80 @@
     ], ParticleGradient.prototype, "_alphaTypeArray", void 0);
     /**
      * The color key of the particle gradient.
-     */ var GradientColorKey = function GradientColorKey(time, color) {
-        this.time = time;
-        this.color = color;
-    };
+     */ var GradientColorKey = /*#__PURE__*/ function() {
+        var GradientColorKey = function GradientColorKey(time, color) {
+            /** @internal */ this._onValueChanged = null;
+            this._color = new Color$1();
+            this._time = time;
+            color && this._color.copyFrom(color);
+            // @ts-ignore
+            this._color._onValueChanged = this._onValueChanged;
+        };
+        _create_class$3(GradientColorKey, [
+            {
+                key: "time",
+                get: /**
+       * The key time.
+       */ function get() {
+                    return this._time;
+                },
+                set: function set(value) {
+                    this._time = value;
+                    this._onValueChanged && this._onValueChanged();
+                }
+            },
+            {
+                key: "color",
+                get: /**
+       * The key color.
+       */ function get() {
+                    return this._color;
+                },
+                set: function set(value) {
+                    if (this._color !== value) {
+                        this._color.copyFrom(value);
+                    }
+                }
+            }
+        ]);
+        return GradientColorKey;
+    }();
     /**
      * The alpha key of the particle gradient.
-     */ var GradientAlphaKey = function GradientAlphaKey(time, alpha) {
-        this.time = time;
-        this.alpha = alpha;
-    };
+     */ var GradientAlphaKey = /*#__PURE__*/ function() {
+        var GradientAlphaKey = function GradientAlphaKey(time, alpha) {
+            /** @internal */ this._onValueChanged = null;
+            this._time = time;
+            this._alpha = alpha;
+        };
+        _create_class$3(GradientAlphaKey, [
+            {
+                key: "time",
+                get: /**
+       * The key time.
+       */ function get() {
+                    return this._time;
+                },
+                set: function set(value) {
+                    this._time = value;
+                    this._onValueChanged && this._onValueChanged();
+                }
+            },
+            {
+                key: "alpha",
+                get: /**
+       * The key alpha.
+       */ function get() {
+                    return this._alpha;
+                },
+                set: function set(value) {
+                    this._alpha = value;
+                    this._onValueChanged && this._onValueChanged();
+                }
+            }
+        ]);
+        return GradientAlphaKey;
+    }();
     /**
      * Particle composite gradient.
      */ var ParticleCompositeGradient = /*#__PURE__*/ function() {
@@ -43521,7 +43612,7 @@
     ], GALACEAN_animation_event);
 
     //@ts-ignore
-    var version = "1.1.0-beta.24";
+    var version = "1.1.0-beta.25";
     console.log("Galacean engine version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);