PhysicsPlugin refactor

packages/dev/core/src/Debug/physicsViewer.ts

@@ -9,8 +9,9 @@ import { Color3 } from "../Maths/math.color";
 import type { Material } from "../Materials/material";
 import { EngineStore } from "../Engines/engineStore";
 import { StandardMaterial } from "../Materials/standardMaterial";
-import type { IPhysicsEnginePlugin } from "../Physics/IPhysicsEngine";
-import { PhysicsImpostor } from "../Physics/physicsImpostor";
+import type { IPhysicsEnginePlugin as IPhysicsEnginePluginV1 } from "../Physics/v1/IPhysicsEnginePlugin";
+import type { IPhysicsEnginePlugin as IPhysicsEnginePluginV2 } from "../Physics/v2/IPhysicsEnginePlugin";
+import { PhysicsImpostor } from "../Physics/v1/physicsImpostor";
 import { UtilityLayerRenderer } from "../Rendering/utilityLayerRenderer";
 import { CreateCylinder } from "../Meshes/Builders/cylinderBuilder";
 import type { ICreateCapsuleOptions } from "../Meshes/Builders/capsuleBuilder";
@@ -30,7 +31,7 @@ export class PhysicsViewer {
     /** @internal */
     protected _numMeshes = 0;
     /** @internal */
-    protected _physicsEnginePlugin: Nullable<IPhysicsEnginePlugin>;
+    protected _physicsEnginePlugin: IPhysicsEnginePluginV1 | IPhysicsEnginePluginV2 | null;
     private _renderFunction: () => void;
     private _utilityLayer: Nullable<UtilityLayerRenderer>;
 
@@ -80,8 +81,8 @@ export class PhysicsViewer {
                 }
                 const mesh = this._meshes[i];
 
-                if (mesh && plugin) {
-                    plugin.syncMeshWithImpostor(mesh, impostor);
+                if (mesh && plugin && plugin.getPluginVersion() === 1) {
+                    (plugin as IPhysicsEnginePluginV1).syncMeshWithImpostor(mesh, impostor);
                 }
             }
         }

packages/dev/core/src/Loading/Plugins/babylonFileLoader.ts

@@ -23,9 +23,9 @@ import { ActionManager } from "../../Actions/actionManager";
 import type { IParticleSystem } from "../../Particles/IParticleSystem";
 import { Skeleton } from "../../Bones/skeleton";
 import { MorphTargetManager } from "../../Morph/morphTargetManager";
-import { CannonJSPlugin } from "../../Physics/Plugins/cannonJSPlugin";
-import { OimoJSPlugin } from "../../Physics/Plugins/oimoJSPlugin";
-import { AmmoJSPlugin } from "../../Physics/Plugins/ammoJSPlugin";
+import { CannonJSPlugin } from "../../Physics/v1/Plugins/cannonJSPlugin";
+import { OimoJSPlugin } from "../../Physics/v1/Plugins/oimoJSPlugin";
+import { AmmoJSPlugin } from "../../Physics/v1/Plugins/ammoJSPlugin";
 import { ReflectionProbe } from "../../Probes/reflectionProbe";
 import { GetClass } from "../../Misc/typeStore";
 import { Tools } from "../../Misc/tools";

packages/dev/core/src/Meshes/mesh.ts

@@ -38,11 +38,12 @@ import type { Path3D } from "../Maths/math.path";
 import type { Plane } from "../Maths/math.plane";
 import type { TransformNode } from "./transformNode";
 import type { DrawWrapper } from "../Materials/drawWrapper";
+import type { PhysicsEngine as PhysicsEngineV1 } from "../Physics/v1/physicsEngine";
 
 declare type GoldbergMesh = import("./goldbergMesh").GoldbergMesh;
 declare type InstancedMesh = import("./instancedMesh").InstancedMesh;
-declare type IPhysicsEnabledObject = import("../Physics/physicsImpostor").IPhysicsEnabledObject;
-declare type PhysicsImpostor = import("../Physics/physicsImpostor").PhysicsImpostor;
+declare type IPhysicsEnabledObject = import("../Physics/v1/physicsImpostor").IPhysicsEnabledObject;
+declare type PhysicsImpostor = import("../Physics/v1/physicsImpostor").PhysicsImpostor;
 
 /**
  * @internal
@@ -662,8 +663,8 @@ export class Mesh extends AbstractMesh implements IGetSetVerticesData {
             // Physics clone
             if (scene.getPhysicsEngine) {
                 const physicsEngine = scene.getPhysicsEngine();
-                if (clonePhysicsImpostor && physicsEngine) {
-                    const impostor = physicsEngine.getImpostorForPhysicsObject(source);
+                if (clonePhysicsImpostor && physicsEngine && physicsEngine.getPluginVersion() === 1) {
+                    const impostor = (physicsEngine as PhysicsEngineV1).getImpostorForPhysicsObject(source);
                     if (impostor) {
                         this.physicsImpostor = impostor.clone(this);
                     }

packages/dev/core/src/Physics/IPhysicsEngine.ts

@@ -1,71 +1,7 @@
-import type { Nullable } from "../types";
-import type { Vector3, Quaternion } from "../Maths/math.vector";
-import type { AbstractMesh } from "../Meshes/abstractMesh";
-import type { PhysicsImpostor, IPhysicsEnabledObject } from "./physicsImpostor";
-import type { PhysicsJoint, IMotorEnabledJoint } from "./physicsJoint";
+import type { Vector3 } from "../Maths/math.vector";
 import type { PhysicsRaycastResult } from "./physicsRaycastResult";
-
-/**
- * Interface used to describe a physics joint
- */
-export interface PhysicsImpostorJoint {
-    /** Defines the main impostor to which the joint is linked */
-    mainImpostor: PhysicsImpostor;
-    /** Defines the impostor that is connected to the main impostor using this joint */
-    connectedImpostor: PhysicsImpostor;
-    /** Defines the joint itself */
-    joint: PhysicsJoint;
-}
-
-/** @internal */
-export interface IPhysicsEnginePlugin {
-    world: any;
-    name: string;
-    setGravity(gravity: Vector3): void;
-    setTimeStep(timeStep: number): void;
-    getTimeStep(): number;
-    executeStep(delta: number, impostors: Array<PhysicsImpostor>): void; //not forgetting pre and post events
-    applyImpulse(impostor: PhysicsImpostor, force: Vector3, contactPoint: Vector3): void;
-    applyForce(impostor: PhysicsImpostor, force: Vector3, contactPoint: Vector3): void;
-    generatePhysicsBody(impostor: PhysicsImpostor): void;
-    removePhysicsBody(impostor: PhysicsImpostor): void;
-    generateJoint(joint: PhysicsImpostorJoint): void;
-    removeJoint(joint: PhysicsImpostorJoint): void;
-    isSupported(): boolean;
-    setTransformationFromPhysicsBody(impostor: PhysicsImpostor): void;
-    setPhysicsBodyTransformation(impostor: PhysicsImpostor, newPosition: Vector3, newRotation: Quaternion): void;
-    setLinearVelocity(impostor: PhysicsImpostor, velocity: Nullable<Vector3>): void;
-    setAngularVelocity(impostor: PhysicsImpostor, velocity: Nullable<Vector3>): void;
-    getLinearVelocity(impostor: PhysicsImpostor): Nullable<Vector3>;
-    getAngularVelocity(impostor: PhysicsImpostor): Nullable<Vector3>;
-    setBodyMass(impostor: PhysicsImpostor, mass: number): void;
-    getBodyMass(impostor: PhysicsImpostor): number;
-    getBodyFriction(impostor: PhysicsImpostor): number;
-    setBodyFriction(impostor: PhysicsImpostor, friction: number): void;
-    getBodyRestitution(impostor: PhysicsImpostor): number;
-    setBodyRestitution(impostor: PhysicsImpostor, restitution: number): void;
-    getBodyPressure?(impostor: PhysicsImpostor): number;
-    setBodyPressure?(impostor: PhysicsImpostor, pressure: number): void;
-    getBodyStiffness?(impostor: PhysicsImpostor): number;
-    setBodyStiffness?(impostor: PhysicsImpostor, stiffness: number): void;
-    getBodyVelocityIterations?(impostor: PhysicsImpostor): number;
-    setBodyVelocityIterations?(impostor: PhysicsImpostor, velocityIterations: number): void;
-    getBodyPositionIterations?(impostor: PhysicsImpostor): number;
-    setBodyPositionIterations?(impostor: PhysicsImpostor, positionIterations: number): void;
-    appendAnchor?(impostor: PhysicsImpostor, otherImpostor: PhysicsImpostor, width: number, height: number, influence: number, noCollisionBetweenLinkedBodies: boolean): void;
-    appendHook?(impostor: PhysicsImpostor, otherImpostor: PhysicsImpostor, length: number, influence: number, noCollisionBetweenLinkedBodies: boolean): void;
-    sleepBody(impostor: PhysicsImpostor): void;
-    wakeUpBody(impostor: PhysicsImpostor): void;
-    raycast(from: Vector3, to: Vector3): PhysicsRaycastResult;
-    //Joint Update
-    updateDistanceJoint(joint: PhysicsJoint, maxDistance: number, minDistance?: number): void;
-    setMotor(joint: IMotorEnabledJoint, speed: number, maxForce?: number, motorIndex?: number): void;
-    setLimit(joint: IMotorEnabledJoint, upperLimit: number, lowerLimit?: number, motorIndex?: number): void;
-    getRadius(impostor: PhysicsImpostor): number;
-    getBoxSizeToRef(impostor: PhysicsImpostor, result: Vector3): void;
-    syncMeshWithImpostor(mesh: AbstractMesh, impostor: PhysicsImpostor): void;
-    dispose(): void;
-}
+import type { IPhysicsEnginePlugin as IPhysicsEnginePluginV1 } from "./v1/IPhysicsEnginePlugin";
+import type { IPhysicsEnginePlugin as IPhysicsEnginePluginV2 } from "./v2/IPhysicsEnginePlugin";
 
 /**
  * Interface used to define a physics engine
@@ -77,6 +13,10 @@ export interface IPhysicsEngine {
      */
     gravity: Vector3;
 
+    /**
+     *
+     */
+    getPluginVersion(): number;
     /**
      * Sets the gravity vector used by the simulation
      * @param gravity defines the gravity vector to use
@@ -123,61 +63,11 @@ export interface IPhysicsEngine {
      */
     getPhysicsPluginName(): string;
 
-    /**
-     * Adding a new impostor for the impostor tracking.
-     * This will be done by the impostor itself.
-     * @param impostor the impostor to add
-     */
-    addImpostor(impostor: PhysicsImpostor): void;
-
-    /**
-     * Remove an impostor from the engine.
-     * This impostor and its mesh will not longer be updated by the physics engine.
-     * @param impostor the impostor to remove
-     */
-    removeImpostor(impostor: PhysicsImpostor): void;
-
-    /**
-     * Add a joint to the physics engine
-     * @param mainImpostor defines the main impostor to which the joint is added.
-     * @param connectedImpostor defines the impostor that is connected to the main impostor using this joint
-     * @param joint defines the joint that will connect both impostors.
-     */
-    addJoint(mainImpostor: PhysicsImpostor, connectedImpostor: PhysicsImpostor, joint: PhysicsJoint): void;
-
-    /**
-     * Removes a joint from the simulation
-     * @param mainImpostor defines the impostor used with the joint
-     * @param connectedImpostor defines the other impostor connected to the main one by the joint
-     * @param joint defines the joint to remove
-     */
-    removeJoint(mainImpostor: PhysicsImpostor, connectedImpostor: PhysicsImpostor, joint: PhysicsJoint): void;
-
     /**
      * Gets the current plugin used to run the simulation
      * @returns current plugin
      */
-    getPhysicsPlugin(): IPhysicsEnginePlugin;
-
-    /**
-     * Gets the list of physic impostors
-     * @returns an array of PhysicsImpostor
-     */
-    getImpostors(): Array<PhysicsImpostor>;
-
-    /**
-     * Gets the impostor for a physics enabled object
-     * @param object defines the object impersonated by the impostor
-     * @returns the PhysicsImpostor or null if not found
-     */
-    getImpostorForPhysicsObject(object: IPhysicsEnabledObject): Nullable<PhysicsImpostor>;
-
-    /**
-     * Gets the impostor for a physics body object
-     * @param body defines physics body used by the impostor
-     * @returns the PhysicsImpostor or null if not found
-     */
-    getImpostorWithPhysicsBody(body: any): Nullable<PhysicsImpostor>;
+    getPhysicsPlugin(): IPhysicsEnginePluginV1 | IPhysicsEnginePluginV2 | null;
 
     /**
      * Does a raycast in the physics world