From 74b64a27f8e07b1b0b47b809b1a060518fa11a97 Mon Sep 17 00:00:00 2001 From: Bryan Galdrikian Date: Fri, 3 May 2019 00:25:46 -0700 Subject: Blast SDK 1.1.5 prerelease #1 --- sdk/extensions/physx/include/NvBlastExtPxManager.h | 76 +++++++++++++--------- 1 file changed, 45 insertions(+), 31 deletions(-) (limited to 'sdk/extensions/physx/include/NvBlastExtPxManager.h') diff --git a/sdk/extensions/physx/include/NvBlastExtPxManager.h b/sdk/extensions/physx/include/NvBlastExtPxManager.h index 1a6e5e3..690ab90 100755 --- a/sdk/extensions/physx/include/NvBlastExtPxManager.h +++ b/sdk/extensions/physx/include/NvBlastExtPxManager.h @@ -39,6 +39,7 @@ namespace physx { class PxPhysics; +class PxCooking; class PxRigidDynamic; class PxJoint; @@ -46,7 +47,7 @@ namespace general_PxIOStream2 { class PxFileBuf; } -} +} // namespace physx namespace Nv @@ -63,6 +64,7 @@ class TkFamily; class TkFramework; class TkGroup; class TkJoint; +class ExtPxCollisionBuilder; /** @@ -72,9 +74,10 @@ Used to create Physics Family. */ struct ExtPxFamilyDesc { - ExtPxAsset* pxAsset; //!< px asset to create from, pointer will be stored in family. - const NvBlastActorDesc* actorDesc; //!< actor descriptor to be used when creating TkActor. If nullptr, default NvBlastActorDesc from ExtPxAsset will be used. - TkGroup* group; //!< if not nullptr, created TkActor will be placed in group + ExtPxAsset* pxAsset; //!< px asset to create from, pointer will be stored in family. + const NvBlastActorDesc* actorDesc; //!< actor descriptor to be used when creating TkActor. If nullptr, default + //!< NvBlastActorDesc from ExtPxAsset will be used. + TkGroup* group; //!< if not nullptr, created TkActor will be placed in group }; @@ -83,7 +86,9 @@ Function pointer for PxJoint creation. It will be called when new joints are being created. It should return valid PxJoint pointer or nullptr. */ -typedef physx::PxJoint*(*ExtPxCreateJointFunction)(ExtPxActor* actor0, const physx::PxTransform& localFrame0, ExtPxActor* actor1, const physx::PxTransform& localFrame1, physx::PxPhysics& physics, TkJoint& joint); +typedef physx::PxJoint* (*ExtPxCreateJointFunction)(ExtPxActor* actor0, const physx::PxTransform& localFrame0, + ExtPxActor* actor1, const physx::PxTransform& localFrame1, + physx::PxPhysics& physics, TkJoint& joint); /** @@ -93,7 +98,7 @@ Used to create and manage Physics Families. */ class NV_DLL_EXPORT ExtPxManager { -public: + public: //////// manager creation //////// /** @@ -101,18 +106,25 @@ public: \param[in] physics The PxPhysics instance to be used by ExtPxManager. \param[in] framework The TkFramework instance to be used by ExtPxManager. + \param[in] cooking The optional PxCooking. Required for collision builder. \param[in] createFn The function to be used when creating joints, can be nullptr. - \param[in] useUserData Flag if ExtPxManager is allowed to override PxActor's userData, it will store pointer to PxActor there. - It is recommended as fastest way. If set to 'false' HashMap will be used. + \param[in] useUserData Flag if ExtPxManager is allowed to override PxActor's userData, it will store pointer to + PxActor there. It is recommended as fastest way. If set to 'false' HashMap will be used. \return the new ExtPxManager if successful, NULL otherwise. */ - static ExtPxManager* create(physx::PxPhysics& physics, TkFramework& framework, ExtPxCreateJointFunction createFn = nullptr, bool useUserData = true); + static ExtPxManager* create(physx::PxPhysics& physics, TkFramework& framework, + ExtPxCreateJointFunction createFn = nullptr, bool useUserData = true); + + /** + Create PhysX based convex mesh builder. + */ + static ExtPxCollisionBuilder* createCollisionBuilder(physx::PxPhysics& physics, physx::PxCooking& cooking); /** Release this manager. */ - virtual void release() = 0; + virtual void release() = 0; //////// impact //////// @@ -133,9 +145,10 @@ public: \param[in] desc The family descriptor (see ExtPxFamilyDesc). - \return the created family, if the descriptor was valid and memory was available for the operation. Otherwise, returns NULL. + \return the created family, if the descriptor was valid and memory was available for the operation. Otherwise, + returns NULL. */ - virtual ExtPxFamily* createFamily(const ExtPxFamilyDesc& desc) = 0; + virtual ExtPxFamily* createFamily(const ExtPxFamilyDesc& desc) = 0; /** Create a px joint associated with TkJoint. @@ -147,28 +160,28 @@ public: \return true iff Joint was created. */ - virtual bool createJoint(TkJoint& joint) = 0; + virtual bool createJoint(TkJoint& joint) = 0; /** Destroy a px joint associated with TkJoint. \param[in] joint TkJoint to be used to destroy px joint. */ - virtual void destroyJoint(TkJoint& joint) = 0; + virtual void destroyJoint(TkJoint& joint) = 0; /** Set ExtPxCreateJointFunction to be used when new joints are being created.\ \param[in] createFn Create function pointer to set, can be nullptr. */ - virtual void setCreateJointFunction(ExtPxCreateJointFunction createFn) = 0; + virtual void setCreateJointFunction(ExtPxCreateJointFunction createFn) = 0; /** The number of families currently in this manager. \return the number of ExtPxFamily that currently exist in this manger. */ - virtual uint32_t getFamilyCount() const = 0; + virtual uint32_t getFamilyCount() const = 0; /** Retrieve an array of pointers (into the user-supplied buffer) to families. @@ -178,7 +191,7 @@ public: \return the number of ExtPxFamily pointers written to the buffer. */ - virtual uint32_t getFamilies(ExtPxFamily** buffer, uint32_t bufferSize) const = 0; + virtual uint32_t getFamilies(ExtPxFamily** buffer, uint32_t bufferSize) const = 0; /** Look up an associated ExtPxFamily by TkFamily pointer. @@ -187,7 +200,7 @@ public: \return pointer to the ExtPxFamily object if it exists, NULL otherwise. */ - virtual ExtPxFamily* getFamilyFromTkFamily(TkFamily& family) const = 0; + virtual ExtPxFamily* getFamilyFromTkFamily(TkFamily& family) const = 0; /** Look up an associated ExtPxActor by PxRigidDynamic pointer. @@ -196,68 +209,69 @@ public: \return pointer to the ExtPxActor object if it exists, NULL otherwise. */ - virtual ExtPxActor* getActorFromPhysXActor(const physx::PxRigidDynamic& pxActor) const = 0; + virtual ExtPxActor* getActorFromPhysXActor(const physx::PxRigidDynamic& pxActor) const = 0; /** Get a PxPhysics object pointer used upon manager creation. \return a pointer to the (const) PxPhysics object. */ - virtual physx::PxPhysics& getPhysics() const = 0; + virtual physx::PxPhysics& getPhysics() const = 0; /** Get a TkFramework object pointer used upon manager creation. \return a pointer to the TkFramework object. */ - virtual TkFramework& getFramework() const = 0; + virtual TkFramework& getFramework() const = 0; /** Get if useUserData was set upon manager creation. \return true iff PxActor userData is used by manager. */ - virtual bool isPxUserDataUsed() const = 0; + virtual bool isPxUserDataUsed() const = 0; /** Limits the total number of actors that can exist at a given time. A value of zero disables this (gives no limit). \param[in] limit If not zero, the maximum number of actors that will be allowed to exist. */ - virtual void setActorCountLimit(uint32_t limit) = 0; + virtual void setActorCountLimit(uint32_t limit) = 0; /** - Retrieve the limit to the total number of actors that can exist at a given time. A value of zero disables this (gives no limit). + Retrieve the limit to the total number of actors that can exist at a given time. A value of zero disables this + (gives no limit). \return the limit to the total number of actors that can exist at a given time (or zero if there is no limit). */ - virtual uint32_t getActorCountLimit() = 0; + virtual uint32_t getActorCountLimit() = 0; /** The total number of PxActors generated by Blast. \return the total number of PxActors generated by Blast. */ - virtual uint32_t getPxActorCount() const = 0; + virtual uint32_t getPxActorCount() const = 0; /** Add a user implementation of ExtPxListener to this family's list of listeners. \param[in] listener The event listener to add. */ - virtual void subscribe(ExtPxListener& listener) = 0; + virtual void subscribe(ExtPxListener& listener) = 0; /** Remove a user implementation of ExtPxListener from this family's list of listeners. \param[in] listener The event listener to remove. */ - virtual void unsubscribe(ExtPxListener& listener) = 0; + virtual void unsubscribe(ExtPxListener& listener) = 0; }; -} // namespace Blast -} // namespace Nv +} // namespace Blast +} // namespace Nv -#endif // ifndef NVBLASTEXTPXMANAGER_H +#endif // ifndef NVBLASTEXTPXMANAGER_H -- cgit v1.2.3