Revert "update bullet, physx for debug draw (#419)" (#421)

This reverts commit fce5974adb.
This commit is contained in:
minggo 2023-09-13 16:23:10 +08:00 committed by GitHub
parent ab01b1e0af
commit 1a551ab783
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 24382 additions and 26879 deletions

File diff suppressed because one or more lines are too long

View File

@ -42,8 +42,6 @@ declare namespace Bullet {
// constraints // constraints
TypedConstraint_getFixedBody(): ptr; TypedConstraint_getFixedBody(): ptr;
TypedConstraint_getDbgDrawSize(): number;
TypedConstraint_setDbgDrawSize(p: ptr, dbgDrawSize: number): void;
HingeConstraint_new(ptr0: ptr, ptr1: ptr, ptr2: ptr, ptr3: ptr): ptr; HingeConstraint_new(ptr0: ptr, ptr1: ptr, ptr2: ptr, ptr3: ptr): ptr;
HingeConstraint_setFrames(ptr0: ptr, ptr1: ptr, ptr2: ptr): void; HingeConstraint_setFrames(ptr0: ptr, ptr1: ptr, ptr2: ptr): void;
HingeConstraint_setLimit(p: ptr, low: number, upper: number, softness: number, biasFactor: number, relaxationFactor: number): void; HingeConstraint_setLimit(p: ptr, low: number, upper: number, softness: number, biasFactor: number, relaxationFactor: number): void;
@ -210,8 +208,6 @@ declare namespace Bullet {
CollisionWorld_removeCollisionObject(p: ptr, body: ptr): void; CollisionWorld_removeCollisionObject(p: ptr, body: ptr): void;
CollisionWorld_rayTest(p: ptr, p0: ptr, p1: ptr, p2: ptr): void; CollisionWorld_rayTest(p: ptr, p0: ptr, p1: ptr, p2: ptr): void;
CollisionWorld_convexSweepTest(p: ptr, castShape: ptr, from: ptr, to: ptr, resultCallback: ptr, allowedCcdPenetration: ptr): void; CollisionWorld_convexSweepTest(p: ptr, castShape: ptr, from: ptr, to: ptr, resultCallback: ptr, allowedCcdPenetration: ptr): void;
CollisionWorld_setDebugDrawer(p: ptr, drawer: ptr): void;
CollisionWorld_debugDrawWorld(p: ptr): void;
ccDiscreteDynamicsWorld_new(dispatcher: ptr, pairCache: ptr, solver: ptr): ptr; ccDiscreteDynamicsWorld_new(dispatcher: ptr, pairCache: ptr, solver: ptr): ptr;
ccDiscreteDynamicsWorld_setAllowSleep(p: ptr, v: boolean): void; ccDiscreteDynamicsWorld_setAllowSleep(p: ptr, v: boolean): void;
@ -224,18 +220,6 @@ declare namespace Bullet {
DynamicsWorld_addAction(p: ptr, action: ptr): void; DynamicsWorld_addAction(p: ptr, action: ptr): void;
DynamicsWorld_removeAction(p: ptr, action: ptr): void; DynamicsWorld_removeAction(p: ptr, action: ptr): void;
DebugDraw_new(): ptr;
DebugDraw_setDebugMode(p: ptr, debugMode: number): void;
DebugDraw_getDebugMode(p: ptr): number;
DebugDraw_setActiveObjectColor(p: ptr, r: number, g: number, b: number): void;
DebugDraw_setDeactiveObjectColor(p: ptr, r: number, g: number, b: number): void;
DebugDraw_setWantsDeactivationObjectColor(p: ptr, r: number, g: number, b: number): void;
DebugDraw_setDisabledDeactivationObjectColor(p: ptr, r: number, g: number, b: number): void;
DebugDraw_setDisabledSimulationObjectColor(p: ptr, r: number, g: number, b: number): void;
DebugDraw_setAABBColor(p: ptr, r: number, g: number, b: number): void;
DebugDraw_setContactPointColor(p: ptr, r: number, g: number, b: number): void;
DebugDraw_setConstraintLimitColor(p: ptr, r: number, g: number, b: number): void;
RayCallback_hasHit(p: ptr): boolean; RayCallback_hasHit(p: ptr): boolean;
ConvexCallback_hasHit(p: ptr): boolean; ConvexCallback_hasHit(p: ptr): boolean;
@ -279,19 +263,19 @@ declare namespace Bullet {
ControllerHit_getHitMotionLength(p: ptr): number; //CCT hit Motion length ControllerHit_getHitMotionLength(p: ptr): number; //CCT hit Motion length
ControllerShapeHit_getHitShape(p: ptr): ptr; ControllerShapeHit_getHitShape(p: ptr): ptr;
ControllerShapeHit_getHitCollisionObject(p: ptr): ptr; ControllerShapeHit_getHitCollisionObject(p: ptr): ptr;
CharacterController_move(ptrCCT: ptr, ptrMovement: ptr, minDist: number, deltaTime: number): number; CharacterController_move(ptrCCT: ptr, ptrMovement: ptr, minDist: number, deltaTime: number):number;
CharacterController_getPosition(ptrCCT: ptr); CharacterController_getPosition(ptrCCT: ptr);
CharacterController_setContactOffset(ptrCCT: ptr, v: number); CharacterController_setContactOffset(ptrCCT: ptr, v: number);
CharacterController_setStepOffset(ptrCCT: ptr, v: number); CharacterController_setStepOffset(ptrCCT: ptr, v: number);
CharacterController_setSlopeLimit(ptrCCT: ptr, v: number); CharacterController_setSlopeLimit(ptrCCT: ptr, v: number);
CharacterController_setCollision(ptrCCT: ptr, collision: boolean); CharacterController_setCollision(ptrCCT: ptr, collision: boolean);
CharacterController_setOverlapRecovery(ptrCCT: ptr, value: boolean); CharacterController_setOverlapRecovery(ptrCCT: ptr, value: boolean);
CapsuleCharacterControllerDesc_new(maxSlopeRadians: number, stepHeight: number, contactOffset: number, CapsuleCharacterControllerDesc_new(maxSlopeRadians: number, stepHeight: number, contactOffset: number,
ptrUpAxis: ptr, ptrInitPos: ptr, ptruUserControllerHitReport: ptr, radius: number, height: number): ptr; ptrUpAxis: ptr, ptrInitPos: ptr, ptruUserControllerHitReport: ptr, radius: number, height: number): ptr;
CapsuleCharacterController_new(collisionWorld: ptr, ptrBtCapsuleCharacterControllerDesc: ptr, userObjectPointer: ptr): ptr; CapsuleCharacterController_new(collisionWorld: ptr, ptrBtCapsuleCharacterControllerDesc: ptr, userObjectPointer: ptr): ptr;
CapsuleCharacterController_setRadius(ptrCCT: ptr, radius: number): void; CapsuleCharacterController_setRadius(ptrCCT: ptr, radius: number): void;
CapsuleCharacterController_setHeight(ptrCCT: ptr, height: number): void; CapsuleCharacterController_setHeight(ptrCCT: ptr, height: number): void;
BoxCharacterControllerDesc_new(maxSlopeRadians: number, stepHeight: number, contactOffset: number, BoxCharacterControllerDesc_new(maxSlopeRadians: number, stepHeight: number, contactOffset: number,
ptrUpAxis: ptr, ptrInitPos: ptr, ptruUserControllerHitReport: ptr, halfHeight: number, halfSideExtent: number, halfForwardExtent: number): ptr; ptrUpAxis: ptr, ptrInitPos: ptr, ptruUserControllerHitReport: ptr, halfHeight: number, halfSideExtent: number, halfForwardExtent: number): ptr;
BoxCharacterController_new(collisionWorld: ptr, ptrBtBoxCharacterControllerDesc: ptr, userObjectPointer: ptr): ptr; BoxCharacterController_new(collisionWorld: ptr, ptrBtBoxCharacterControllerDesc: ptr, userObjectPointer: ptr): ptr;
BoxCharacterController_setHalfHeight(ptrCCT: ptr, v: number): void; BoxCharacterController_setHalfHeight(ptrCCT: ptr, v: number): void;

Binary file not shown.

View File

@ -1,3 +1,4 @@
interface Vec3 { interface Vec3 {
x: number, y: number, z: number x: number, y: number, z: number
} }
@ -16,7 +17,7 @@ interface FilterData {
declare namespace phy { declare namespace phy {
/// Base /// /// Base ///
const physics: Physics; const physics: Physics
abstract class Physics { abstract class Physics {
private constructor () private constructor ()
createCooking (cp: CookingParams): Cooking createCooking (cp: CookingParams): Cooking
@ -349,6 +350,8 @@ declare namespace phy {
/// Joints /// /// Joints ///
/// Extensions /// /// Extensions ///
interface Spring { interface Spring {
@ -612,22 +615,22 @@ declare namespace phy {
class SceneQueryHit { class SceneQueryHit {
private constructor () private constructor ()
actor: RigidActor; actor: RigidActor
shape: Shape; shape: Shape
faceIndex: number; faceIndex: number
} }
class RayCastHit { class RayCastHit {
private constructor () private constructor ()
actor: RigidActor; actor: RigidActor
shape: Shape; shape: Shape
faceIndex: number; faceIndex: number
u: number; u: number
v: number; v: number
normal: Vec3; normal: Vec3
position: Vec3; position: Vec3
distance: number; distance: number
flags: number; flags: number
} }
type preFilter = (filterData: FilterData, shape: Shape, actor: RigidActor, hitFlags: number) => QueryHitType type preFilter = (filterData: FilterData, shape: Shape, actor: RigidActor, hitFlags: number) => QueryHitType
@ -692,7 +695,7 @@ declare namespace phy {
/** /**
\brief Internal flag, used by #PxContactPair.extractContacts() \brief Internal flag, used by #PxContactPair.extractContacts()
The applied contact impulses are provided for every contact point. The applied contact impulses are provided for every contact point.
This is the case if #PxPairFlag::eSOLVE_CONTACT has been set for the pair. This is the case if #PxPairFlag::eSOLVE_CONTACT has been set for the pair.
*/ */
eINTERNAL_HAS_IMPULSES = (1 << 4), eINTERNAL_HAS_IMPULSES = (1 << 4),
@ -725,9 +728,9 @@ declare namespace phy {
/** /**
\brief Call contact report callback or trigger callback when this collision pair starts to be in contact. \brief Call contact report callback or trigger callback when this collision pair starts to be in contact.
If one of the two collision objects is a trigger shape (see #PxShapeFlag::eTRIGGER_SHAPE) If one of the two collision objects is a trigger shape (see #PxShapeFlag::eTRIGGER_SHAPE)
then the trigger callback will get called as soon as the other object enters the trigger volume. then the trigger callback will get called as soon as the other object enters the trigger volume.
If none of the two collision objects is a trigger shape then the contact report callback will get If none of the two collision objects is a trigger shape then the contact report callback will get
called when the actors of this collision pair start to be in contact. called when the actors of this collision pair start to be in contact.
\note Only takes effect if the colliding actors are rigid bodies. \note Only takes effect if the colliding actors are rigid bodies.
@ -741,7 +744,7 @@ declare namespace phy {
/** /**
\brief Call contact report callback while this collision pair is in contact \brief Call contact report callback while this collision pair is in contact
If none of the two collision objects is a trigger shape then the contact report callback will get If none of the two collision objects is a trigger shape then the contact report callback will get
called while the actors of this collision pair are in contact. called while the actors of this collision pair are in contact.
\note Triggers do not support this event. Persistent trigger contacts need to be tracked separately by observing eNOTIFY_TOUCH_FOUND/eNOTIFY_TOUCH_LOST events. \note Triggers do not support this event. Persistent trigger contacts need to be tracked separately by observing eNOTIFY_TOUCH_FOUND/eNOTIFY_TOUCH_LOST events.
@ -761,9 +764,9 @@ declare namespace phy {
/** /**
\brief Call contact report callback or trigger callback when this collision pair stops to be in contact \brief Call contact report callback or trigger callback when this collision pair stops to be in contact
If one of the two collision objects is a trigger shape (see #PxShapeFlag::eTRIGGER_SHAPE) If one of the two collision objects is a trigger shape (see #PxShapeFlag::eTRIGGER_SHAPE)
then the trigger callback will get called as soon as the other object leaves the trigger volume. then the trigger callback will get called as soon as the other object leaves the trigger volume.
If none of the two collision objects is a trigger shape then the contact report callback will get If none of the two collision objects is a trigger shape then the contact report callback will get
called when the actors of this collision pair stop to be in contact. called when the actors of this collision pair stop to be in contact.
\note Only takes effect if the colliding actors are rigid bodies. \note Only takes effect if the colliding actors are rigid bodies.
@ -782,7 +785,7 @@ declare namespace phy {
If CCD with multiple passes is enabled, then a fast moving object might bounce on and off the same If CCD with multiple passes is enabled, then a fast moving object might bounce on and off the same
object multiple times. Hence, the same pair might be in contact multiple times during a simulation step. object multiple times. Hence, the same pair might be in contact multiple times during a simulation step.
This flag will make sure that all the detected collision during CCD will get reported. For performance This flag will make sure that all the detected collision during CCD will get reported. For performance
reasons, the system can not always tell whether the contact pair lost touch in one of the previous CCD reasons, the system can not always tell whether the contact pair lost touch in one of the previous CCD
passes and thus can also not always tell whether the contact is new or has persisted. eNOTIFY_TOUCH_CCD passes and thus can also not always tell whether the contact is new or has persisted. eNOTIFY_TOUCH_CCD
just reports when the two collision objects were detected as being in contact during a CCD pass. just reports when the two collision objects were detected as being in contact during a CCD pass.
@ -847,19 +850,19 @@ declare namespace phy {
eNOTIFY_CONTACT_POINTS = (1 << 9), eNOTIFY_CONTACT_POINTS = (1 << 9),
/** /**
\brief This flag is used to indicate whether this pair generates discrete collision detection contacts. \brief This flag is used to indicate whether this pair generates discrete collision detection contacts.
\note Contacts are only responded to if eSOLVE_CONTACT is enabled. \note Contacts are only responded to if eSOLVE_CONTACT is enabled.
*/ */
eDETECT_DISCRETE_CONTACT = (1 << 10), eDETECT_DISCRETE_CONTACT = (1 << 10),
/** /**
\brief This flag is used to indicate whether this pair generates CCD contacts. \brief This flag is used to indicate whether this pair generates CCD contacts.
\note The contacts will only be responded to if eSOLVE_CONTACT is enabled on this pair. \note The contacts will only be responded to if eSOLVE_CONTACT is enabled on this pair.
\note The scene must have PxSceneFlag::eENABLE_CCD enabled to use this feature. \note The scene must have PxSceneFlag::eENABLE_CCD enabled to use this feature.
\note Non-static bodies of the pair should have PxRigidBodyFlag::eENABLE_CCD specified for this feature to work correctly. \note Non-static bodies of the pair should have PxRigidBodyFlag::eENABLE_CCD specified for this feature to work correctly.
\note This flag is not supported with trigger shapes. However, CCD trigger events can be emulated using non-trigger shapes \note This flag is not supported with trigger shapes. However, CCD trigger events can be emulated using non-trigger shapes
and requesting eNOTIFY_TOUCH_FOUND and eNOTIFY_TOUCH_LOST and not raising eSOLVE_CONTACT on the pair. and requesting eNOTIFY_TOUCH_FOUND and eNOTIFY_TOUCH_LOST and not raising eSOLVE_CONTACT on the pair.
@see PxRigidBodyFlag::eENABLE_CCD @see PxRigidBodyFlag::eENABLE_CCD
@ -869,40 +872,40 @@ declare namespace phy {
/** /**
\brief Provide pre solver velocities in contact reports for this collision pair. \brief Provide pre solver velocities in contact reports for this collision pair.
If the collision pair has contact reports enabled, the velocities of the rigid bodies before contacts have been solved If the collision pair has contact reports enabled, the velocities of the rigid bodies before contacts have been solved
will be provided in the contact report callback unless the pair lost touch in which case no data will be provided. will be provided in the contact report callback unless the pair lost touch in which case no data will be provided.
\note Usually it is not necessary to request these velocities as they will be available by querying the velocity from the provided \note Usually it is not necessary to request these velocities as they will be available by querying the velocity from the provided
PxRigidActor object directly. However, it might be the case that the velocity of a rigid body gets set while the simulation is running PxRigidActor object directly. However, it might be the case that the velocity of a rigid body gets set while the simulation is running
in which case the PxRigidActor would return this new velocity in the contact report callback and not the velocity the simulation used. in which case the PxRigidActor would return this new velocity in the contact report callback and not the velocity the simulation used.
@see PxSimulationEventCallback.onContact(), PxContactPairVelocity, PxContactPairHeader.extraDataStream @see PxSimulationEventCallback.onContact(), PxContactPairVelocity, PxContactPairHeader.extraDataStream
*/ */
ePRE_SOLVER_VELOCITY = (1 << 12), ePRE_SOLVER_VELOCITY = (1 << 12),
/** /**
\brief Provide post solver velocities in contact reports for this collision pair. \brief Provide post solver velocities in contact reports for this collision pair.
If the collision pair has contact reports enabled, the velocities of the rigid bodies after contacts have been solved If the collision pair has contact reports enabled, the velocities of the rigid bodies after contacts have been solved
will be provided in the contact report callback unless the pair lost touch in which case no data will be provided. will be provided in the contact report callback unless the pair lost touch in which case no data will be provided.
@see PxSimulationEventCallback.onContact(), PxContactPairVelocity, PxContactPairHeader.extraDataStream @see PxSimulationEventCallback.onContact(), PxContactPairVelocity, PxContactPairHeader.extraDataStream
*/ */
ePOST_SOLVER_VELOCITY = (1 << 13), ePOST_SOLVER_VELOCITY = (1 << 13),
/** /**
\brief Provide rigid body poses in contact reports for this collision pair. \brief Provide rigid body poses in contact reports for this collision pair.
If the collision pair has contact reports enabled, the rigid body poses at the contact event will be provided If the collision pair has contact reports enabled, the rigid body poses at the contact event will be provided
in the contact report callback unless the pair lost touch in which case no data will be provided. in the contact report callback unless the pair lost touch in which case no data will be provided.
\note Usually it is not necessary to request these poses as they will be available by querying the pose from the provided \note Usually it is not necessary to request these poses as they will be available by querying the pose from the provided
PxRigidActor object directly. However, it might be the case that the pose of a rigid body gets set while the simulation is running PxRigidActor object directly. However, it might be the case that the pose of a rigid body gets set while the simulation is running
in which case the PxRigidActor would return this new pose in the contact report callback and not the pose the simulation used. in which case the PxRigidActor would return this new pose in the contact report callback and not the pose the simulation used.
Another use case is related to CCD with multiple passes enabled, A fast moving object might bounce on and off the same Another use case is related to CCD with multiple passes enabled, A fast moving object might bounce on and off the same
object multiple times. This flag can be used to request the rigid body poses at the time of impact for each such collision event. object multiple times. This flag can be used to request the rigid body poses at the time of impact for each such collision event.
@see PxSimulationEventCallback.onContact(), PxContactPairPose, PxContactPairHeader.extraDataStream @see PxSimulationEventCallback.onContact(), PxContactPairPose, PxContactPairHeader.extraDataStream
*/ */
eCONTACT_EVENT_POSE = (1 << 14), eCONTACT_EVENT_POSE = (1 << 14),
@ -939,40 +942,36 @@ declare namespace phy {
*/ */
eRIGID_DYNAMIC, eRIGID_DYNAMIC,
eARTICULATION_LINK eARTICULATION_LINK
} }
enum ActorFlag { enum ActorFlag {
/** /**
\brief Enable debug renderer for this actor /**
@see PxScene.getRenderBuffer() PxRenderBuffer PxVisualizationParameter \brief Disables scene gravity for this actor
*/ */
eVISUALIZATION = (1 << 0),
/**
\brief Disables scene gravity for this actor
*/
eDISABLE_GRAVITY = (1 << 1), eDISABLE_GRAVITY = (1 << 1),
/** /**
\brief Enables the sending of SimulationEventCallback::onWake() and SimulationEventCallback::onSleep() notify events \brief Enables the sending of SimulationEventCallback::onWake() and SimulationEventCallback::onSleep() notify events
@see SimulationEventCallback::onWake() SimulationEventCallback::onSleep() @see SimulationEventCallback::onWake() SimulationEventCallback::onSleep()
*/ */
eSEND_SLEEP_NOTIFIES = (1 << 2), eSEND_SLEEP_NOTIFIES = (1 << 2),
/** /**
\brief Disables simulation for the actor. \brief Disables simulation for the actor.
\note This is only supported by RigidStatic and RigidDynamic actors and can be used to reduce the memory footprint when rigid actors are \note This is only supported by RigidStatic and RigidDynamic actors and can be used to reduce the memory footprint when rigid actors are
used for scene queries only. used for scene queries only.
\note Setting this flag will remove all constraints attached to the actor from the scene. \note Setting this flag will remove all constraints attached to the actor from the scene.
\note If this flag is set, the following calls are forbidden: \note If this flag is set, the following calls are forbidden:
\li RigidBody: setLinearVelocity(), setAngularVelocity(), addForce(), addTorque(), clearForce(), clearTorque() \li RigidBody: setLinearVelocity(), setAngularVelocity(), addForce(), addTorque(), clearForce(), clearTorque()
\li RigidDynamic: setKinematicTarget(), setWakeCounter(), wakeUp(), putToSleep() \li RigidDynamic: setKinematicTarget(), setWakeCounter(), wakeUp(), putToSleep()
\par <b>Sleeping:</b> \par <b>Sleeping:</b>
Raising this flag will set all velocities and the wake counter to 0, clear all forces, clear the kinematic target, put the actor Raising this flag will set all velocities and the wake counter to 0, clear all forces, clear the kinematic target, put the actor
to sleep and wake up all touching actors from the previous frame. to sleep and wake up all touching actors from the previous frame.
@ -985,9 +984,9 @@ declare namespace phy {
/** /**
\brief Enables kinematic mode for the actor. \brief Enables kinematic mode for the actor.
Kinematic actors are special dynamic actors that are not Kinematic actors are special dynamic actors that are not
influenced by forces (such as gravity), and have no momentum. They are considered to have infinite influenced by forces (such as gravity), and have no momentum. They are considered to have infinite
mass and can be moved around the world using the setKinematicTarget() method. They will push mass and can be moved around the world using the setKinematicTarget() method. They will push
regular dynamic actors out of the way. Kinematics will not collide with static or other kinematic objects. regular dynamic actors out of the way. Kinematics will not collide with static or other kinematic objects.
Kinematic actors are great for moving platforms or characters, where direct motion control is desired. Kinematic actors are great for moving platforms or characters, where direct motion control is desired.
@ -1009,7 +1008,7 @@ declare namespace phy {
\brief Use the kinematic target transform for scene queries. \brief Use the kinematic target transform for scene queries.
If this flag is raised, then scene queries will treat the kinematic target transform as the current pose If this flag is raised, then scene queries will treat the kinematic target transform as the current pose
of the body (instead of using the actual pose). Without this flag, the kinematic target will only take of the body (instead of using the actual pose). Without this flag, the kinematic target will only take
effect with respect to scene queries after a simulation step. effect with respect to scene queries after a simulation step.
@see RigidDynamic.setKinematicTarget() @see RigidDynamic.setKinematicTarget()
@ -1019,9 +1018,9 @@ declare namespace phy {
/** /**
\brief Enables swept integration for the actor. \brief Enables swept integration for the actor.
If this flag is raised and CCD is enabled on the scene, then this body will be simulated by the CCD system to ensure that collisions are not missed due to If this flag is raised and CCD is enabled on the scene, then this body will be simulated by the CCD system to ensure that collisions are not missed due to
high-speed motion. Note individual shape pairs still need to enable PairFlag::eDETECT_CCD_CONTACT in the collision filtering to enable the CCD to respond to high-speed motion. Note individual shape pairs still need to enable PairFlag::eDETECT_CCD_CONTACT in the collision filtering to enable the CCD to respond to
individual interactions. individual interactions.
\note kinematic actors are incompatible with CCD so this flag will be cleared automatically when raised on a kinematic actor \note kinematic actors are incompatible with CCD so this flag will be cleared automatically when raised on a kinematic actor
@ -1031,8 +1030,8 @@ declare namespace phy {
/** /**
\brief Enabled CCD in swept integration for the actor. \brief Enabled CCD in swept integration for the actor.
If this flag is raised and CCD is enabled, CCD interactions will simulate friction. By default, friction is disabled in CCD interactions because If this flag is raised and CCD is enabled, CCD interactions will simulate friction. By default, friction is disabled in CCD interactions because
CCD friction has been observed to introduce some simulation artifacts. CCD friction was enabled in previous versions of the SDK. Raising this flag will result in behavior CCD friction has been observed to introduce some simulation artifacts. CCD friction was enabled in previous versions of the SDK. Raising this flag will result in behavior
that is a closer match for previous versions of the SDK. that is a closer match for previous versions of the SDK.
\note This flag requires RigidBodyFlag::eENABLE_CCD to be raised to have any effect. \note This flag requires RigidBodyFlag::eENABLE_CCD to be raised to have any effect.
@ -1108,9 +1107,9 @@ declare namespace phy {
eACCELERATION2 = 512, //!< a group of acceleration drive constraints with the same stiffness and drive parameters eACCELERATION2 = 512, //!< a group of acceleration drive constraints with the same stiffness and drive parameters
eACCELERATION3 = 768, //!< a group of acceleration drive constraints with the same stiffness and drive parameters eACCELERATION3 = 768, //!< a group of acceleration drive constraints with the same stiffness and drive parameters
eROTATIONAL_EQUALITY = 1024, //!< rotational equality constraints with no force limit and no velocity target eROTATIONAL_EQUALITY = 1024, //!< rotational equality constraints with no force limit and no velocity target
eROTATIONAL_INEQUALITY = 1025, //!< rotational inequality constraints with (0, PX_MAX_FLT) force limits eROTATIONAL_INEQUALITY = 1025, //!< rotational inequality constraints with (0, PX_MAX_FLT) force limits
eEQUALITY = 2048, //!< equality constraints with no force limit and no velocity target eEQUALITY = 2048, //!< equality constraints with no force limit and no velocity target
eINEQUALITY = 2049 //!< inequality constraints with (0, PX_MAX_FLT) force limits eINEQUALITY = 2049 //!< inequality constraints with (0, PX_MAX_FLT) force limits
} }
enum ConvexFlag { enum ConvexFlag {
@ -1124,20 +1123,20 @@ declare namespace phy {
/** /**
Automatically recomputes the hull from the vertices. If this flag is not set, you must provide the entire geometry manually. Automatically recomputes the hull from the vertices. If this flag is not set, you must provide the entire geometry manually.
\note There are two different algorithms for hull computation, please see PxConvexMeshCookingType. \note There are two different algorithms for hull computation, please see PxConvexMeshCookingType.
@see PxConvexMeshCookingType @see PxConvexMeshCookingType
*/ */
eCOMPUTE_CONVEX = (1 << 1), eCOMPUTE_CONVEX = (1 << 1),
/** /**
\brief Checks and removes almost zero-area triangles during convex hull computation. \brief Checks and removes almost zero-area triangles during convex hull computation.
The rejected area size is specified in PxCookingParams::areaTestEpsilon The rejected area size is specified in PxCookingParams::areaTestEpsilon
\note This flag is only used in combination with eCOMPUTE_CONVEX. \note This flag is only used in combination with eCOMPUTE_CONVEX.
\note If this flag is used in combination with eINFLATE_CONVEX, the newly added triangles \note If this flag is used in combination with eINFLATE_CONVEX, the newly added triangles
by the inflation algorithm are not checked (size of the triangles depends on PxCooking::skinWidth). by the inflation algorithm are not checked (size of the triangles depends on PxCooking::skinWidth).
@see PxCookingParams PxCookingParams::areaTestEpsilon @see PxCookingParams PxCookingParams::areaTestEpsilon
*/ */
@ -1147,8 +1146,10 @@ declare namespace phy {
\brief Inflates the convex points according to skin width. \brief Inflates the convex points according to skin width.
\note eINFLATE_CONVEX flag has been deprecated. The flag is automatically used when \note eINFLATE_CONVEX flag has been deprecated. The flag is automatically used when
PxConvexMeshCookingType::eINFLATION_INCREMENTAL_HULL is set. The default algorithm PxConvexMeshCookingType::eINFLATION_INCREMENTAL_HULL is set. The default algorithm
PxConvexMeshCookingType::eQUICK_HULL ignores this flag, inflation is not used. PxConvexMeshCookingType::eQUICK_HULL ignores this flag, inflation is not used.
/** /**
\brief Quantizes the input vertices using the k-means clustering \brief Quantizes the input vertices using the k-means clustering
@ -1162,7 +1163,7 @@ declare namespace phy {
/** /**
\brief Disables the convex mesh validation to speed-up hull creation. Please use separate validation \brief Disables the convex mesh validation to speed-up hull creation. Please use separate validation
function in checked/debug builds. Creating a convex mesh with invalid input data without prior validation function in checked/debug builds. Creating a convex mesh with invalid input data without prior validation
may result in undefined behavior. may result in undefined behavior.
@see PxCooking::validateConvexMesh @see PxCooking::validateConvexMesh
*/ */
@ -1171,31 +1172,32 @@ declare namespace phy {
/** /**
\brief Enables plane shifting vertex limit algorithm. \brief Enables plane shifting vertex limit algorithm.
Plane shifting is an alternative algorithm for the case when the computed hull has more vertices Plane shifting is an alternative algorithm for the case when the computed hull has more vertices
than the specified vertex limit. than the specified vertex limit.
The default algorithm computes the full hull, and an OBB around the input vertices. This OBB is then sliced The default algorithm computes the full hull, and an OBB around the input vertices. This OBB is then sliced
with the hull planes until the vertex limit is reached.The default algorithm requires the vertex limit with the hull planes until the vertex limit is reached.The default algorithm requires the vertex limit
to be set to at least 8, and typically produces results that are much better quality than are produced to be set to at least 8, and typically produces results that are much better quality than are produced
by plane shifting. by plane shifting.
When plane shifting is enabled, the hull computation stops when vertex limit is reached. The hull planes When plane shifting is enabled, the hull computation stops when vertex limit is reached. The hull planes
are then shifted to contain all input vertices, and the new plane intersection points are then used to are then shifted to contain all input vertices, and the new plane intersection points are then used to
generate the final hull with the given vertex limit.Plane shifting may produce sharp edges to vertices generate the final hull with the given vertex limit.Plane shifting may produce sharp edges to vertices
very far away from the input cloud, and does not guarantee that all input vertices are inside the resulting very far away from the input cloud, and does not guarantee that all input vertices are inside the resulting
hull.However, it can be used with a vertex limit as low as 4. hull.However, it can be used with a vertex limit as low as 4.
*/ */
ePLANE_SHIFTING = (1 << 6), ePLANE_SHIFTING = (1 << 6),
/** /**
\brief Inertia tensor computation is faster using SIMD code, but the precision is lower, which may result \brief Inertia tensor computation is faster using SIMD code, but the precision is lower, which may result
in incorrect inertia for very thin hulls. in incorrect inertia for very thin hulls.
*/ */
eFAST_INERTIA_COMPUTATION = (1 << 7), eFAST_INERTIA_COMPUTATION = (1 << 7),
/** /**
\brief Convex hull input vertices are shifted to be around origin to provide better computation stability. \brief Convex hull input vertices are shifted to be around origin to provide better computation stability.
It is recommended to provide input vertices around the origin, otherwise use this flag to improve It is recommended to provide input vertices around the origin, otherwise use this flag to improve
numerical stability. numerical stability.
\note Is used only with eCOMPUTE_CONVEX flag. \note Is used only with eCOMPUTE_CONVEX flag.
*/ */
@ -1220,9 +1222,9 @@ declare namespace phy {
/** /**
\brief When set, mesh cleaning is disabled. This makes cooking faster. \brief When set, mesh cleaning is disabled. This makes cooking faster.
When clean mesh is not performed, mesh welding is also not performed. When clean mesh is not performed, mesh welding is also not performed.
It is recommended to use only meshes that passed during validateTriangleMesh. It is recommended to use only meshes that passed during validateTriangleMesh.
*/ */
eDISABLE_CLEAN_MESH = 1 << 1, eDISABLE_CLEAN_MESH = 1 << 1,
@ -1349,6 +1351,7 @@ declare namespace phy {
*/ */
eARTICULATION = 4, eARTICULATION = 4,
} }
enum FilterObjectFlag { enum FilterObjectFlag {
@ -1372,10 +1375,10 @@ declare namespace phy {
enum HeightFieldFormat { enum HeightFieldFormat {
/** /**
\brief Height field height data is 16 bit signed integers, followed by triangle materials. \brief Height field height data is 16 bit signed integers, followed by triangle materials.
Each sample is 32 bits wide arranged as follows: Each sample is 32 bits wide arranged as follows:
\image html heightFieldFormat_S16_TM.png \image html heightFieldFormat_S16_TM.png
1) First there is a 16 bit height value. 1) First there is a 16 bit height value.
@ -1383,8 +1386,8 @@ declare namespace phy {
(so the material index is only 7 bits). (so the material index is only 7 bits).
The high bit of material0 is the tess-flag. The high bit of material0 is the tess-flag.
The high bit of material1 is reserved for future use. The high bit of material1 is reserved for future use.
There are zero or more unused bytes before the next sample depending on HeightFieldDesc.sampleStride, There are zero or more unused bytes before the next sample depending on HeightFieldDesc.sampleStride,
where the application may eventually keep its own data. where the application may eventually keep its own data.
This is the only format supported at the moment. This is the only format supported at the moment.
@ -1397,8 +1400,8 @@ declare namespace phy {
enum HeightFieldFlag { enum HeightFieldFlag {
/** /**
\brief Disable collisions with height field with boundary edges. \brief Disable collisions with height field with boundary edges.
Raise this flag if several terrain patches are going to be placed adjacent to each other, Raise this flag if several terrain patches are going to be placed adjacent to each other,
to avoid a bump when sliding across. to avoid a bump when sliding across.
This flag is ignored in contact generation with sphere and capsule shapes. This flag is ignored in contact generation with sphere and capsule shapes.
@ -1433,7 +1436,7 @@ declare namespace phy {
} }
enum D6JointDriveFlag { enum D6JointDriveFlag {
eACCELERATION = 1 //!< drive spring is for the acceleration at the joint (rather than the force) eACCELERATION = 1 //!< drive spring is for the acceleration at the joint (rather than the force)
} }
enum JointActorIndex { enum JointActorIndex {
@ -1469,7 +1472,7 @@ declare namespace phy {
hold objects in place (or slow them down) and this is handled in the solver. But since the hold objects in place (or slow them down) and this is handled in the solver. But since the
solver is only an approximation, the result of the friction calculation can include a small solver is only an approximation, the result of the friction calculation can include a small
"error" - e.g. a box resting on a slope should not move at all if the static friction is in "error" - e.g. a box resting on a slope should not move at all if the static friction is in
action, but could slowly glide down the slope because of a small friction error in each action, but could slowly glide down the slope because of a small friction error in each
simulation step. The strong friction counter-acts this by remembering the small error and simulation step. The strong friction counter-acts this by remembering the small error and
taking it to account during the next simulation step. taking it to account during the next simulation step.
@ -1523,10 +1526,10 @@ declare namespace phy {
/** /**
\brief Enables a simplified swept integration strategy, which sacrifices some accuracy for improved performance. \brief Enables a simplified swept integration strategy, which sacrifices some accuracy for improved performance.
This simplified swept integration approach makes certain assumptions about the motion of objects that are not made when using a full swept integration. This simplified swept integration approach makes certain assumptions about the motion of objects that are not made when using a full swept integration.
These assumptions usually hold but there are cases where they could result in incorrect behavior between a set of fast-moving rigid bodies. A key issue is that These assumptions usually hold but there are cases where they could result in incorrect behavior between a set of fast-moving rigid bodies. A key issue is that
fast-moving dynamic objects may tunnel through each-other after a rebound. This will not happen if this mode is disabled. However, this approach will be potentially fast-moving dynamic objects may tunnel through each-other after a rebound. This will not happen if this mode is disabled. However, this approach will be potentially
faster than a full swept integration because it will perform significantly fewer sweeps in non-trivial scenes involving many fast-moving objects. This approach faster than a full swept integration because it will perform significantly fewer sweeps in non-trivial scenes involving many fast-moving objects. This approach
should successfully resist objects passing through the static environment. should successfully resist objects passing through the static environment.
PairFlag::eDETECT_CCD_CONTACT requires this flag to be specified. PairFlag::eDETECT_CCD_CONTACT requires this flag to be specified.
@ -1542,8 +1545,8 @@ declare namespace phy {
eDISABLE_CCD_RESWEEP = (1 << 3), eDISABLE_CCD_RESWEEP = (1 << 3),
/** /**
\brief Enable adaptive forces to accelerate convergence of the solver. \brief Enable adaptive forces to accelerate convergence of the solver.
\note This flag is not mutable, and must be set in SceneDesc at scene creation. \note This flag is not mutable, and must be set in SceneDesc at scene creation.
<b>Default:</b> false <b>Default:</b> false
@ -1552,7 +1555,7 @@ declare namespace phy {
/** /**
\brief Enable GJK-based distance collision detection system. \brief Enable GJK-based distance collision detection system.
\note This flag is not mutable, and must be set in SceneDesc at scene creation. \note This flag is not mutable, and must be set in SceneDesc at scene creation.
<b>Default:</b> true <b>Default:</b> true
@ -1560,18 +1563,18 @@ declare namespace phy {
eENABLE_PCM = (1 << 9), eENABLE_PCM = (1 << 9),
/** /**
\brief Disable contact report buffer resize. Once the contact buffer is full, the rest of the contact reports will \brief Disable contact report buffer resize. Once the contact buffer is full, the rest of the contact reports will
not be buffered and sent. not be buffered and sent.
\note This flag is not mutable, and must be set in SceneDesc at scene creation. \note This flag is not mutable, and must be set in SceneDesc at scene creation.
<b>Default:</b> false <b>Default:</b> false
*/ */
eDISABLE_CONTACT_REPORT_BUFFER_RESIZE = (1 << 10), eDISABLE_CONTACT_REPORT_BUFFER_RESIZE = (1 << 10),
/** /**
\brief Disable contact cache. \brief Disable contact cache.
Contact caches are used internally to provide faster contact generation. You can disable all contact caches Contact caches are used internally to provide faster contact generation. You can disable all contact caches
if memory usage for this feature becomes too high. if memory usage for this feature becomes too high.
@ -1586,14 +1589,14 @@ declare namespace phy {
When set to true this requires that threads accessing the Scene use the When set to true this requires that threads accessing the Scene use the
multi-threaded lock methods. multi-threaded lock methods.
\note This flag is not mutable, and must be set in SceneDesc at scene creation. \note This flag is not mutable, and must be set in SceneDesc at scene creation.
@see Scene::lockRead @see Scene::lockRead
@see Scene::unlockRead @see Scene::unlockRead
@see Scene::lockWrite @see Scene::lockWrite
@see Scene::unlockWrite @see Scene::unlockWrite
<b>Default:</b> false <b>Default:</b> false
*/ */
eREQUIRE_RW_LOCK = (1 << 12), eREQUIRE_RW_LOCK = (1 << 12),
@ -1632,12 +1635,12 @@ declare namespace phy {
eEXCLUDE_KINEMATICS_FROM_ACTIVE_ACTORS = (1 << 17), eEXCLUDE_KINEMATICS_FROM_ACTIVE_ACTORS = (1 << 17),
/** /**
\brief Provides improved determinism at the expense of performance. \brief Provides improved determinism at the expense of performance.
By default, we provides limited determinism guarantees. Specifically, we guarantees that the exact scene (same actors created in the same order) and simulated using the same By default, we provides limited determinism guarantees. Specifically, we guarantees that the exact scene (same actors created in the same order) and simulated using the same
time-stepping scheme should provide the exact same behaviour. time-stepping scheme should provide the exact same behaviour.
However, if additional actors are added to the simulation, this can affect the behaviour of the existing actors in the simulation, even if the set of new actors do not interact with However, if additional actors are added to the simulation, this can affect the behaviour of the existing actors in the simulation, even if the set of new actors do not interact with
the existing actors. the existing actors.
This flag provides an additional level of determinism that guarantees that the simulation will not change if additional actors are added to the simulation, provided those actors do not interfere This flag provides an additional level of determinism that guarantees that the simulation will not change if additional actors are added to the simulation, provided those actors do not interfere
@ -1672,14 +1675,14 @@ declare namespace phy {
enum ShapeFlag { enum ShapeFlag {
/** /**
\brief The shape will partake in collision in the physical simulation. \brief The shape will partake in collision in the physical simulation.
\note It is illegal to raise the eSIMULATION_SHAPE and eTRIGGER_SHAPE flags. \note It is illegal to raise the eSIMULATION_SHAPE and eTRIGGER_SHAPE flags.
In the event that one of these flags is already raised the sdk will reject any In the event that one of these flags is already raised the sdk will reject any
attempt to raise the other. To raise the eSIMULATION_SHAPE first ensure that attempt to raise the other. To raise the eSIMULATION_SHAPE first ensure that
eTRIGGER_SHAPE is already lowered. eTRIGGER_SHAPE is already lowered.
\note This flag has no effect if simulation is disabled for the corresponding actor (see #ActorFlag::eDISABLE_SIMULATION). \note This flag has no effect if simulation is disabled for the corresponding actor (see #ActorFlag::eDISABLE_SIMULATION).
@see SimulationEventCallback.onContact() Scene.setSimulationEventCallback() Shape.setFlag(), Shape.setFlags() @see SimulationEventCallback.onContact() Scene.setSimulationEventCallback() Shape.setFlag(), Shape.setFlags()
*/ */
eSIMULATION_SHAPE = (1 << 0), eSIMULATION_SHAPE = (1 << 0),
@ -1691,20 +1694,20 @@ declare namespace phy {
/** /**
\brief The shape is a trigger which can send reports whenever other shapes enter/leave its volume. \brief The shape is a trigger which can send reports whenever other shapes enter/leave its volume.
\note Triangle meshes and heightfields can not be triggers. Shape creation will fail in these cases. \note Triangle meshes and heightfields can not be triggers. Shape creation will fail in these cases.
\note Shapes marked as triggers do not collide with other objects. If an object should act both \note Shapes marked as triggers do not collide with other objects. If an object should act both
as a trigger shape and a collision shape then create a rigid body with two shapes, one being a as a trigger shape and a collision shape then create a rigid body with two shapes, one being a
trigger shape and the other a collision shape. It is illegal to raise the eTRIGGER_SHAPE and trigger shape and the other a collision shape. It is illegal to raise the eTRIGGER_SHAPE and
eSIMULATION_SHAPE flags on a single Shape instance. In the event that one of these flags is already eSIMULATION_SHAPE flags on a single Shape instance. In the event that one of these flags is already
raised the sdk will reject any attempt to raise the other. To raise the eTRIGGER_SHAPE flag first raised the sdk will reject any attempt to raise the other. To raise the eTRIGGER_SHAPE flag first
ensure that eSIMULATION_SHAPE flag is already lowered. ensure that eSIMULATION_SHAPE flag is already lowered.
\note Shapes marked as triggers are allowed to participate in scene queries, provided the eSCENE_QUERY_SHAPE flag is set. \note Shapes marked as triggers are allowed to participate in scene queries, provided the eSCENE_QUERY_SHAPE flag is set.
\note This flag has no effect if simulation is disabled for the corresponding actor (see #ActorFlag::eDISABLE_SIMULATION). \note This flag has no effect if simulation is disabled for the corresponding actor (see #ActorFlag::eDISABLE_SIMULATION).
@see SimulationEventCallback.onTrigger() Scene.setSimulationEventCallback() Shape.setFlag(), Shape.setFlags() @see SimulationEventCallback.onTrigger() Scene.setSimulationEventCallback() Shape.setFlag(), Shape.setFlags()
*/ */
eTRIGGER_SHAPE = (1 << 2), eTRIGGER_SHAPE = (1 << 2),
@ -1733,4 +1736,4 @@ declare namespace phy {
e16_BIT_INDICES = (1 << 1) //!< Denotes the use of 16-bit vertex indices e16_BIT_INDICES = (1 << 1) //!< Denotes the use of 16-bit vertex indices
} }
} }

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long