@galacean/engine-physics-physx 1.0.0-beta.19 → 1.0.0-beta.21

package/dist/miniprogram.js

@@ -313,7 +313,7 @@ var ShapeFlag;
  */ var PhysXColliderShape = /*#__PURE__*/ function() {
     function PhysXColliderShape(physXPhysics) {
         /** @internal */ this._controllers = new DisorderedArray();
-        this._scale = new miniprogram.Vector3(1, 1, 1);
+        this._worldScale = new miniprogram.Vector3(1, 1, 1);
         this._position = new miniprogram.Vector3();
         this._rotation = null;
         this._axis = null;
@@ -340,18 +340,18 @@ var ShapeFlag;
         }
         var controllers = this._controllers;
         for(var i = 0, n = controllers.length; i < n; i++){
-            controllers.get(i)._pxController.setLocalPosition(this._position, this._scale);
+            controllers.get(i)._setLocalPosition(this._position, this._worldScale);
         }
         this._setLocalPose();
     };
     /**
    * {@inheritDoc IColliderShape.setWorldScale }
    */ _proto.setWorldScale = function setWorldScale(scale) {
-        this._scale.copyFrom(scale);
+        this._worldScale.copyFrom(scale);
         this._setLocalPose();
         var controllers = this._controllers;
         for(var i = 0, n = controllers.length; i < n; i++){
-            controllers.get(i)._setLocalPosition(this._position, this._scale);
+            controllers.get(i)._setLocalPosition(this._position, this._worldScale);
         }
     };
     /**
@@ -390,7 +390,7 @@ var ShapeFlag;
     };
     _proto._setLocalPose = function _setLocalPose() {
         var transform = PhysXColliderShape.transform;
-        miniprogram.Vector3.multiply(this._position, this._scale, transform.translation);
+        miniprogram.Vector3.multiply(this._position, this._worldScale, transform.translation);
         transform.rotation = this._physXRotation;
         this._pxShape.setLocalPose(transform);
     };
@@ -424,7 +424,7 @@ var ShapeFlag;
         _this = PhysXColliderShape.call(this, physXPhysics) || this;
         /** @internal */ _this._halfSize = new miniprogram.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._scale.x, _this._halfSize.y * _this._scale.y, _this._halfSize.z * _this._scale.z);
+        _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._initialize(material, uniqueID);
         _this._setLocalPose();
         return _this;
@@ -435,7 +435,7 @@ var ShapeFlag;
    */ _proto.setSize = function setSize(value) {
         var tempExtents = PhysXBoxColliderShape._tempHalfExtents;
         this._halfSize.set(value.x * 0.5, value.y * 0.5, value.z * 0.5);
-        miniprogram.Vector3.multiply(this._halfSize, this._scale, tempExtents);
+        miniprogram.Vector3.multiply(this._halfSize, this._worldScale, tempExtents);
         this._pxGeometry.halfExtents = tempExtents;
         this._pxShape.setGeometry(this._pxGeometry);
         this._updateController(tempExtents);
@@ -445,7 +445,7 @@ var ShapeFlag;
    */ _proto.setWorldScale = function setWorldScale(scale) {
         PhysXColliderShape.prototype.setWorldScale.call(this, scale);
         var tempExtents = PhysXBoxColliderShape._tempHalfExtents;
-        miniprogram.Vector3.multiply(this._halfSize, this._scale, tempExtents);
+        miniprogram.Vector3.multiply(this._halfSize, this._worldScale, tempExtents);
         this._pxGeometry.halfExtents = tempExtents;
         this._pxShape.setGeometry(this._pxGeometry);
         this._updateController(tempExtents);
@@ -489,13 +489,13 @@ var ShapeFlag;
         this._radius = value;
         switch(this._upAxis){
             case /** Up axis is X. */ 0:
-                this._pxGeometry.radius = this._radius * Math.max(this._scale.y, this._scale.z);
+                this._pxGeometry.radius = this._radius * Math.max(this._worldScale.y, this._worldScale.z);
                 break;
             case 1:
-                this._pxGeometry.radius = this._radius * Math.max(this._scale.x, this._scale.z);
+                this._pxGeometry.radius = this._radius * Math.max(this._worldScale.x, this._worldScale.z);
                 break;
             case /** Up axis is Z. */ 2:
-                this._pxGeometry.radius = this._radius * Math.max(this._scale.x, this._scale.y);
+                this._pxGeometry.radius = this._radius * Math.max(this._worldScale.x, this._worldScale.y);
                 break;
         }
         this._pxShape.setGeometry(this._pxGeometry);
@@ -511,13 +511,13 @@ var ShapeFlag;
         this._halfHeight = value * 0.5;
         switch(this._upAxis){
             case 0:
-                this._pxGeometry.halfHeight = this._halfHeight * this._scale.x;
+                this._pxGeometry.halfHeight = this._halfHeight * this._worldScale.x;
                 break;
             case 1:
-                this._pxGeometry.halfHeight = this._halfHeight * this._scale.y;
+                this._pxGeometry.halfHeight = this._halfHeight * this._worldScale.y;
                 break;
             case 2:
-                this._pxGeometry.halfHeight = this._halfHeight * this._scale.z;
+                this._pxGeometry.halfHeight = this._halfHeight * this._worldScale.z;
                 break;
         }
         this._pxShape.setGeometry(this._pxGeometry);
@@ -692,7 +692,7 @@ var /**
    * @internal
    */ _proto._setLocalPosition = function _setLocalPosition(position, scale) {
         miniprogram.Vector3.multiply(position, scale, this._scaledOffset);
-        this.setWorldPosition(this._position);
+        this.setWorldPosition(position);
     };
     return PhysXCharacterController;
 }();
@@ -1244,7 +1244,7 @@ var /**
    * {@inheritDoc IColliderShape.setWorldScale }
    */ _proto.setWorldScale = function setWorldScale(scale) {
         PhysXColliderShape.prototype.setWorldScale.call(this, scale);
-        this._maxScale = Math.max(scale.x, Math.max(scale.x, scale.y));
+        this._maxScale = Math.max(scale.x, scale.y, scale.z);
         this._pxGeometry.radius = this._radius * this._maxScale;
         this._pxShape.setGeometry(this._pxGeometry);
     };
@@ -1295,9 +1295,9 @@ var /**
                 }
             }
             if (runtimeMode == exports.PhysXRuntimeMode.JavaScript) {
-                script.src = "https://gw.alipayobjects.com/os/lib/oasis-engine/physics-physx/1.0.0-alpha.4/libs/physx.release.js.js";
+                script.src = "https://gw.alipayobjects.com/os/lib/galacean/engine-physics-physx/" + miniprogram.version + "/libs/physx.release.js.js";
             } else if (runtimeMode == exports.PhysXRuntimeMode.WebAssembly) {
-                script.src = "https://gw.alipayobjects.com/os/lib/oasis-engine/physics-physx/1.0.0-alpha.4/libs/physx.release.js";
+                script.src = "https://gw.alipayobjects.com/os/lib/galacean/engine-physics-physx/" + miniprogram.version + "/libs/physx.release.js";
             }
         });
         var initializePromise = new Promise(function(resolve, reject) {

package/dist/module.js

@@ -1,4 +1,4 @@
-import { Vector3, Quaternion } from '@galacean/engine';
+import { Vector3, Quaternion, version } from '@galacean/engine';
 
 function _instanceof(left, right) {
     if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
@@ -308,7 +308,7 @@ var ShapeFlag;
  */ var PhysXColliderShape = /*#__PURE__*/ function() {
     function PhysXColliderShape(physXPhysics) {
         /** @internal */ this._controllers = new DisorderedArray();
-        this._scale = new Vector3(1, 1, 1);
+        this._worldScale = new Vector3(1, 1, 1);
         this._position = new Vector3();
         this._rotation = null;
         this._axis = null;
@@ -335,18 +335,18 @@ var ShapeFlag;
         }
         var controllers = this._controllers;
         for(var i = 0, n = controllers.length; i < n; i++){
-            controllers.get(i)._pxController.setLocalPosition(this._position, this._scale);
+            controllers.get(i)._setLocalPosition(this._position, this._worldScale);
         }
         this._setLocalPose();
     };
     /**
    * {@inheritDoc IColliderShape.setWorldScale }
    */ _proto.setWorldScale = function setWorldScale(scale) {
-        this._scale.copyFrom(scale);
+        this._worldScale.copyFrom(scale);
         this._setLocalPose();
         var controllers = this._controllers;
         for(var i = 0, n = controllers.length; i < n; i++){
-            controllers.get(i)._setLocalPosition(this._position, this._scale);
+            controllers.get(i)._setLocalPosition(this._position, this._worldScale);
         }
     };
     /**
@@ -385,7 +385,7 @@ var ShapeFlag;
     };
     _proto._setLocalPose = function _setLocalPose() {
         var transform = PhysXColliderShape.transform;
-        Vector3.multiply(this._position, this._scale, transform.translation);
+        Vector3.multiply(this._position, this._worldScale, transform.translation);
         transform.rotation = this._physXRotation;
         this._pxShape.setLocalPose(transform);
     };
@@ -419,7 +419,7 @@ var ShapeFlag;
         _this = PhysXColliderShape.call(this, physXPhysics) || this;
         /** @internal */ _this._halfSize = new 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._scale.x, _this._halfSize.y * _this._scale.y, _this._halfSize.z * _this._scale.z);
+        _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._initialize(material, uniqueID);
         _this._setLocalPose();
         return _this;
@@ -430,7 +430,7 @@ var ShapeFlag;
    */ _proto.setSize = function setSize(value) {
         var tempExtents = PhysXBoxColliderShape._tempHalfExtents;
         this._halfSize.set(value.x * 0.5, value.y * 0.5, value.z * 0.5);
-        Vector3.multiply(this._halfSize, this._scale, tempExtents);
+        Vector3.multiply(this._halfSize, this._worldScale, tempExtents);
         this._pxGeometry.halfExtents = tempExtents;
         this._pxShape.setGeometry(this._pxGeometry);
         this._updateController(tempExtents);
@@ -440,7 +440,7 @@ var ShapeFlag;
    */ _proto.setWorldScale = function setWorldScale(scale) {
         PhysXColliderShape.prototype.setWorldScale.call(this, scale);
         var tempExtents = PhysXBoxColliderShape._tempHalfExtents;
-        Vector3.multiply(this._halfSize, this._scale, tempExtents);
+        Vector3.multiply(this._halfSize, this._worldScale, tempExtents);
         this._pxGeometry.halfExtents = tempExtents;
         this._pxShape.setGeometry(this._pxGeometry);
         this._updateController(tempExtents);
@@ -484,13 +484,13 @@ var ShapeFlag;
         this._radius = value;
         switch(this._upAxis){
             case /** Up axis is X. */ 0:
-                this._pxGeometry.radius = this._radius * Math.max(this._scale.y, this._scale.z);
+                this._pxGeometry.radius = this._radius * Math.max(this._worldScale.y, this._worldScale.z);
                 break;
             case 1:
-                this._pxGeometry.radius = this._radius * Math.max(this._scale.x, this._scale.z);
+                this._pxGeometry.radius = this._radius * Math.max(this._worldScale.x, this._worldScale.z);
                 break;
             case /** Up axis is Z. */ 2:
-                this._pxGeometry.radius = this._radius * Math.max(this._scale.x, this._scale.y);
+                this._pxGeometry.radius = this._radius * Math.max(this._worldScale.x, this._worldScale.y);
                 break;
         }
         this._pxShape.setGeometry(this._pxGeometry);
@@ -506,13 +506,13 @@ var ShapeFlag;
         this._halfHeight = value * 0.5;
         switch(this._upAxis){
             case 0:
-                this._pxGeometry.halfHeight = this._halfHeight * this._scale.x;
+                this._pxGeometry.halfHeight = this._halfHeight * this._worldScale.x;
                 break;
             case 1:
-                this._pxGeometry.halfHeight = this._halfHeight * this._scale.y;
+                this._pxGeometry.halfHeight = this._halfHeight * this._worldScale.y;
                 break;
             case 2:
-                this._pxGeometry.halfHeight = this._halfHeight * this._scale.z;
+                this._pxGeometry.halfHeight = this._halfHeight * this._worldScale.z;
                 break;
         }
         this._pxShape.setGeometry(this._pxGeometry);
@@ -687,7 +687,7 @@ var /**
    * @internal
    */ _proto._setLocalPosition = function _setLocalPosition(position, scale) {
         Vector3.multiply(position, scale, this._scaledOffset);
-        this.setWorldPosition(this._position);
+        this.setWorldPosition(position);
     };
     return PhysXCharacterController;
 }();
@@ -1239,7 +1239,7 @@ var /**
    * {@inheritDoc IColliderShape.setWorldScale }
    */ _proto.setWorldScale = function setWorldScale(scale) {
         PhysXColliderShape.prototype.setWorldScale.call(this, scale);
-        this._maxScale = Math.max(scale.x, Math.max(scale.x, scale.y));
+        this._maxScale = Math.max(scale.x, scale.y, scale.z);
         this._pxGeometry.radius = this._radius * this._maxScale;
         this._pxShape.setGeometry(this._pxGeometry);
     };
@@ -1290,9 +1290,9 @@ var /**
                 }
             }
             if (runtimeMode == PhysXRuntimeMode.JavaScript) {
-                script.src = "https://gw.alipayobjects.com/os/lib/oasis-engine/physics-physx/1.0.0-alpha.4/libs/physx.release.js.js";
+                script.src = "https://gw.alipayobjects.com/os/lib/galacean/engine-physics-physx/" + version + "/libs/physx.release.js.js";
             } else if (runtimeMode == PhysXRuntimeMode.WebAssembly) {
-                script.src = "https://gw.alipayobjects.com/os/lib/oasis-engine/physics-physx/1.0.0-alpha.4/libs/physx.release.js";
+                script.src = "https://gw.alipayobjects.com/os/lib/galacean/engine-physics-physx/" + version + "/libs/physx.release.js";
             }
         });
         var initializePromise = new Promise(function(resolve, reject) {