@galacean/engine-physics-physx 0.0.0-experimental-renderSort.3 → 0.0.0-experimental-shaderlab.2

package/dist/main.js

@@ -196,8 +196,10 @@ var ShapeFlag;
         var _this;
         _this = PhysXColliderShape1.call(this, physXPhysics) || this;
         /** @internal */ _this._halfSize = new engine.Vector3();
-        _this._halfSize.set(size.x * 0.5, size.y * 0.5, size.z * 0.5);
-        _this._pxGeometry = new physXPhysics._physX.PxBoxGeometry(_this._halfSize.x * _this._worldScale.x, _this._halfSize.y * _this._worldScale.y, _this._halfSize.z * _this._worldScale.z);
+        _this._sizeScale = new engine.Vector3(1, 1, 1);
+        var halfSize = _this._halfSize;
+        halfSize.set(size.x * 0.5, size.y * 0.5, size.z * 0.5);
+        _this._pxGeometry = new physXPhysics._physX.PxBoxGeometry(halfSize.x, halfSize.y, halfSize.z);
         _this._initialize(material, uniqueID);
         _this._setLocalPose();
         return _this;
@@ -206,9 +208,10 @@ var ShapeFlag;
     /**
    * {@inheritDoc IBoxColliderShape.setSize }
    */ _proto.setSize = function setSize(value) {
+        var halfSize = this._halfSize;
         var tempExtents = PhysXBoxColliderShape._tempHalfExtents;
-        this._halfSize.set(value.x * 0.5, value.y * 0.5, value.z * 0.5);
-        engine.Vector3.multiply(this._halfSize, this._worldScale, tempExtents);
+        halfSize.set(value.x * 0.5, value.y * 0.5, value.z * 0.5);
+        engine.Vector3.multiply(halfSize, this._sizeScale, tempExtents);
         this._pxGeometry.halfExtents = tempExtents;
         this._pxShape.setGeometry(this._pxGeometry);
         this._updateController(tempExtents);
@@ -217,8 +220,9 @@ var ShapeFlag;
    * {@inheritDoc IColliderShape.setWorldScale }
    */ _proto.setWorldScale = function setWorldScale(scale) {
         PhysXColliderShape1.prototype.setWorldScale.call(this, scale);
+        this._sizeScale.set(Math.abs(scale.x), Math.abs(scale.y), Math.abs(scale.z));
         var tempExtents = PhysXBoxColliderShape._tempHalfExtents;
-        engine.Vector3.multiply(this._halfSize, this._worldScale, tempExtents);
+        engine.Vector3.multiply(this._halfSize, this._sizeScale, tempExtents);
         this._pxGeometry.halfExtents = tempExtents;
         this._pxShape.setGeometry(this._pxGeometry);
         this._updateController(tempExtents);
@@ -246,6 +250,7 @@ var ShapeFlag;
         var _this;
         _this = PhysXColliderShape1.call(this, physXPhysics) || this;
         _this._upAxis = /** Up axis is Y. */ 1;
+        _this._sizeScale = new engine.Vector3(1, 1, 1);
         _this._radius = radius;
         _this._halfHeight = height * 0.5;
         _this._axis = new engine.Quaternion(0, 0, PhysXColliderShape.halfSqrt, PhysXColliderShape.halfSqrt);
@@ -260,15 +265,16 @@ var ShapeFlag;
    * {@inheritDoc ICapsuleColliderShape.setRadius }
    */ _proto.setRadius = function setRadius(value) {
         this._radius = value;
+        var sizeScale = this._sizeScale;
         switch(this._upAxis){
             case /** Up axis is X. */ 0:
-                this._pxGeometry.radius = this._radius * Math.max(this._worldScale.y, this._worldScale.z);
+                this._pxGeometry.radius = this._radius * Math.max(sizeScale.y, sizeScale.z);
                 break;
             case 1:
-                this._pxGeometry.radius = this._radius * Math.max(this._worldScale.x, this._worldScale.z);
+                this._pxGeometry.radius = this._radius * Math.max(sizeScale.x, sizeScale.z);
                 break;
             case /** Up axis is Z. */ 2:
-                this._pxGeometry.radius = this._radius * Math.max(this._worldScale.x, this._worldScale.y);
+                this._pxGeometry.radius = this._radius * Math.max(sizeScale.x, sizeScale.y);
                 break;
         }
         this._pxShape.setGeometry(this._pxGeometry);
@@ -282,15 +288,16 @@ var ShapeFlag;
    * {@inheritDoc ICapsuleColliderShape.setHeight }
    */ _proto.setHeight = function setHeight(value) {
         this._halfHeight = value * 0.5;
+        var sizeScale = this._sizeScale;
         switch(this._upAxis){
             case 0:
-                this._pxGeometry.halfHeight = this._halfHeight * this._worldScale.x;
+                this._pxGeometry.halfHeight = this._halfHeight * sizeScale.x;
                 break;
             case 1:
-                this._pxGeometry.halfHeight = this._halfHeight * this._worldScale.y;
+                this._pxGeometry.halfHeight = this._halfHeight * sizeScale.y;
                 break;
             case 2:
-                this._pxGeometry.halfHeight = this._halfHeight * this._worldScale.z;
+                this._pxGeometry.halfHeight = this._halfHeight * sizeScale.z;
                 break;
         }
         this._pxShape.setGeometry(this._pxGeometry);
@@ -328,19 +335,20 @@ var ShapeFlag;
    * {@inheritDoc IColliderShape.setWorldScale }
    */ _proto.setWorldScale = function setWorldScale(scale) {
         PhysXColliderShape1.prototype.setWorldScale.call(this, scale);
+        var sizeScale = this._sizeScale.set(Math.abs(scale.x), Math.abs(scale.y), Math.abs(scale.z));
         var geometry = this._pxGeometry;
         switch(this._upAxis){
             case 0:
-                geometry.radius = this._radius * Math.max(scale.y, scale.z);
-                geometry.halfHeight = this._halfHeight * scale.x;
+                geometry.radius = this._radius * Math.max(sizeScale.y, sizeScale.z);
+                geometry.halfHeight = this._halfHeight * sizeScale.x;
                 break;
             case 1:
-                geometry.radius = this._radius * Math.max(scale.x, scale.z);
-                geometry.halfHeight = this._halfHeight * scale.y;
+                geometry.radius = this._radius * Math.max(sizeScale.x, sizeScale.z);
+                geometry.halfHeight = this._halfHeight * sizeScale.y;
                 break;
             case 2:
-                geometry.radius = this._radius * Math.max(scale.x, scale.y);
-                geometry.halfHeight = this._halfHeight * scale.z;
+                geometry.radius = this._radius * Math.max(sizeScale.x, sizeScale.y);
+                geometry.halfHeight = this._halfHeight * sizeScale.z;
                 break;
         }
         this._pxShape.setGeometry(geometry);
@@ -825,15 +833,21 @@ var /**
    * {@inheritDoc IPhysicsManager.removeColliderShape }
    */ _proto.removeColliderShape = function removeColliderShape(colliderShape) {
         var _this = this, eventPool = _this._eventPool, currentEvents = _this._currentEvents;
-        var shapeID = colliderShape._id;
+        var id = colliderShape._id;
+        var _this__physXManager = this._physXManager, eventMap = _this__physXManager._eventMap;
         for(var i = currentEvents.length - 1; i >= 0; i--){
             var event = currentEvents.get(i);
-            if (event.index1 == shapeID || event.index2 == shapeID) {
+            if (event.index1 == id) {
                 currentEvents.deleteByIndex(i);
                 eventPool.push(event);
+            } else if (event.index2 == id) {
+                currentEvents.deleteByIndex(i);
+                eventPool.push(event);
+                // If the shape is big index, should clear from the small index shape subMap
+                eventMap[event.index1][id] = undefined;
             }
         }
-        delete this._physXManager._eventMap[shapeID];
+        delete eventMap[id];
     };
     /**
    * {@inheritDoc IPhysicsManager.addCollider }
@@ -1256,7 +1270,7 @@ var /**
    * {@inheritDoc IColliderShape.setWorldScale }
    */ _proto.setWorldScale = function setWorldScale(scale) {
         PhysXColliderShape1.prototype.setWorldScale.call(this, scale);
-        this._maxScale = Math.max(scale.x, scale.y, scale.z);
+        this._maxScale = Math.max(Math.abs(scale.x), Math.abs(scale.y), Math.abs(scale.z));
         this._pxGeometry.radius = this._radius * this._maxScale;
         this._pxShape.setGeometry(this._pxGeometry);
     };
@@ -1423,7 +1437,7 @@ var InitializeState;
 })(InitializeState || (InitializeState = {}));
 
 //@ts-ignore
-var version = "0.0.0-experimental-renderSort.3";
+var version = "0.0.0-experimental-shaderlab.2";
 console.log("Galacean PhysX version: " + version);
 
 exports.PhysXPhysics = PhysXPhysics;