diff options
| author | Bryan Galdrikian <[email protected]> | 2017-10-24 15:25:02 -0700 |
|---|---|---|
| committer | Bryan Galdrikian <[email protected]> | 2017-10-24 15:25:02 -0700 |
| commit | b0c11962f6012430da3bcaa2727288046b33d648 (patch) | |
| tree | cf13338fa4fd7072badf64f751f94abeeb437003 /samples/SampleBase/ui/DamageToolController.h | |
| parent | linux build fix - all configs (diff) | |
| download | blast-b0c11962f6012430da3bcaa2727288046b33d648.tar.xz blast-b0c11962f6012430da3bcaa2727288046b33d648.zip | |
Changes for 1.1.1
See README.md
Diffstat (limited to 'samples/SampleBase/ui/DamageToolController.h')
| -rw-r--r-- | samples/SampleBase/ui/DamageToolController.h | 14 |
1 files changed, 13 insertions, 1 deletions
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 |