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

package/dist/main.js

@@ -11819,7 +11819,7 @@ var PrimitiveType;
             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;
@@ -11953,8 +11953,8 @@ var PrimitiveType;
             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);
@@ -11995,7 +11995,7 @@ var PrimitiveType;
         }
         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;
@@ -12008,12 +12008,12 @@ var PrimitiveType;
             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;
@@ -12536,7 +12536,9 @@ var Basic2DBatcher = /*#__PURE__*/ function() {
         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){
@@ -12559,7 +12561,7 @@ var Basic2DBatcher = /*#__PURE__*/ function() {
     _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
@@ -19614,6 +19616,47 @@ ShaderPool.init();
     /** @internal Conversion of space units to pixel units for 2D. */ Engine._pixelsPerUnit = 100;
 })();
 
+/**
+ * Canvas.
+ */ var Canvas = /*#__PURE__*/ function() {
+    function Canvas() {
+        /* @internal */ this._sizeUpdateFlagManager = new UpdateFlagManager();
+    }
+    _create_class(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;
@@ -23223,7 +23266,6 @@ exports.Camera = (_Camera = /*#__PURE__*/ function(Component1) {
         _this._viewport = new engineMath.Vector4(0, 0, 1, 1);
         _this._pixelViewport = new engineMath.Rect(0, 0, 0, 0);
         _this._inverseProjectionMatrix = new engineMath.Matrix();
-        _this._lastAspectSize = new engineMath.Vector2(0, 0);
         _this._invViewProjMat = new engineMath.Matrix();
         var transform = _this.entity.transform;
         _this._transform = transform;
@@ -23233,6 +23275,10 @@ exports.Camera = (_Camera = /*#__PURE__*/ function(Component1) {
         _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;
     }
     var _proto = Camera1.prototype;
@@ -23421,6 +23467,9 @@ exports.Camera = (_Camera = /*#__PURE__*/ function(Component1) {
         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;
@@ -23433,16 +23482,20 @@ exports.Camera = (_Camera = /*#__PURE__*/ function(Component1) {
         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() {
@@ -23489,6 +23542,11 @@ exports.Camera = (_Camera = /*#__PURE__*/ function(Component1) {
         }
         return this._inverseProjectionMatrix;
     };
+    _proto._onPixelViewportChanged = function _onPixelViewportChanged() {
+        this._updatePixelViewport();
+        var _this__customAspectRatio;
+        (_this__customAspectRatio = this._customAspectRatio) != null ? _this__customAspectRatio : this._projMatChange();
+    };
     _create_class(Camera1, [
         {
             key: "shaderData",
@@ -23562,8 +23620,6 @@ exports.Camera = (_Camera = /*#__PURE__*/ function(Component1) {
                 if (value !== this._viewport) {
                     this._viewport.copyFrom(value);
                 }
-                this._projMatChange();
-                this._updatePixelViewport();
             }
         },
         {
@@ -23636,13 +23692,10 @@ exports.Camera = (_Camera = /*#__PURE__*/ function(Component1) {
             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) {
                     engineMath.Matrix.perspective(engineMath.MathUtil.degreeToRadian(this._fieldOfView), aspectRatio, this._nearClipPlane, this._farClipPlane, projectionMatrix);
@@ -23688,7 +23741,7 @@ exports.Camera = (_Camera = /*#__PURE__*/ function(Component1) {
                     (_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();
                 }
             }
         }
@@ -23737,12 +23790,12 @@ __decorate([
 __decorate([
     deepClone
 ], exports.Camera.prototype, "_inverseProjectionMatrix", void 0);
-__decorate([
-    deepClone
-], exports.Camera.prototype, "_lastAspectSize", void 0);
 __decorate([
     deepClone
 ], exports.Camera.prototype, "_invViewProjMat", void 0);
+__decorate([
+    ignoreClone
+], exports.Camera.prototype, "_onPixelViewportChanged", null);
 exports.Camera = __decorate([
     dependentComponents(Transform, exports.DependentMode.CheckOnly)
 ], exports.Camera);
@@ -30857,6 +30910,7 @@ exports.Buffer = Buffer;
 exports.BufferMesh = BufferMesh;
 exports.BufferUtil = BufferUtil;
 exports.Burst = Burst;
+exports.Canvas = Canvas;
 exports.CapsuleColliderShape = CapsuleColliderShape;
 exports.CharacterController = CharacterController;
 exports.CircleShape = CircleShape;