From b0c11962f6012430da3bcaa2727288046b33d648 Mon Sep 17 00:00:00 2001
From: Bryan Galdrikian <bgaldrikian@nvidia.com>
Date: Tue, 24 Oct 2017 15:25:02 -0700
Subject: Changes for 1.1.1 See README.md

---
 samples/SampleBase/ui/DamageToolController.h | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'samples/SampleBase/ui/DamageToolController.h')

diff --git a/samples/SampleBase/ui/DamageToolController.h b/samples/SampleBase/ui/DamageToolController.h
index ae14064..cf07a83 100644
--- a/samples/SampleBase/ui/DamageToolController.h
+++ b/samples/SampleBase/ui/DamageToolController.h
@@ -39,6 +39,7 @@
 
 class Renderable;
 class RenderMaterial;
+class BlastFamily;
 
 namespace Nv
 {
@@ -122,7 +123,16 @@ private:
 			Line
 		};
 
-		typedef std::function<void(const Damager* damager, Nv::Blast::ExtPxActor* actor, physx::PxVec3 origin, physx::PxVec3 position, physx::PxVec3 normal)> ExecuteFn;
+		struct DamageData
+		{
+			physx::PxVec3 origin;
+			physx::PxVec3 hitPosition;
+			physx::PxVec3 hitNormal;
+			physx::PxVec3 weaponDir;
+			physx::PxVec3 previousWeaponDir;
+		};
+
+		typedef std::function<void(const Damager* damager, Nv::Blast::ExtPxActor* actor, BlastFamily& family, const DamageData& damageData)> ExecuteFn;
 
 		const char*				uiName;
 		NvBlastDamageProgram	program;
@@ -143,6 +153,8 @@ private:
 	physx::PxVec2            m_lastMousePos;
 	bool                     m_isMousePressed;
 	uint32_t                 m_damageCountWhilePressed;
+	physx::PxVec3			 m_previousPickDir;
+	bool					 m_prevWasHit;
 };
 
 #endif
\ No newline at end of file
-- 
cgit v1.2.3