Changes for 1.1.1

See README.md

2 files changed, 2 insertions, 47 deletions

diff --git a/sdk/toolkit/include/NvBlastTkActor.h b/sdk/toolkit/include/NvBlastTkActor.h
index 73e83cd..12db51f 100644
--- a/sdk/toolkit/include/NvBlastTkActor.h
+++ b/sdk/toolkit/include/NvBlastTkActor.h
@@ -174,38 +174,7 @@ public:
 	\param[in] program				A NvBlastDamageProgram containing damage shaders.
 	\param[in] programParams		Parameters for the NvBlastDamageProgram.
 	*/
-	virtual void				damage(const NvBlastDamageProgram& program, const NvBlastProgramParams* programParams) = 0;
-
-	/**
-	Apply damage to this actor.
-
-	Actual damage processing is deferred till the group worker process() call. Sets actor in 'pending' state.
-
-	Damage Desc will be stacked into NvBlastProgramParams. NvBlastProgramParams will be passed into shader.
-
-	Material set on actor's family will be passed into NvBlastProgramParams.
-
-	\param[in] program				A NvBlastDamageProgram containing damage shaders.
-	\param[in] damageDesc			Parameters to be put in NvBlastProgramParams, have to be POD type (will be copied).
-	\param[in] descSize				Size of damageDesc in bytes. Required to copy and store Damage Desc.
-	*/
-	virtual void				damage(const NvBlastDamageProgram& program, const void* damageDesc, uint32_t descSize) = 0;
-
-	/**
-	Apply damage to this actor.
-
-	Actual damage processing is deferred till the group worker process() call. Sets actor in 'pending' state.
-
-	Damage Desc will be stacked into NvBlastDamageProgram. NvBlastDamageProgram will be passed into shader.
-
-	This function overload explicitly sets a material to be passed into NvBlastProgramParams, it must be valid until the group endProcess() call.
-
-	\param[in] program				A NvBlastDamageProgram containing damage shaders.
-	\param[in] damageDesc			Parameters to be put in NvBlastDamageProgram, have to be POD type (will be copied).
-	\param[in] descSize				Size of damageDesc in bytes. Required to copy and store Damage Desc.
-	\param[in] material				Material to be passed into NvBlastProgramParams. Must be valid until the group endProcess() call.
-	*/
-	virtual void				damage(const NvBlastDamageProgram& program, const void* damageDesc, uint32_t descSize, const void* material) = 0;
+	virtual void				damage(const NvBlastDamageProgram& program, const void* programParams) = 0;
 
 	/**
 	Creates fracture commands for the actor using an NvBlastMaterialFunction.
@@ -219,7 +188,7 @@ public:
 	\param[in]		program			A NvBlastDamageProgram containing damage shaders.
 	\param[in]		programParams	Parameters for the NvBlastDamageProgram.
 	*/
-	virtual void				generateFracture(NvBlastFractureBuffers* commands, const NvBlastDamageProgram& program, const NvBlastProgramParams* programParams) const = 0;
+	virtual void				generateFracture(NvBlastFractureBuffers* commands, const NvBlastDamageProgram& program, const void* programParams) const = 0;
 
 	/**
 	Function applies the direct fracture and breaks graph bonds/edges as necessary. Sets actor in 'pending' state if any bonds or chunks were damaged. Dispatches FractureCommand events.
diff --git a/sdk/toolkit/include/NvBlastTkFamily.h b/sdk/toolkit/include/NvBlastTkFamily.h
index 02b91cb..5549099 100644
--- a/sdk/toolkit/include/NvBlastTkFamily.h
+++ b/sdk/toolkit/include/NvBlastTkFamily.h
@@ -119,20 +119,6 @@ public:
 	\param[in] group			The group for new actors to be placed in.
 	*/
 	virtual void					reinitialize(const NvBlastFamily* newFamily, TkGroup* group = nullptr) = 0;
-
-	/**
-	The default material to be passed into NvBlastDamageProgram when a TkActor in this family is damaged.
-
-	\return a pointer to the default material.
-	*/
-	virtual const void*				getMaterial() const = 0;
-
-	/**
-	Set the default material to be passed into NvBlastDamageProgram when a TkActor in this family is damaged.  Must be valid till group endProcess() call.
-
-	\param[in] material			The material to be the new default.
-	*/
-	virtual void					setMaterial(const void* material) = 0;
 };
 
 } // namespace Blast