@galacean/engine-physics-lite 1.0.0-beta.8 → 1.0.1

package/dist/module.js

@@ -86,6 +86,8 @@ function _instanceof(left, right) {
  * Abstract class for collider shapes.
  */ var LiteColliderShape = /*#__PURE__*/ function() {
     function LiteColliderShape() {
+        /** @internal */ this._position = new Vector3();
+        /** @internal */ this._worldScale = new Vector3(1, 1, 1);
         /** @internal */ this._transform = new LiteTransform();
         /** @internal */ this._invModelMatrix = new Matrix();
         this._transform.owner = this;
@@ -100,7 +102,18 @@ function _instanceof(left, right) {
     /**
    * {@inheritDoc IColliderShape.setPosition }
    */ _proto.setPosition = function setPosition(position) {
-        this._transform.setPosition(position.x, position.y, position.z);
+        if (position !== this._position) {
+            this._position.copyFrom(position);
+        }
+        this._setLocalPose();
+    };
+    /**
+   * {@inheritDoc IColliderShape.setWorldScale }
+   */ _proto.setWorldScale = function setWorldScale(scale) {
+        if (scale !== this._worldScale) {
+            this._worldScale.copyFrom(scale);
+        }
+        this._setLocalPose();
     };
     /**
    * {@inheritDoc IColliderShape.setContactOffset }
@@ -154,6 +167,11 @@ function _instanceof(left, right) {
         }
         return this._invModelMatrix;
     };
+    _proto._setLocalPose = function _setLocalPose() {
+        var shapePosition = LiteColliderShape._tempPoint;
+        Vector3.multiply(this._position, this._worldScale, shapePosition);
+        this._transform.position = shapePosition;
+    };
     return LiteColliderShape;
 }();
 (function() {
@@ -713,7 +731,6 @@ var /**
         var _this;
         _this = LiteColliderShape.call(this) || this;
         _this._halfSize = new Vector3();
-        _this._scale = new Vector3(1, 1, 1);
         /** @internal */ _this._boxMin = new Vector3(-0.5, -0.5, -0.5);
         /** @internal */ _this._boxMax = new Vector3(0.5, 0.5, 0.5);
         _this._id = uniqueID;
@@ -731,8 +748,8 @@ var /**
     /**
    * {@inheritDoc IColliderShape.setWorldScale }
    */ _proto.setWorldScale = function setWorldScale(scale) {
-        this._transform.position = this._transform.position.multiply(scale);
-        this._scale.copyFrom(scale);
+        LiteColliderShape.prototype.setWorldScale.call(this, scale);
+        this._setBondingBox();
     };
     /**
    * {@inheritDoc IBoxColliderShape.setSize }
@@ -745,8 +762,8 @@ var /**
    */ _proto._raycast = function _raycast(ray, hit) {
         var localRay = this._getLocalRay(ray);
         var boundingBox = LiteBoxColliderShape._tempBox;
-        boundingBox.min.set(-this._halfSize.x * this._scale.x, -this._halfSize.y * this._scale.y, -this._halfSize.z * this._scale.z);
-        boundingBox.max.set(this._halfSize.x * this._scale.x, this._halfSize.y * this._scale.y, this._halfSize.z * this._scale.z);
+        boundingBox.min.set(-this._halfSize.x * this._worldScale.x, -this._halfSize.y * this._worldScale.y, -this._halfSize.z * this._worldScale.z);
+        boundingBox.max.set(this._halfSize.x * this._worldScale.x, this._halfSize.y * this._worldScale.y, this._halfSize.z * this._worldScale.z);
         var rayDistance = localRay.intersectBox(boundingBox);
         if (rayDistance !== -1) {
             this._updateHitResult(localRay, rayDistance, hit, ray.origin);
@@ -756,10 +773,11 @@ var /**
         }
     };
     _proto._setBondingBox = function _setBondingBox() {
-        var _this__transform = this._transform, center = _this__transform.position;
+        var position = this._transform.position;
+        var scale = this._worldScale;
         var halfSize = this._halfSize;
-        Vector3.add(center, halfSize, this._boxMax);
-        Vector3.subtract(center, halfSize, this._boxMin);
+        this._boxMin.set(-halfSize.x * scale.x + position.x, -halfSize.y * scale.y + position.y, -halfSize.z * scale.z + position.z);
+        this._boxMax.set(halfSize.x * scale.x + position.x, halfSize.y * scale.y + position.y, halfSize.z * scale.z + position.z);
     };
     return LiteBoxColliderShape;
 }(LiteColliderShape);
@@ -789,7 +807,8 @@ var /**
     /**
    * {@inheritDoc IColliderShape.setWorldScale }
    */ _proto.setWorldScale = function setWorldScale(scale) {
-        this._maxScale = Math.max(scale.x, Math.max(scale.x, scale.y));
+        LiteColliderShape.prototype.setWorldScale.call(this, scale);
+        this._maxScale = Math.max(scale.x, scale.y, scale.z);
     };
     /**
    * @internal
@@ -895,19 +914,17 @@ var /**
         var curHit = LitePhysicsManager._currentHit;
         for(var i = 0, len = colliders.length; i < len; i++){
             var collider = colliders[i];
-            if (collider._raycast(ray, onRaycast, curHit)) {
+            if (collider._raycast(ray, onRaycast, curHit) && curHit.distance < distance) {
                 isHit = true;
-                if (curHit.distance < distance) {
-                    if (hitResult) {
-                        hitResult.normal.copyFrom(curHit.normal);
-                        hitResult.point.copyFrom(curHit.point);
-                        hitResult.distance = curHit.distance;
-                        hitResult.shapeID = curHit.shapeID;
-                    } else {
-                        return true;
-                    }
-                    distance = curHit.distance;
+                if (hitResult) {
+                    hitResult.normal.copyFrom(curHit.normal);
+                    hitResult.point.copyFrom(curHit.point);
+                    hitResult.distance = curHit.distance;
+                    hitResult.shapeID = curHit.shapeID;
+                } else {
+                    return true;
                 }
+                distance = curHit.distance;
             }
         }
         if (!isHit && hitResult) {