feat(physics): add RopeSoftBody, rigidbody dragger, and enhance colli…

…sionShapeUtil (#448)
Orillusion · Aug 28, 2024 · 452d730 · 452d730
1 parent 4529594
commit 452d730
Show file tree

Hide file tree

Showing 15 changed files with 1,300 additions and 459 deletions.
diff --git a/packages/physics/Physics.ts b/packages/physics/Physics.ts
@@ -6,6 +6,7 @@ import { TempPhyMath } from './utils/TempPhyMath';
 import { Rigidbody } from './rigidbody/Rigidbody';
 import { PhysicsDebugDrawer } from './visualDebug/PhysicsDebugDrawer';
 import { DebugDrawerOptions } from './visualDebug/DebugDrawModeEnum';
+import { PhysicsDragger } from './utils/PhysicsDragger'
 
 class _Physics {
  private _world: Ammo.btDiscreteDynamicsWorld | Ammo.btSoftRigidDynamicsWorld;
@@ -14,6 +15,7 @@ class _Physics {
  private _gravity: Vector3 = new Vector3(0, -9.8, 0);
  private _worldInfo: Ammo.btSoftBodyWorldInfo | null = null;
  private _debugDrawer: PhysicsDebugDrawer;
+ private _physicsDragger: PhysicsDragger;
  private _physicBound: BoundingBox;
  private _destroyObjectBeyondBounds: boolean;
 
@@ -33,24 +35,37 @@ class _Physics {
  return this._debugDrawer;
  }
 
+ /**
+ * 物理拖拽器
+ */
+ public get physicsDragger() {
+ if (!this._physicsDragger) {
+ console.warn('To enable the dragger, set useDrag: true in Physics.init() during initialization.');
+ }
+ return this._physicsDragger;
+ }
+
  public TEMP_TRANSFORM: Ammo.btTransform; // Temp cache, save results from body.getWorldTransform()
 
  /**
  * 初始化物理引擎和相关配置。
  *
  * @param options - 初始化选项参数对象。
- * @param options.useSoftBody - 是否启用软体模拟，目前仅支持布料软体类型。
+ * @param options.useSoftBody - 是否启用软体模拟。
+ * @param options.useDrag - 是否启用刚体拖拽功能。
  * @param options.physicBound - 物理边界，默认范围：2000 2000 2000，超出边界时将会销毁该刚体。
  * @param options.destroyObjectBeyondBounds - 是否在超出边界时销毁3D对象。默认 `false` 仅销毁刚体。
  */
- public async init(options: { useSoftBody?: boolean, physicBound?: Vector3, destroyObjectBeyondBounds?: boolean } = {}) {
+ public async init(options: { useSoftBody?: boolean, useDrag?: boolean, physicBound?: Vector3, destroyObjectBeyondBounds?: boolean } = {}) {
  await Ammo.bind(window)(Ammo);
 
  TempPhyMath.init();
 
  this.TEMP_TRANSFORM = new Ammo.btTransform();
  this.initWorld(options.useSoftBody);
 
+ if (options.useDrag) this._physicsDragger = new PhysicsDragger();
+
  this._isInited = true;
  this._destroyObjectBeyondBounds = options.destroyObjectBeyondBounds;
  this._physicBound = new BoundingBox(new Vector3(), options.physicBound || new Vector3(2000, 2000, 2000));

diff --git a/packages/physics/index.ts b/packages/physics/index.ts
@@ -9,6 +9,7 @@ export * from './rigidbody/RigidbodyEnum';
 export * from './rigidbody/Rigidbody';
 export * from './rigidbody/GhostTrigger';
 export * from './softbody/ClothSoftbody';
+export * from './softbody/RopeSoftbody';
 export * from './constraint/ConeTwistConstraint';
 export * from './constraint/FixedConstraint';
 export * from './constraint/Generic6DofConstraint';

diff --git a/packages/physics/package.json b/packages/physics/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@orillusion/physics",
- "version": "0.3.2",
+ "version": "0.3.3",
  "author": "Orillusion",
  "description": "Orillusion Physics Plugin, Powerd by Ammo.js",
  "main": "./dist/physics.umd.js",
@@ -20,8 +20,10 @@
  "type": "git",
  "url": "git+https://github.com/Orillusion/orillusion.git"
  },
+ "dependencies": {
+ "@orillusion/ammo": ">=0.2.1"
+ },
  "peerDependencies": {
- "@orillusion/ammo": ">=0.2.1",
  "@orillusion/core": ">=0.8.0"
  }
 }
diff --git a/packages/physics/rigidbody/Rigidbody.ts b/packages/physics/rigidbody/Rigidbody.ts
@@ -452,7 +452,7 @@ export class Rigidbody extends ComponentBase {
  */
  public set velocity(value: Vector3) {
  this._velocity.copyFrom(value);
- this._btRigidbody?.applyForce(TempPhyMath.toBtVec(value), TempPhyMath.zeroBtVec(TempPhyMath.tmpVecB));
+ this.wait().then(rb => rb.applyForce(TempPhyMath.toBtVec(this._velocity), TempPhyMath.zeroBtVec(TempPhyMath.tmpVecB)));
  }
 
  /**
@@ -468,7 +468,8 @@ export class Rigidbody extends ComponentBase {
  * Set the angular velocity value of current object
  */
  public set angularVelocity(value: Vector3) {
- this._btRigidbody?.setAngularVelocity(TempPhyMath.toBtVec(value))
+ this._angularVelocity.copyFrom(value)
+ this.wait().then(rb => rb.setAngularVelocity(TempPhyMath.toBtVec(this._angularVelocity)));
  }
  /**
  * Get the linear velocity value of current object
@@ -483,7 +484,8 @@ export class Rigidbody extends ComponentBase {
  * Set the linear velocity value of current object
  */
  public set linearVelocity(value: Vector3) {
- this._btRigidbody?.setLinearVelocity(TempPhyMath.toBtVec(value))
+ this._linearVelocity.copyFrom(value)
+ this.wait().then(rb => rb.setLinearVelocity(TempPhyMath.toBtVec(this._linearVelocity)));
  }
  /**
  * Get mass value