@galacean/engine-core 1.1.0-beta.23 → 1.1.0-beta.25

package/dist/main.js

@@ -3527,9 +3527,9 @@ var rePropName$1 = RegExp(// Match anything that isn't a dot or bracket.
         if (relativeToLocal) {
             var _tempVec30 = Transform._tempVec30;
             engineMath.Vector3.transformByQuat(translation, this.worldRotationQuaternion, _tempVec30);
-            this._worldPosition.add(_tempVec30);
+            this.worldPosition.add(_tempVec30);
         } else {
-            this._worldPosition.add(translation);
+            this.worldPosition.add(translation);
         }
     };
     _proto._rotateXYZ = function _rotateXYZ(x, y, z, relativeToLocal) {
@@ -5028,7 +5028,7 @@ var begin_position_vert = "#define GLSLIFY 1\nvec4 position=vec4(POSITION,1.0);"
 
 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
 
@@ -6696,6 +6696,9 @@ __decorate([
                 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") {
@@ -6950,10 +6953,11 @@ __decorate([
         return this.getPropertyValue(property);
     };
     _proto.setTexture = function setTexture(property, value) {
-        if (this._getReferCount() > 0) {
+        var refCount = this._refCount;
+        if (refCount > 0) {
             var lastValue = this.getPropertyValue(property);
-            lastValue && lastValue._addReferCount(-1);
-            value && value._addReferCount(1);
+            lastValue && lastValue._addReferCount(-refCount);
+            value && value._addReferCount(refCount);
         }
         this._setPropertyValue(property, exports.ShaderPropertyType.Texture, value);
     };
@@ -6961,16 +6965,17 @@ __decorate([
         return this.getPropertyValue(property);
     };
     _proto.setTextureArray = function setTextureArray(property, value) {
-        if (this._getReferCount() > 0) {
+        var refCount = this._refCount;
+        if (refCount > 0) {
             var lastValue = this.getPropertyValue(property);
             if (lastValue) {
                 for(var i = 0, n = lastValue.length; i < n; i++){
-                    lastValue[i]._addReferCount(-1);
+                    lastValue[i]._addReferCount(-refCount);
                 }
             }
             if (value) {
                 for(var i1 = 0, n1 = value.length; i1 < n1; i1++){
-                    value[i1]._addReferCount(1);
+                    value[i1]._addReferCount(refCount);
                 }
             }
         }
@@ -27682,15 +27687,17 @@ __decorate([
             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;
     };
@@ -27698,6 +27705,7 @@ __decorate([
    * 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;
     };
@@ -27705,6 +27713,7 @@ __decorate([
    * 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;
     };
@@ -27713,13 +27722,21 @@ __decorate([
    * @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;
@@ -27780,6 +27797,12 @@ __decorate([
     _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(ParticleGradient, [
         {
             key: "colorKeys",
@@ -27814,16 +27837,80 @@ __decorate([
 ], 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() {
+    function GradientColorKey(time, color) {
+        /** @internal */ this._onValueChanged = null;
+        this._color = new engineMath.Color();
+        this._time = time;
+        color && this._color.copyFrom(color);
+        // @ts-ignore
+        this._color._onValueChanged = this._onValueChanged;
+    }
+    _create_class(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() {
+    function GradientAlphaKey(time, alpha) {
+        /** @internal */ this._onValueChanged = null;
+        this._time = time;
+        this._alpha = alpha;
+    }
+    _create_class(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.