@galacean/engine-physics-lite 1.2.0-beta.6 → 1.3.0-alpha.0

package/dist/browser.js

@@ -566,6 +566,7 @@
         function LiteDynamicCollider(position, rotation) {
             var _this;
             _this = LiteCollider1.call(this) || this;
+            /** @internal */ _this._isStaticCollider = false;
             _this._transform.setPosition(position.x, position.y, position.z);
             _this._transform.setRotationQuaternion(rotation.x, rotation.y, rotation.z, rotation.w);
             return _this;
@@ -884,7 +885,8 @@
      * A manager is a collection of colliders and constraints which can interact.
      */ var LitePhysicsScene = /*#__PURE__*/ function() {
         function LitePhysicsScene(onContactEnter, onContactExit, onContactStay, onTriggerEnter, onTriggerExit, onTriggerStay) {
-            this._colliders = [];
+            this._staticColliders = [];
+            this._dynamicColliders = [];
             this._sphere = new engine.BoundingSphere();
             this._box = new engine.BoundingBox();
             this._currentEvents = new DisorderedArray();
@@ -930,61 +932,49 @@
         /**
        * {@inheritDoc IPhysicsManager.addCollider }
        */ _proto.addCollider = function addCollider(actor) {
-            this._colliders.push(actor);
+            var colliders = actor._isStaticCollider ? this._staticColliders : this._dynamicColliders;
+            colliders.push(actor);
         };
         /**
        * {@inheritDoc IPhysicsManager.removeCollider }
        */ _proto.removeCollider = function removeCollider(collider) {
-            var index = this._colliders.indexOf(collider);
+            var colliders = collider._isStaticCollider ? this._staticColliders : this._dynamicColliders;
+            var index = colliders.indexOf(collider);
             if (index !== -1) {
-                this._colliders.splice(index, 1);
+                colliders.splice(index, 1);
             }
         };
         /**
        * {@inheritDoc IPhysicsManager.update }
        */ _proto.update = function update(deltaTime) {
-            var colliders = this._colliders;
-            for(var i = 0, len = colliders.length; i < len; i++){
-                this._collisionDetection(deltaTime, colliders[i]);
+            var dynamicColliders = this._dynamicColliders;
+            for(var i = 0, len = dynamicColliders.length; i < len; i++){
+                var collider = dynamicColliders[i];
+                this._collisionDetection(collider, this._staticColliders);
+                this._collisionDetection(collider, dynamicColliders);
             }
             this._fireEvent();
         };
         /**
        * {@inheritDoc IPhysicsManager.raycast }
        */ _proto.raycast = function raycast(ray, distance, onRaycast, hit) {
-            var colliders = this._colliders;
-            var hitResult;
-            if (hit) {
-                hitResult = LitePhysicsScene._hitResult;
-            }
-            var isHit = false;
-            var curHit = LitePhysicsScene._currentHit;
-            for(var i = 0, len = colliders.length; i < len; i++){
-                var collider = colliders[i];
-                if (collider._raycast(ray, onRaycast, curHit)) {
-                    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 (!hit) {
+                return this._raycast(ray, distance, onRaycast, this._staticColliders, hit) || this._raycast(ray, distance, onRaycast, this._dynamicColliders, hit);
+            } else {
+                var raycastStaticRes = this._raycast(ray, distance, onRaycast, this._staticColliders, hit);
+                var raycastDynamicRes = this._raycast(ray, LitePhysicsScene._currentHit.distance, onRaycast, this._dynamicColliders, hit);
+                var isHit = raycastStaticRes || raycastDynamicRes;
+                var hitResult = LitePhysicsScene._hitResult;
+                if (!isHit) {
+                    hitResult.shapeID = -1;
+                    hitResult.distance = 0;
+                    hitResult.point.set(0, 0, 0);
+                    hitResult.normal.set(0, 0, 0);
+                } else {
+                    hit(hitResult.shapeID, hitResult.distance, hitResult.point, hitResult.normal);
                 }
+                return isHit;
             }
-            if (!isHit && hitResult) {
-                hitResult.shapeID = -1;
-                hitResult.distance = 0;
-                hitResult.point.set(0, 0, 0);
-                hitResult.normal.set(0, 0, 0);
-            } else if (isHit && hitResult) {
-                hit(hitResult.shapeID, hitResult.distance, hitResult.point, hitResult.normal);
-            }
-            return isHit;
         };
         /**
        * {@inheritDoc IPhysicsManager.addCharacterController }
@@ -1008,8 +998,7 @@
             this._eventMap[index1][index2] = event;
             return event;
         };
-        _proto._collisionDetection = function _collisionDetection(deltaTime, myCollider) {
-            var colliders = this._colliders;
+        _proto._collisionDetection = function _collisionDetection(myCollider, colliders) {
             var myColliderShapes = myCollider._shapes;
             for(var i = 0, len = myColliderShapes.length; i < len; i++){
                 var myShape = myColliderShapes[i];
@@ -1115,6 +1104,32 @@
             }
             return false;
         };
+        _proto._raycast = function _raycast(ray, distance, onRaycast, colliders, hit) {
+            var hitResult;
+            if (hit) {
+                hitResult = LitePhysicsScene._hitResult;
+            }
+            var isHit = false;
+            var curHit = LitePhysicsScene._currentHit;
+            for(var i = 0, len = colliders.length; i < len; i++){
+                var collider = colliders[i];
+                if (collider._raycast(ray, onRaycast, curHit)) {
+                    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;
+                    }
+                }
+            }
+            return isHit;
+        };
         /**
        * Calculate the bounding box in world space from boxCollider.
        * @param boxCollider - The boxCollider to calculate
@@ -1171,6 +1186,7 @@
         function LiteStaticCollider(position, rotation) {
             var _this;
             _this = LiteCollider1.call(this) || this;
+            /** @internal */ _this._isStaticCollider = true;
             _this._transform.setPosition(position.x, position.y, position.z);
             _this._transform.setRotationQuaternion(rotation.x, rotation.y, rotation.z, rotation.w);
             return _this;
@@ -1255,7 +1271,7 @@
     }();
 
     //@ts-ignore
-    var version = "1.2.0-beta.6";
+    var version = "1.3.0-alpha.0";
     console.log("Galacean PhysicsLite version: " + version);
 
     exports.LitePhysics = LitePhysics;