Changes for 1.1.1

See README.md

3 files changed, 30 insertions, 2 deletions

diff --git a/sdk/extensions/physx/include/NvBlastExtPxAsset.h b/sdk/extensions/physx/include/NvBlastExtPxAsset.h
index 136f0d2..1de4d42 100644
--- a/sdk/extensions/physx/include/NvBlastExtPxAsset.h
+++ b/sdk/extensions/physx/include/NvBlastExtPxAsset.h
@@ -46,6 +46,8 @@ class PxFileBuf;
 }
 }
 
+class NvBlastExtDamageAccelerator;
+
 
 namespace Nv
 {
@@ -228,6 +230,16 @@ public:
 	virtual void					setUniformHealth(bool enabled) = 0;
 
 	/**
+	Set damage accelerator associated with this asset.
+	*/
+	virtual void					setAccelerator(NvBlastExtDamageAccelerator* accelerator) = 0;
+
+	/**
+	Set damage accelerator associated with this asset.
+	*/
+	virtual NvBlastExtDamageAccelerator* getAccelerator() const = 0;
+
+	/**
 	Pointer field available to the user.
 	*/
 	void*	userData;
diff --git a/sdk/extensions/physx/include/NvBlastExtPxFamily.h b/sdk/extensions/physx/include/NvBlastExtPxFamily.h
index ae48769..83b50b3 100644
--- a/sdk/extensions/physx/include/NvBlastExtPxFamily.h
+++ b/sdk/extensions/physx/include/NvBlastExtPxFamily.h
@@ -41,6 +41,8 @@ class PxScene;
 class PxTransform;
 }
 
+struct NvBlastExtMaterial;
+
 
 namespace Nv
 {
@@ -163,7 +165,7 @@ public:
 
 	\return a pointer to the (const) ExtPxAsset object.
 	*/
-	virtual const ExtPxAsset&				getPxAsset() const = 0;
+	virtual ExtPxAsset&						getPxAsset() const = 0;
 
 	/**
 	Set the default material to be used for PxRigidDynamic creation.
@@ -203,6 +205,20 @@ public:
 	virtual const ExtPxActorDescTemplate*	getPxActorDesc() const = 0;
 
 	/**
+	The default material associated with this actor family.
+
+	\return a pointer to the default material.
+	*/
+	virtual const NvBlastExtMaterial*		getMaterial() const = 0;
+
+	/**
+	Set the default material associated with this actor family.
+
+	\param[in] material			The material to be the new default.
+	*/
+	virtual void							setMaterial(const NvBlastExtMaterial* material) = 0;
+
+	/**
 	Add a user implementation of ExtPxListener to this family's list of listeners.  
 
 	\param[in]	listener		The event listener to add.
diff --git a/sdk/extensions/physx/include/NvBlastExtPxManager.h b/sdk/extensions/physx/include/NvBlastExtPxManager.h
index d4dd50c..53d4fa4 100644
--- a/sdk/extensions/physx/include/NvBlastExtPxManager.h
+++ b/sdk/extensions/physx/include/NvBlastExtPxManager.h
@@ -72,7 +72,7 @@ Used to create Physics Family.
 */
 struct ExtPxFamilyDesc
 {
-	const ExtPxAsset*		pxAsset;		//!< px asset to create from, pointer will be stored in family.
+	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
 };