@galacean/engine 1.1.0-beta.2 → 1.1.0-beta.4

package/dist/browser.js

@@ -17091,7 +17091,7 @@
         _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++){
@@ -17123,7 +17123,7 @@
                 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;
@@ -22381,11 +22381,6 @@
         ]);
         return Light;
     }(Component);
-    (function() {
-        /**
-       * Each type of light source is at most 10, beyond which it will not take effect.
-       * */ Light._maxLight = 10;
-    })();
     __decorate$1([
         ignoreClone
     ], Light.prototype, "_lightIndex", void 0);
@@ -22402,13 +22397,12 @@
         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;
@@ -22437,8 +22431,7 @@
         };
         /**
        * @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);
@@ -22481,13 +22474,6 @@
     (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.
      */ var PointLight = /*#__PURE__*/ function(Light1) {
@@ -22501,14 +22487,13 @@
         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;
@@ -22538,8 +22523,7 @@
         };
         /**
        * @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);
@@ -22577,14 +22561,6 @@
     (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.
      */ var SpotLight = /*#__PURE__*/ function(Light1) {
@@ -22602,7 +22578,7 @@
         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;
@@ -22613,7 +22589,6 @@
             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;
@@ -22648,8 +22623,7 @@
         };
         /**
        * @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);
@@ -22719,25 +22693,34 @@
     (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.
      */ var LightManager = /*#__PURE__*/ function() {
-        var LightManager = function LightManager() {
+        function LightManager() {
             /** @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;
         /**
        * @internal
@@ -22796,38 +22779,34 @@
         /**
        * @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");
@@ -22868,6 +22847,11 @@
         };
         return LightManager;
     }();
+    (function() {
+        /**
+       * Each type of light source is at most 10, beyond which it will not take effect.
+       * */ LightManager._maxLight = 10;
+    })();
     /**
      * Scene.
      */ var Scene = /*#__PURE__*/ function(EngineObject1) {
@@ -23601,7 +23585,7 @@
         _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;
@@ -23631,7 +23615,7 @@
                 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);
             }
         };
@@ -28948,16 +28932,22 @@
     /**
      * @internal
      */ var BlendShapeWeightsAnimationCurveOwnerAssembler = /*#__PURE__*/ function() {
-        var BlendShapeWeightsAnimationCurveOwnerAssembler = function BlendShapeWeightsAnimationCurveOwnerAssembler() {};
+        var 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;
     }();
@@ -32298,15 +32288,13 @@
             /** 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 Color$1(1, 1, 1, 1));
             /** A scale that this Particle Generator applies to gravity, defined by Physics.gravity. */ this.gravityModifier = new ParticleCompositeCurve(0);
@@ -32409,6 +32397,17 @@
                         }
                     }
                 }
+            },
+            {
+                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;
@@ -32452,9 +32451,6 @@
     __decorate$1([
         deepClone
     ], MainModule.prototype, "startSpeed", void 0);
-    __decorate$1([
-        deepClone
-    ], MainModule.prototype, "startSize", void 0);
     __decorate$1([
         deepClone
     ], MainModule.prototype, "startSizeX", void 0);
@@ -32464,9 +32460,6 @@
     __decorate$1([
         deepClone
     ], MainModule.prototype, "startSizeZ", void 0);
-    __decorate$1([
-        deepClone
-    ], MainModule.prototype, "startRotation", void 0);
     __decorate$1([
         deepClone
     ], MainModule.prototype, "startRotationX", void 0);
@@ -32474,7 +32467,6 @@
         deepClone
     ], MainModule.prototype, "startRotationY", void 0);
     __decorate$1([
-        deepClone,
         deepClone
     ], MainModule.prototype, "startRotationZ", void 0);
     __decorate$1([
@@ -32513,7 +32505,7 @@
         var RotationOverLifetimeModule = 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);
@@ -32865,9 +32857,6 @@
         _inherits$2(TextureSheetAnimationModule, ParticleGeneratorModule1);
         var _proto = TextureSheetAnimationModule.prototype;
         /**
-       * @inheritDoc
-       */ _proto.cloneTo = function cloneTo(dest) {};
-        /**
        * @internal
        */ _proto._updateShaderData = function _updateShaderData(shaderData) {
             var frameMacro = null;
@@ -33353,7 +33342,7 @@
                 instanceVertices[offset + 16] = MathUtil$1.degreeToRadian(main.startRotationY.evaluate(undefined, startRotationRand.random()));
                 instanceVertices[offset + 17] = MathUtil$1.degreeToRadian(main.startRotationZ.evaluate(undefined, startRotationRand.random()));
             } else {
-                instanceVertices[offset + 15] = MathUtil$1.degreeToRadian(main.startRotation.evaluate(undefined, startRotationRand.random()));
+                instanceVertices[offset + 15] = MathUtil$1.degreeToRadian(main.startRotationZ.evaluate(undefined, startRotationRand.random()));
             }
             // Start speed
             instanceVertices[offset + 18] = startSpeed;
@@ -40473,12 +40462,12 @@
                             if (curve2.interpolation === exports.InterpolationType.CubicSpine) {
                                 keyframe2.inTangent = Array.from(output.subarray(offset2, offset2 + outputSize));
                                 offset2 += outputSize;
-                                keyframe2.value = output.subarray(offset2, offset2 + outputSize);
+                                keyframe2.value = output.slice(offset2, offset2 + outputSize);
                                 offset2 += outputSize;
                                 keyframe2.outTangent = Array.from(output.subarray(offset2, offset2 + outputSize));
                                 offset2 += outputSize;
                             } else {
-                                keyframe2.value = output.subarray(offset2, offset2 + outputSize);
+                                keyframe2.value = output.slice(offset2, offset2 + outputSize);
                                 offset2 += outputSize;
                             }
                             curve2.addKey(keyframe2);
@@ -42906,7 +42895,7 @@
     ], GALACEAN_animation_event);
 
     //@ts-ignore
-    var version = "1.1.0-beta.2";
+    var version = "1.1.0-beta.4";
     console.log("Galacean engine version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);