@galacean/engine-physics-lite 0.0.0-experimental-1.3-xr.9 → 0.0.0-experimental-1.3-xr.10

package/dist/browser.js

@@ -706,52 +706,6 @@
         return LitePhysicsMaterial;
     }();
 
-    /**
-     * High-performance unordered array, delete uses exchange method to improve performance, internal capacity only increases.
-     */ var DisorderedArray = /*#__PURE__*/ function() {
-        function DisorderedArray(count) {
-            if (count === void 0) count = 0;
-            this.length = 0;
-            this._elements = new Array(count);
-        }
-        var _proto = DisorderedArray.prototype;
-        _proto.add = function add(element) {
-            if (this.length === this._elements.length) this._elements.push(element);
-            else this._elements[this.length] = element;
-            this.length++;
-        };
-        _proto.delete = function _delete(element) {
-            //TODO: It can be optimized for custom binary search and other algorithms, currently this._elements>=this.length wastes performance.
-            var index = this._elements.indexOf(element);
-            this.deleteByIndex(index);
-        };
-        _proto.get = function get(index) {
-            if (index >= this.length) {
-                throw "Index is out of range.";
-            }
-            return this._elements[index];
-        };
-        /**
-       *
-       * @param index
-       * @returns The replaced item is used to reset its index.
-       */ _proto.deleteByIndex = function deleteByIndex(index) {
-            var elements = this._elements;
-            var end = null;
-            var lastIndex = this.length - 1;
-            if (index !== lastIndex) {
-                end = elements[lastIndex];
-                elements[index] = end;
-            }
-            this.length--;
-            return end;
-        };
-        _proto.garbageCollection = function garbageCollection() {
-            this._elements.length = this.length;
-        };
-        return DisorderedArray;
-    }();
-
     /**
      * Structure used to get information back from a raycast or a sweep.
      * @internal
@@ -889,7 +843,7 @@
             this._dynamicColliders = [];
             this._sphere = new engine.BoundingSphere();
             this._box = new engine.BoundingBox();
-            this._currentEvents = new DisorderedArray();
+            this._currentEvents = new engine.DisorderedArray();
             this._eventMap = {};
             this._eventPool = [];
             this._onContactEnter = onContactEnter;
@@ -915,8 +869,7 @@
        */ _proto.removeColliderShape = function removeColliderShape(colliderShape) {
             var _this = this, eventPool = _this._eventPool, currentEvents = _this._currentEvents, eventMap = _this._eventMap;
             var id = colliderShape._id;
-            for(var i = currentEvents.length - 1; i >= 0; i--){
-                var event = currentEvents.get(i);
+            currentEvents.forEach(function(event, i) {
                 if (event.index1 == id) {
                     currentEvents.deleteByIndex(i);
                     eventPool.push(event);
@@ -926,7 +879,7 @@
                     // If the shape is big index, should clear from the small index shape subMap
                     eventMap[event.index1][id] = undefined;
                 }
-            }
+            });
             delete eventMap[id];
         };
         /**
@@ -962,7 +915,10 @@
                 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);
+                if (raycastStaticRes) {
+                    distance = LitePhysicsScene._currentHit.distance;
+                }
+                var raycastDynamicRes = this._raycast(ray, distance, onRaycast, this._dynamicColliders, hit);
                 var isHit = raycastStaticRes || raycastDynamicRes;
                 var hitResult = LitePhysicsScene._hitResult;
                 if (!isHit) {
@@ -1060,25 +1016,25 @@
             }
         };
         _proto._fireEvent = function _fireEvent() {
-            var _this = this, eventPool = _this._eventPool, currentEvents = _this._currentEvents;
-            for(var i = currentEvents.length - 1; i >= 0; i--){
-                var event = currentEvents.get(i);
+            var _this = this;
+            var _this1 = this, eventPool = _this1._eventPool, currentEvents = _this1._currentEvents;
+            currentEvents.forEach(function(event, i) {
                 if (!event.alreadyInvoked) {
                     if (event.state == 0) {
-                        this._onTriggerEnter(event.index1, event.index2);
+                        _this._onTriggerEnter(event.index1, event.index2);
                         event.alreadyInvoked = true;
                     } else if (event.state == 1) {
-                        this._onTriggerStay(event.index1, event.index2);
+                        _this._onTriggerStay(event.index1, event.index2);
                         event.alreadyInvoked = true;
                     }
                 } else {
                     event.state = 2;
-                    this._eventMap[event.index1][event.index2] = undefined;
-                    this._onTriggerExit(event.index1, event.index2);
+                    _this._eventMap[event.index1][event.index2] = undefined;
                     currentEvents.deleteByIndex(i);
+                    _this._onTriggerExit(event.index1, event.index2);
                     eventPool.push(event);
                 }
-            }
+            });
         };
         _proto._boxCollision = function _boxCollision(other) {
             if (_instanceof(other, LiteBoxColliderShape)) {
@@ -1105,26 +1061,19 @@
             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;
+                if (colliders[i]._raycast(ray, onRaycast, curHit) && curHit.distance < distance) {
+                    if (hit) {
+                        isHit = true;
+                        var hitResult = LitePhysicsScene._hitResult;
+                        hitResult.normal.copyFrom(curHit.normal);
+                        hitResult.point.copyFrom(curHit.point);
+                        hitResult.distance = distance = curHit.distance;
+                        hitResult.shapeID = curHit.shapeID;
+                    } else {
+                        return true;
                     }
                 }
             }
@@ -1271,7 +1220,7 @@
     }();
 
     //@ts-ignore
-    var version = "0.0.0-experimental-1.3-xr.9";
+    var version = "0.0.0-experimental-1.3-xr.10";
     console.log("Galacean PhysicsLite version: " + version);
 
     exports.LitePhysics = LitePhysics;