@galacean/engine 1.1.0-beta.39 → 1.1.0-beta.43

package/dist/browser.js

@@ -16615,7 +16615,7 @@
                 var theta = thetaStart + u * thetaRange;
                 var sinTheta = Math.sin(theta);
                 var cosTheta = Math.cos(theta);
-                var curRadius = radius - y * radius;
+                var curRadius = radius - v * radius;
                 var posX = curRadius * sinTheta;
                 var posY = y * unitHeight - halfHeight;
                 var posZ = curRadius * cosTheta;
@@ -16749,8 +16749,8 @@
                 indices[indicesOffset++] = d;
                 indices[indicesOffset++] = c;
             }
-            PrimitiveMesh._createCapsuleCap(radius, height, radialSegments, thetaRange, torsoVertexCount, 1, vertices, indices, indicesOffset);
-            PrimitiveMesh._createCapsuleCap(radius, height, radialSegments, -thetaRange, torsoVertexCount + capVertexCount, -1, vertices, indices, indicesOffset + 6 * capRectangleCount);
+            PrimitiveMesh._createCapsuleCap(radius, height, radialSegments, thetaStart, thetaRange, torsoVertexCount, 1, vertices, indices, indicesOffset);
+            PrimitiveMesh._createCapsuleCap(radius, height, radialSegments, thetaStart, -thetaRange, torsoVertexCount + capVertexCount, -1, vertices, indices, indicesOffset + 6 * capRectangleCount);
             if (!isRestoreMode) {
                 var bounds = capsuleMesh.bounds;
                 bounds.min.set(-radius, -radius - halfHeight, -radius);
@@ -16791,7 +16791,7 @@
             }
             return indices;
         };
-        PrimitiveMesh._createCapsuleCap = function _createCapsuleCap(radius, height, radialSegments, capAlphaRange, offset, posIndex, vertices, indices, indicesOffset) {
+        PrimitiveMesh._createCapsuleCap = function _createCapsuleCap(radius, height, radialSegments, thetaStart, thetaRange, offset, posIndex, vertices, indices, indicesOffset) {
             var radialCount = radialSegments + 1;
             var halfHeight = height * 0.5 * posIndex;
             var capVertexCount = radialCount * radialCount;
@@ -16804,12 +16804,12 @@
                 var y = i * radialCountReciprocal | 0;
                 var u = x * radialSegmentsReciprocal;
                 var v = y * radialSegmentsReciprocal;
-                var alphaDelta = u * capAlphaRange;
-                var thetaDelta = v * Math.PI / 2;
-                var sinTheta = Math.sin(thetaDelta);
-                var posX = -radius * Math.cos(alphaDelta) * sinTheta;
-                var posY = radius * Math.cos(thetaDelta) * posIndex + halfHeight;
-                var posZ = radius * Math.sin(alphaDelta) * sinTheta;
+                var theta = thetaStart + u * thetaRange;
+                var alpha = v * Math.PI * 0.5;
+                var sinAlpha = Math.sin(alpha);
+                var posX = radius * Math.sin(theta) * sinAlpha;
+                var posY = radius * Math.cos(alpha) * posIndex + halfHeight;
+                var posZ = radius * Math.cos(theta) * sinAlpha;
                 var index = (i + offset) * vertexFloatCount;
                 // Position
                 vertices[index++] = posX;
@@ -17329,7 +17329,9 @@
             this._batchedQueue = null;
             var _this = this, meshes = _this._meshes, vertexBuffers = _this._vertexBuffers, indiceBuffers = _this._indiceBuffers;
             for(var i = 0, n = meshes.length; i < n; ++i){
-                meshes[i].destroy();
+                var mesh = meshes[i];
+                mesh._addReferCount(-1);
+                mesh.destroy();
             }
             this._meshes = null;
             for(var i1 = 0, n1 = vertexBuffers.length; i1 < n1; ++i1){
@@ -17352,7 +17354,7 @@
         _proto._createMesh = function _createMesh(engine, index) {
             var MAX_VERTEX_COUNT = Basic2DBatcher.MAX_VERTEX_COUNT;
             var mesh = new BufferMesh(engine, "BufferMesh" + index);
-            mesh.isGCIgnored = true;
+            mesh._addReferCount(1);
             var vertexElements = [];
             var vertexStride = this.createVertexElements(vertexElements);
             // vertices
@@ -24318,6 +24320,46 @@
     (function() {
         /** @internal Conversion of space units to pixel units for 2D. */ Engine._pixelsPerUnit = 100;
     })();
+    /**
+     * Canvas.
+     */ var Canvas = /*#__PURE__*/ function() {
+        var Canvas = function Canvas() {
+            /* @internal */ this._sizeUpdateFlagManager = new UpdateFlagManager();
+        };
+        _create_class$3(Canvas, [
+            {
+                key: "width",
+                get: /**
+       * The width of the canvas.
+       */ function get() {
+                    return this._width;
+                },
+                set: function set(value) {
+                    if (this._width !== value) {
+                        this._width = value;
+                        this._sizeUpdateFlagManager.dispatch();
+                        this._onSizeChanged(value, this._width);
+                    }
+                }
+            },
+            {
+                key: "height",
+                get: /**
+       *The height of the canvas.
+       */ function get() {
+                    return this._height;
+                },
+                set: function set(value) {
+                    if (this._height !== value) {
+                        this._height = value;
+                        this._sizeUpdateFlagManager.dispatch();
+                        this._onSizeChanged(this._width, value);
+                    }
+                }
+            }
+        ]);
+        return Canvas;
+    }();
     /**
      * The Background mode enumeration.
      */ exports.BackgroundMode = void 0;
@@ -27894,7 +27936,6 @@
             _this._viewport = new Vector4(0, 0, 1, 1);
             _this._pixelViewport = new Rect(0, 0, 0, 0);
             _this._inverseProjectionMatrix = new Matrix();
-            _this._lastAspectSize = new Vector2(0, 0);
             _this._invViewProjMat = new Matrix();
             var transform = _this.entity.transform;
             _this._transform = transform;
@@ -27904,6 +27945,10 @@
             _this._renderPipeline = new BasicRenderPipeline(_assert_this_initialized(_this));
             _this.shaderData._addReferCount(1);
             _this._updatePixelViewport();
+            _this._onPixelViewportChanged = _this._onPixelViewportChanged.bind(_assert_this_initialized(_this));
+            //@ts-ignore
+            _this._viewport._onValueChanged = _this._onPixelViewportChanged;
+            _this.engine.canvas._sizeUpdateFlagManager.addListener(_this._onPixelViewportChanged);
             return _this;
         };
         _inherits$2(Camera1, Component1);
@@ -28093,6 +28138,9 @@
             this._isInvViewProjDirty.destroy();
             this._isViewMatrixDirty.destroy();
             this.shaderData._addReferCount(-1);
+            //@ts-ignore
+            this._viewport._onValueChanged = null;
+            this.engine.canvas._sizeUpdateFlagManager.removeListener(this._onPixelViewportChanged);
             this._entity = null;
             this._globalShaderMacro = null;
             this._frustum = null;
@@ -28105,16 +28153,20 @@
             this._isInvViewProjDirty = null;
             this._viewport = null;
             this._inverseProjectionMatrix = null;
-            this._lastAspectSize = null;
             this._invViewProjMat = null;
         };
         _proto._updatePixelViewport = function _updatePixelViewport() {
-            var _this__renderTarget, _this__renderTarget1;
+            var width, height;
+            var renderTarget = this._renderTarget;
+            if (renderTarget) {
+                width = renderTarget.width;
+                height = renderTarget.height;
+            } else {
+                var canvas = this.engine.canvas;
+                width = canvas.width;
+                height = canvas.height;
+            }
             var viewport = this._viewport;
-            var _this__renderTarget_width;
-            var width = (_this__renderTarget_width = (_this__renderTarget = this._renderTarget) == null ? void 0 : _this__renderTarget.width) != null ? _this__renderTarget_width : this.engine.canvas.width;
-            var _this__renderTarget_height;
-            var height = (_this__renderTarget_height = (_this__renderTarget1 = this._renderTarget) == null ? void 0 : _this__renderTarget1.height) != null ? _this__renderTarget_height : this.engine.canvas.height;
             this._pixelViewport.set(viewport.x * width, viewport.y * height, viewport.z * width, viewport.w * height);
         };
         _proto._projMatChange = function _projMatChange() {
@@ -28161,6 +28213,11 @@
             }
             return this._inverseProjectionMatrix;
         };
+        _proto._onPixelViewportChanged = function _onPixelViewportChanged() {
+            this._updatePixelViewport();
+            var _this__customAspectRatio;
+            (_this__customAspectRatio = this._customAspectRatio) != null ? _this__customAspectRatio : this._projMatChange();
+        };
         _create_class$3(Camera1, [
             {
                 key: "shaderData",
@@ -28234,8 +28291,6 @@
                     if (value !== this._viewport) {
                         this._viewport.copyFrom(value);
                     }
-                    this._projMatChange();
-                    this._updatePixelViewport();
                 }
             },
             {
@@ -28308,13 +28363,10 @@
                 get: function get() {
                     var virtualCamera = this._virtualCamera;
                     var projectionMatrix = virtualCamera.projectionMatrix;
-                    var canvas = this._entity.engine.canvas;
-                    if ((!this._isProjectionDirty || this._isProjMatSetting) && this._lastAspectSize.x === canvas.width && this._lastAspectSize.y === canvas.height) {
+                    if (!this._isProjectionDirty || this._isProjMatSetting) {
                         return projectionMatrix;
                     }
                     this._isProjectionDirty = false;
-                    this._lastAspectSize.x = canvas.width;
-                    this._lastAspectSize.y = canvas.height;
                     var aspectRatio = this.aspectRatio;
                     if (!virtualCamera.isOrthographic) {
                         Matrix.perspective(MathUtil$1.degreeToRadian(this._fieldOfView), aspectRatio, this._nearClipPlane, this._farClipPlane, projectionMatrix);
@@ -28360,7 +28412,7 @@
                         (_value = value) == null ? void 0 : _value._addReferCount(1);
                         (_this__renderTarget = this._renderTarget) == null ? void 0 : _this__renderTarget._addReferCount(-1);
                         this._renderTarget = value;
-                        this._updatePixelViewport();
+                        this._onPixelViewportChanged();
                     }
                 }
             }
@@ -28409,12 +28461,12 @@
     __decorate$1([
         deepClone
     ], exports.Camera.prototype, "_inverseProjectionMatrix", void 0);
-    __decorate$1([
-        deepClone
-    ], exports.Camera.prototype, "_lastAspectSize", void 0);
     __decorate$1([
         deepClone
     ], exports.Camera.prototype, "_invViewProjMat", void 0);
+    __decorate$1([
+        ignoreClone
+    ], exports.Camera.prototype, "_onPixelViewportChanged", null);
     exports.Camera = __decorate$1([
         dependentComponents(Transform, exports.DependentMode.CheckOnly)
     ], exports.Camera);
@@ -35459,6 +35511,7 @@
         Burst: Burst,
         get Camera () { return exports.Camera; },
         get CameraClearFlags () { return exports.CameraClearFlags; },
+        Canvas: Canvas,
         CapsuleColliderShape: CapsuleColliderShape,
         CharacterController: CharacterController,
         CircleShape: CircleShape,
@@ -35716,6 +35769,26 @@
         if (staticProps) _defineProperties$2(Constructor, staticProps);
         return Constructor;
     }
+    function _set_prototype_of$1(o, p) {
+        _set_prototype_of$1 = Object.setPrototypeOf || function setPrototypeOf(o, p) {
+            o.__proto__ = p;
+            return o;
+        };
+        return _set_prototype_of$1(o, p);
+    }
+    function _inherits$1(subClass, superClass) {
+        if (typeof superClass !== "function" && superClass !== null) {
+            throw new TypeError("Super expression must either be null or a function");
+        }
+        subClass.prototype = Object.create(superClass && superClass.prototype, {
+            constructor: {
+                value: subClass,
+                writable: true,
+                configurable: true
+            }
+        });
+        if (superClass) _set_prototype_of$1(subClass, superClass);
+    }
     function _instanceof1$1(left, right) {
         if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
             return !!right[Symbol.hasInstance](left);
@@ -35723,15 +35796,19 @@
     }
     /**
      * The canvas used on the web, which can support HTMLCanvasElement and OffscreenCanvas.
-     */ var WebCanvas = /*#__PURE__*/ function() {
+     */ var WebCanvas = /*#__PURE__*/ function(Canvas1) {
         var WebCanvas = function WebCanvas(webCanvas) {
-            this._scale = new Vector2();
+            var _this;
+            _this = Canvas1.call(this) || this;
+            _this._scale = new Vector2();
             var width = webCanvas.width;
             var height = webCanvas.height;
-            this._webCanvas = webCanvas;
-            this._width = width;
-            this._height = height;
+            _this._webCanvas = webCanvas;
+            _this.width = width;
+            _this.height = height;
+            return _this;
         };
+        _inherits$1(WebCanvas, Canvas1);
         var _proto = WebCanvas.prototype;
         /**
        * Resize the rendering size according to the clientWidth and clientHeight of the canvas.
@@ -35752,35 +35829,11 @@
             this._scale.set(x, y);
             this.scale = this._scale;
         };
+        _proto._onSizeChanged = function _onSizeChanged(width, height) {
+            this._webCanvas.width = width;
+            this._webCanvas.height = height;
+        };
         _create_class$2(WebCanvas, [
-            {
-                key: "width",
-                get: /**
-       * @inheritdoc
-       */ function get() {
-                    return this._width;
-                },
-                set: function set(value) {
-                    if (this._width !== value) {
-                        this._webCanvas.width = value;
-                        this._width = value;
-                    }
-                }
-            },
-            {
-                key: "height",
-                get: /**
-       * @inheritdoc
-       */ function get() {
-                    return this._height;
-                },
-                set: function set(value) {
-                    if (this._height !== value) {
-                        this._webCanvas.height = value;
-                        this._height = value;
-                    }
-                }
-            },
             {
                 key: "scale",
                 get: /**
@@ -35803,27 +35856,7 @@
             }
         ]);
         return WebCanvas;
-    }();
-    function _set_prototype_of$1(o, p) {
-        _set_prototype_of$1 = Object.setPrototypeOf || function setPrototypeOf(o, p) {
-            o.__proto__ = p;
-            return o;
-        };
-        return _set_prototype_of$1(o, p);
-    }
-    function _inherits$1(subClass, superClass) {
-        if (typeof superClass !== "function" && superClass !== null) {
-            throw new TypeError("Super expression must either be null or a function");
-        }
-        subClass.prototype = Object.create(superClass && superClass.prototype, {
-            constructor: {
-                value: subClass,
-                writable: true,
-                configurable: true
-            }
-        });
-        if (superClass) _set_prototype_of$1(subClass, superClass);
-    }
+    }(Canvas);
     /**
      * WebGL platform engine,support includes WebGL1.0 and WebGL2.0.
      */ var WebGLEngine = /*#__PURE__*/ function(Engine1) {
@@ -44045,7 +44078,7 @@
     ], GALACEAN_animation_event);
 
     //@ts-ignore
-    var version = "1.1.0-beta.39";
+    var version = "1.1.0-beta.43";
     console.log("Galacean engine version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);
@@ -44081,6 +44114,7 @@
     exports.BufferMesh = BufferMesh;
     exports.BufferUtil = BufferUtil;
     exports.Burst = Burst;
+    exports.Canvas = Canvas;
     exports.CapsuleColliderShape = CapsuleColliderShape;
     exports.CharacterController = CharacterController;
     exports.CircleShape = CircleShape;