@galacean/engine-core 1.1.0-beta.3 → 1.1.0-beta.4

package/dist/main.js

@@ -12313,7 +12313,7 @@ var SpriteMaskBatcher = /*#__PURE__*/ function(Basic2DBatcher1) {
     _proto.drawBatches = function drawBatches(camera) {
         var _this = this, engine = _this._engine, batchedQueue = _this._batchedQueue;
         var mesh = this._meshes[this._flushId];
-        var subMeshes = mesh.subMeshes;
+        var subMeshes = mesh.subMeshes, primitive = mesh._primitive;
         var sceneData = camera.scene.shaderData;
         var cameraData = camera.shaderData;
         for(var i = 0, len = subMeshes.length; i < len; i++){
@@ -12345,7 +12345,7 @@ var SpriteMaskBatcher = /*#__PURE__*/ function(Basic2DBatcher1) {
             program.uploadAll(program.rendererUniformBlock, renderer.shaderData);
             program.uploadAll(program.materialUniformBlock, material.shaderData);
             material.renderState._apply(engine, false, pass._renderStateDataMap, material.shaderData);
-            engine._hardwareRenderer.drawPrimitive(mesh._primitive, subMesh, program);
+            engine._hardwareRenderer.drawPrimitive(primitive, subMesh, program);
         }
     };
     return SpriteMaskBatcher;
@@ -17691,11 +17691,6 @@ ShaderPool.init();
     ]);
     return Light;
 }(Component);
-(function() {
-    /**
-   * Each type of light source is at most 10, beyond which it will not take effect.
-   * */ Light._maxLight = 10;
-})();
 __decorate([
     ignoreClone
 ], Light.prototype, "_lightIndex", void 0);
@@ -17713,13 +17708,12 @@ __decorate([
     var _proto = DirectLight.prototype;
     /**
    * @internal
-   */ _proto._appendData = function _appendData(lightIndex) {
+   */ _proto._appendData = function _appendData(lightIndex, data) {
         var cullingMaskStart = lightIndex * 2;
         var colorStart = lightIndex * 3;
         var directionStart = lightIndex * 3;
         var lightColor = this._getLightIntensityColor();
         var direction = this.direction;
-        var data = DirectLight._combinedData;
         var cullingMask = this.cullingMask;
         data.cullingMask[cullingMaskStart] = cullingMask & 65535;
         data.cullingMask[cullingMaskStart + 1] = cullingMask >>> 16 & 65535;
@@ -17748,8 +17742,7 @@ __decorate([
     };
     /**
    * @internal
-   */ DirectLight._updateShaderData = function _updateShaderData(shaderData) {
-        var data = DirectLight._combinedData;
+   */ DirectLight._updateShaderData = function _updateShaderData(shaderData, data) {
         shaderData.setIntArray(DirectLight._cullingMaskProperty, data.cullingMask);
         shaderData.setFloatArray(DirectLight._colorProperty, data.color);
         shaderData.setFloatArray(DirectLight._directionProperty, data.direction);
@@ -17792,13 +17785,6 @@ __decorate([
 (function() {
     DirectLight._directionProperty = ShaderProperty.getByName("scene_DirectLightDirection");
 })();
-(function() {
-    DirectLight._combinedData = {
-        cullingMask: new Int32Array(Light._maxLight * 2),
-        color: new Float32Array(Light._maxLight * 3),
-        direction: new Float32Array(Light._maxLight * 3)
-    };
-})();
 
 /**
  * Point light.
@@ -17813,14 +17799,13 @@ __decorate([
     var _proto = PointLight.prototype;
     /**
    * @internal
-   */ _proto._appendData = function _appendData(lightIndex) {
+   */ _proto._appendData = function _appendData(lightIndex, data) {
         var cullingMaskStart = lightIndex * 2;
         var colorStart = lightIndex * 3;
         var positionStart = lightIndex * 3;
         var distanceStart = lightIndex;
         var lightColor = this._getLightIntensityColor();
         var lightPosition = this.position;
-        var data = PointLight._combinedData;
         var cullingMask = this.cullingMask;
         data.cullingMask[cullingMaskStart] = cullingMask & 65535;
         data.cullingMask[cullingMaskStart + 1] = cullingMask >>> 16 & 65535;
@@ -17850,8 +17835,7 @@ __decorate([
     };
     /**
    * @internal
-   */ PointLight._updateShaderData = function _updateShaderData(shaderData) {
-        var data = PointLight._combinedData;
+   */ PointLight._updateShaderData = function _updateShaderData(shaderData, data) {
         shaderData.setIntArray(PointLight._cullingMaskProperty, data.cullingMask);
         shaderData.setFloatArray(PointLight._colorProperty, data.color);
         shaderData.setFloatArray(PointLight._positionProperty, data.position);
@@ -17889,14 +17873,6 @@ __decorate([
 (function() {
     PointLight._distanceProperty = ShaderProperty.getByName("scene_PointLightDistance");
 })();
-(function() {
-    PointLight._combinedData = {
-        cullingMask: new Int32Array(Light._maxLight * 2),
-        color: new Float32Array(Light._maxLight * 3),
-        position: new Float32Array(Light._maxLight * 3),
-        distance: new Float32Array(Light._maxLight)
-    };
-})();
 
 /**
  * Spot light.
@@ -17915,7 +17891,7 @@ __decorate([
     var _proto = SpotLight.prototype;
     /**
    * @internal
-   */ _proto._appendData = function _appendData(lightIndex) {
+   */ _proto._appendData = function _appendData(lightIndex, data) {
         var cullingMaskStart = lightIndex * 2;
         var colorStart = lightIndex * 3;
         var positionStart = lightIndex * 3;
@@ -17926,7 +17902,6 @@ __decorate([
         var lightColor = this._getLightIntensityColor();
         var position = this.position;
         var direction = this.direction;
-        var data = SpotLight._combinedData;
         var cullingMask = this.cullingMask;
         data.cullingMask[cullingMaskStart] = cullingMask & 65535;
         data.cullingMask[cullingMaskStart + 1] = cullingMask >>> 16 & 65535;
@@ -17961,8 +17936,7 @@ __decorate([
     };
     /**
    * @internal
-   */ SpotLight._updateShaderData = function _updateShaderData(shaderData) {
-        var data = SpotLight._combinedData;
+   */ SpotLight._updateShaderData = function _updateShaderData(shaderData, data) {
         shaderData.setIntArray(SpotLight._cullingMaskProperty, data.cullingMask);
         shaderData.setFloatArray(SpotLight._colorProperty, data.color);
         shaderData.setFloatArray(SpotLight._positionProperty, data.position);
@@ -18032,17 +18006,6 @@ __decorate([
 (function() {
     SpotLight._penumbraCosProperty = ShaderProperty.getByName("scene_SpotLightPenumbraCos");
 })();
-(function() {
-    SpotLight._combinedData = {
-        cullingMask: new Int32Array(Light._maxLight * 2),
-        color: new Float32Array(Light._maxLight * 3),
-        position: new Float32Array(Light._maxLight * 3),
-        direction: new Float32Array(Light._maxLight * 3),
-        distance: new Float32Array(Light._maxLight),
-        angleCos: new Float32Array(Light._maxLight),
-        penumbraCos: new Float32Array(Light._maxLight)
-    };
-})();
 
 /**
  * Light manager.
@@ -18051,6 +18014,26 @@ __decorate([
         /** @internal */ this._spotLights = new DisorderedArray();
         /** @internal */ this._pointLights = new DisorderedArray();
         /** @internal */ this._directLights = new DisorderedArray();
+        this._directData = {
+            cullingMask: new Int32Array(LightManager._maxLight * 2),
+            color: new Float32Array(LightManager._maxLight * 3),
+            direction: new Float32Array(LightManager._maxLight * 3)
+        };
+        this._pointData = {
+            cullingMask: new Int32Array(LightManager._maxLight * 2),
+            color: new Float32Array(LightManager._maxLight * 3),
+            position: new Float32Array(LightManager._maxLight * 3),
+            distance: new Float32Array(LightManager._maxLight)
+        };
+        this._spotData = {
+            cullingMask: new Int32Array(LightManager._maxLight * 2),
+            color: new Float32Array(LightManager._maxLight * 3),
+            position: new Float32Array(LightManager._maxLight * 3),
+            direction: new Float32Array(LightManager._maxLight * 3),
+            distance: new Float32Array(LightManager._maxLight),
+            angleCos: new Float32Array(LightManager._maxLight),
+            penumbraCos: new Float32Array(LightManager._maxLight)
+        };
     }
     var _proto = LightManager.prototype;
     /**
@@ -18110,38 +18093,34 @@ __decorate([
     /**
    * @internal
    */ _proto._updateShaderData = function _updateShaderData(shaderData) {
-        var spotLight = this._spotLights;
-        var pointLight = this._pointLights;
-        var directLight = this._directLights;
+        var _this = this, spotLight = _this._spotLights, pointLight = _this._pointLights, directLight = _this._directLights;
+        var _this1 = this, spotData = _this1._spotData, pointData = _this1._pointData, directData = _this1._directData;
         var spotLightCount = spotLight.length;
         var pointLightCount = pointLight.length;
         var directLightCount = directLight.length;
-        for(var i = 0, len = spotLightCount; i < len; i++){
-            var light = spotLight.get(i);
-            light._appendData(i);
+        for(var i = 0; i < spotLightCount; i++){
+            spotLight.get(i)._appendData(i, spotData);
         }
-        for(var i1 = 0, len1 = pointLightCount; i1 < len1; i1++){
-            var light1 = pointLight.get(i1);
-            light1._appendData(i1);
+        for(var i1 = 0; i1 < pointLightCount; i1++){
+            pointLight.get(i1)._appendData(i1, pointData);
         }
-        for(var i2 = 0, len2 = directLightCount; i2 < len2; i2++){
-            var light2 = directLight.get(i2);
-            light2._appendData(i2);
+        for(var i2 = 0; i2 < directLightCount; i2++){
+            directLight.get(i2)._appendData(i2, directData);
         }
         if (directLightCount) {
-            DirectLight._updateShaderData(shaderData);
+            DirectLight._updateShaderData(shaderData, directData);
             shaderData.enableMacro("SCENE_DIRECT_LIGHT_COUNT", directLightCount.toString());
         } else {
             shaderData.disableMacro("SCENE_DIRECT_LIGHT_COUNT");
         }
         if (pointLightCount) {
-            PointLight._updateShaderData(shaderData);
+            PointLight._updateShaderData(shaderData, pointData);
             shaderData.enableMacro("SCENE_POINT_LIGHT_COUNT", pointLightCount.toString());
         } else {
             shaderData.disableMacro("SCENE_POINT_LIGHT_COUNT");
         }
         if (spotLightCount) {
-            SpotLight._updateShaderData(shaderData);
+            SpotLight._updateShaderData(shaderData, spotData);
             shaderData.enableMacro("SCENE_SPOT_LIGHT_COUNT", spotLightCount.toString());
         } else {
             shaderData.disableMacro("SCENE_SPOT_LIGHT_COUNT");
@@ -18182,6 +18161,11 @@ __decorate([
     };
     return LightManager;
 }();
+(function() {
+    /**
+   * Each type of light source is at most 10, beyond which it will not take effect.
+   * */ LightManager._maxLight = 10;
+})();
 
 /**
  * Scene.
@@ -18920,7 +18904,7 @@ var passNum = 0;
     _proto.drawBatches = function drawBatches(camera) {
         var _this = this, engine = _this._engine, batchedQueue = _this._batchedQueue;
         var mesh = this._meshes[this._flushId];
-        var subMeshes = mesh.subMeshes;
+        var subMeshes = mesh.subMeshes, primitive = mesh._primitive;
         var maskManager = engine._spriteMaskManager;
         var sceneData = camera.scene.shaderData;
         var cameraData = camera.shaderData;
@@ -18950,7 +18934,7 @@ var passNum = 0;
             program.uploadAll(program.rendererUniformBlock, renderer.shaderData);
             program.uploadAll(program.materialUniformBlock, material.shaderData);
             material.renderState._apply(engine, false, shaderPass._renderStateDataMap, material.shaderData);
-            engine._hardwareRenderer.drawPrimitive(mesh._primitive, subMesh, program);
+            engine._hardwareRenderer.drawPrimitive(primitive, subMesh, program);
             maskManager.postRender(renderer);
         }
     };
@@ -24307,16 +24291,22 @@ AnimationCurveOwner.registerAssembler(Transform, "scale", ScaleAnimationCurveOwn
 /**
  * @internal
  */ var BlendShapeWeightsAnimationCurveOwnerAssembler = /*#__PURE__*/ function() {
-    function BlendShapeWeightsAnimationCurveOwnerAssembler() {}
+    function BlendShapeWeightsAnimationCurveOwnerAssembler() {
+        this._skinnedMeshRenderer = [];
+    }
     var _proto = BlendShapeWeightsAnimationCurveOwnerAssembler.prototype;
     _proto.initialize = function initialize(owner) {
-        this._skinnedMeshRenderer = owner.target.getComponent(SkinnedMeshRenderer);
+        // @todo: Compatible with multiple SkinnedMeshRenderer in a entity, optimize later.
+        owner.target.getComponents(SkinnedMeshRenderer, this._skinnedMeshRenderer);
     };
     _proto.getTargetValue = function getTargetValue() {
-        return this._skinnedMeshRenderer.blendShapeWeights;
+        return this._skinnedMeshRenderer[0].blendShapeWeights;
     };
     _proto.setTargetValue = function setTargetValue(value) {
-        this._skinnedMeshRenderer.blendShapeWeights = value;
+        var skinnedMeshRenderer = this._skinnedMeshRenderer;
+        for(var i = 0, n = skinnedMeshRenderer.length; i < n; i++){
+            skinnedMeshRenderer[i].blendShapeWeights = value;
+        }
     };
     return BlendShapeWeightsAnimationCurveOwnerAssembler;
 }();
@@ -27713,15 +27703,13 @@ var MainModule = /*#__PURE__*/ function() {
         /** The initial lifetime of particles when emitted. */ this.startLifetime = new ParticleCompositeCurve(5);
         /** The initial speed of particles when the Particle Generator first spawns them. */ this.startSpeed = new ParticleCompositeCurve(5);
         /** A flag to enable specifying particle size individually for each axis. */ this.startSize3D = false;
-        /** The initial size of particles when the Particle Generator first spawns them. */ this.startSize = new ParticleCompositeCurve(1);
         /** The initial size of particles along the x-axis when the Particle Generator first spawns them. */ this.startSizeX = new ParticleCompositeCurve(1);
         /** The initial size of particles along the y-axis when the Particle Generator first spawns them. */ this.startSizeY = new ParticleCompositeCurve(1);
         /** The initial size of particles along the z-axis when the Particle Generator first spawns them. */ this.startSizeZ = new ParticleCompositeCurve(1);
-        /** A flag to enable 3D particle rotation. */ this.startRotation3D = false;
-        /** The initial rotation of particles when the Particle Generator first spawns them. */ this.startRotation = new ParticleCompositeCurve(0);
+        /** A flag to enable 3D particle rotation, when disabled, only `startRotationZ` is used. */ this.startRotation3D = false;
         /** The initial rotation of particles around the x-axis when emitted.*/ this.startRotationX = new ParticleCompositeCurve(0);
         /** The initial rotation of particles around the y-axis when emitted. */ this.startRotationY = new ParticleCompositeCurve(0);
-        this.startRotationZ = new ParticleCompositeCurve(0);
+        /** The initial rotation of particles around the z-axis when emitted. */ this.startRotationZ = new ParticleCompositeCurve(0);
         /** Makes some particles spin in the opposite direction. */ this.flipRotation = 0;
         /** The mode of start color */ this.startColor = new ParticleCompositeGradient(new engineMath.Color(1, 1, 1, 1));
         /** A scale that this Particle Generator applies to gravity, defined by Physics.gravity. */ this.gravityModifier = new ParticleCompositeCurve(0);
@@ -27824,6 +27812,17 @@ var MainModule = /*#__PURE__*/ function() {
                     }
                 }
             }
+        },
+        {
+            key: "startSize",
+            get: /**
+   * The initial size of particles when the Particle Generator first spawns them.
+   */ function get() {
+                return this.startSizeX;
+            },
+            set: function set(value) {
+                this.startSizeX = value;
+            }
         }
     ]);
     return MainModule;
@@ -27867,9 +27866,6 @@ __decorate([
 __decorate([
     deepClone
 ], MainModule.prototype, "startSpeed", void 0);
-__decorate([
-    deepClone
-], MainModule.prototype, "startSize", void 0);
 __decorate([
     deepClone
 ], MainModule.prototype, "startSizeX", void 0);
@@ -27879,9 +27875,6 @@ __decorate([
 __decorate([
     deepClone
 ], MainModule.prototype, "startSizeZ", void 0);
-__decorate([
-    deepClone
-], MainModule.prototype, "startRotation", void 0);
 __decorate([
     deepClone
 ], MainModule.prototype, "startRotationX", void 0);
@@ -27889,7 +27882,6 @@ __decorate([
     deepClone
 ], MainModule.prototype, "startRotationY", void 0);
 __decorate([
-    deepClone,
     deepClone
 ], MainModule.prototype, "startRotationZ", void 0);
 __decorate([
@@ -27930,7 +27922,7 @@ __decorate([
     function RotationOverLifetimeModule() {
         var _this;
         _this = ParticleGeneratorModule1.apply(this, arguments) || this;
-        /** Specifies whether the rotation is separate on each axis, when disabled only z axis is used. */ _this.separateAxes = false;
+        /** Specifies whether the rotation is separate on each axis, when disabled, only `rotationZ` is used. */ _this.separateAxes = false;
         /** Rotation over lifetime for z axis. */ _this.rotationX = new ParticleCompositeCurve(0);
         /** Rotation over lifetime for z axis. */ _this.rotationY = new ParticleCompositeCurve(0);
         /** Rotation over lifetime for z axis. */ _this.rotationZ = new ParticleCompositeCurve(45);
@@ -28284,9 +28276,6 @@ __decorate([
     }
     var _proto = TextureSheetAnimationModule.prototype;
     /**
-   * @inheritDoc
-   */ _proto.cloneTo = function cloneTo(dest) {};
-    /**
    * @internal
    */ _proto._updateShaderData = function _updateShaderData(shaderData) {
         var frameMacro = null;
@@ -28774,7 +28763,7 @@ __decorate([
             instanceVertices[offset + 16] = engineMath.MathUtil.degreeToRadian(main.startRotationY.evaluate(undefined, startRotationRand.random()));
             instanceVertices[offset + 17] = engineMath.MathUtil.degreeToRadian(main.startRotationZ.evaluate(undefined, startRotationRand.random()));
         } else {
-            instanceVertices[offset + 15] = engineMath.MathUtil.degreeToRadian(main.startRotation.evaluate(undefined, startRotationRand.random()));
+            instanceVertices[offset + 15] = engineMath.MathUtil.degreeToRadian(main.startRotationZ.evaluate(undefined, startRotationRand.random()));
         }
         // Start speed
         instanceVertices[offset + 18] = startSpeed;