xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity

Added Collision Tags #233

Merged
direnbharwani merged 10 commits from SP3-2-Physics into main 2022-11-20 22:40:53 +08:00
Conversation 0 Commits 10 Files Changed 11 +333
6 changed files with 333 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 62433d1a53 - Show all commits

176
SHADE_Engine/src/Physics/Collision/SHCollisionTags.cpp Normal file
View File

@ -0,0 +1,176 @@
/****************************************************************************************
* \file SHCollisionTags.cpp
* \author Diren D Bharwani, diren.dbharwani, 390002520
* \brief Implementation for Collision Tags for filtering collisions.
*
* \copyright Copyright (C) 2022 DigiPen Institute of Technology. Reproduction or
* disclosure of this file or its contents without the prior written consent
* of DigiPen Institute of Technology is prohibited.
****************************************************************************************/
#include <SHpch.h>
// Primary Header
#include "SHCollisionTags.h"
// Project Headers
#include "SHCollisionTags.h"
#include "Tools/Utilities/SHUtilities.h"
namespace SHADE
{
/*-----------------------------------------------------------------------------------*/
/* Static Data Member Definitions */
/*-----------------------------------------------------------------------------------*/
std::string SHCollisionTag::tagNames[NUM_TAGS];
/*-----------------------------------------------------------------------------------*/
/* Constructors & Destructor Definitions */
/*-----------------------------------------------------------------------------------*/
SHCollisionTag::SHCollisionTag() noexcept
: mask { SHUtilities::ConvertEnum(eTag::ALL_TAGS) }
{}
SHCollisionTag::SHCollisionTag(uint16_t tagValue) noexcept
: mask { tagValue }
{}
SHCollisionTag::SHCollisionTag(eTag tagValue) noexcept
: mask { SHUtilities::ConvertEnum(tagValue) }
{}
/*-----------------------------------------------------------------------------------*/
/* Operator Overload Definitions */
/*-----------------------------------------------------------------------------------*/
bool SHCollisionTag::operator==(const SHCollisionTag& rhs) const noexcept
{
return mask == rhs.mask;
}
bool SHCollisionTag::operator!=(const SHCollisionTag& rhs) const noexcept
{
return mask != rhs.mask;
}
SHCollisionTag::operator uint16_t() const noexcept
{
return mask;
}
/*-----------------------------------------------------------------------------------*/
/* Getter Function Definitions */
/*-----------------------------------------------------------------------------------*/
uint16_t SHCollisionTag::GetTagValue() const noexcept
{
return mask;
}
bool SHCollisionTag::GetTagState(eTag tag) const noexcept
{
return (mask & SHUtilities::ConvertEnum(tag)) > 0;
}
bool SHCollisionTag::GetTagState(int tagIndex) const
{
if (tagIndex < 0 || tagIndex > NUM_TAGS)
throw std::invalid_argument("Index out of range!");
return (mask & (1U << tagIndex)) > 0;
}
/*-----------------------------------------------------------------------------------*/
/* Setter Function Definitions */
/*-----------------------------------------------------------------------------------*/
void SHCollisionTag::SetValue(uint16_t tagValue) noexcept
{
mask = tagValue;
}
void SHCollisionTag::SetTagState(eTag tag, bool tagState) noexcept
{
const auto VALUE = SHUtilities::ConvertEnum(tag);
tagState ? mask |= VALUE : mask &= ~(VALUE);
}
void SHCollisionTag::SetTagState(const std::string& tagName, bool tagState) noexcept
{
// This find is expensive.
int tagIndex = -1;
for (int i = 0; i < NUM_TAGS; ++i)
{
if (tagNames[i] != tagName)
continue;
tagIndex = i;
break;
}
if (tagIndex < 0)
{
SHLOGV_WARNING("Parameter tagName {} not found in list of tag names. Tag unmodified.", tagName)
return;
}
const auto VALUE = 1U << tagIndex;
tagState ? mask |= (VALUE) : mask &= ~(VALUE);
}
void SHCollisionTag::SetTagState(int tagIndex, bool tagState)
{
if (tagIndex < 0 || tagIndex > NUM_TAGS)
throw std::invalid_argument("Index out of range!");
const auto VALUE = 1U << tagIndex;
tagState ? mask |= (VALUE) : mask &= ~(VALUE);
}
/*-----------------------------------------------------------------------------------*/
/* Public Function Member Definitions */
/*-----------------------------------------------------------------------------------*/
void SHCollisionTag::Init(const std::filesystem::path& tagNameFilePath) noexcept
{
// Read tag names from given file.
}
void SHCollisionTag::Exit(const std::filesystem::path& tagNameFilePath) noexcept
{
// Write current set of names to file.
// This ensures any names changed is reflected on the file for the next run of the application.
}
void SHCollisionTag::RemoveTagName(int tagIndex)
{
if (tagIndex < 0 || tagIndex > NUM_TAGS)
throw std::invalid_argument("Index out of range!");
tagNames[tagIndex].clear();
}
void SHCollisionTag::SetTagName(const std::string& newTagName, int tagIndex)
{
if (tagIndex < 0 || tagIndex > NUM_TAGS)
throw std::invalid_argument("Index out of range!");
tagNames[tagIndex] = newTagName;
}
const std::string& SHCollisionTag::GetTagName(int tagIndex)
{
if (tagIndex < 0 || tagIndex > NUM_TAGS)
throw std::invalid_argument("Index out of range!");
return tagNames[tagIndex];
}
} // namespace SHADE
SHADE::SHCollisionTag::eTag operator|(SHADE::SHCollisionTag::eTag lhs, SHADE::SHCollisionTag::eTag rhs) noexcept
{
return static_cast<SHADE::SHCollisionTag::eTag>(SHADE::SHUtilities::ConvertEnum(lhs) | SHADE::SHUtilities::ConvertEnum(rhs));
}

125
SHADE_Engine/src/Physics/Collision/SHCollisionTags.h Normal file
View File

@ -0,0 +1,125 @@
/****************************************************************************************
* \file SHCollisionTags.h
* \author Diren D Bharwani, diren.dbharwani, 390002520
* \brief Interface for Collision Tags for filtering collisions.
*
* \copyright Copyright (C) 2022 DigiPen Institute of Technology. Reproduction or
* disclosure of this file or its contents without the prior written consent
* of DigiPen Institute of Technology is prohibited.
****************************************************************************************/
#pragma once
#include <filesystem>
// Project Headers
#include "SH_API.h"
namespace SHADE
{
/*-----------------------------------------------------------------------------------*/
/* Type Definitions */
/*-----------------------------------------------------------------------------------*/
class SH_API SHCollisionTag
{
public:
/*---------------------------------------------------------------------------------*/
/* Type Definitions */
/*---------------------------------------------------------------------------------*/
enum class eTag : uint16_t
{
TAG_1 = 0x0001
, TAG_2 = 0x0002
, TAG_3 = 0x0004
, TAG_4 = 0x0008
, TAG_5 = 0x0010
, TAG_6 = 0x0020
, TAG_7 = 0x0040
, TAG_8 = 0x0080
, TAG_9 = 0x0100
, TAG_10 = 0x0200
, TAG_11 = 0x0400
, TAG_12 = 0x0800
, TAG_13 = 0x1000
, TAG_14 = 0x2000
, TAG_15 = 0x4000
, TAG_16 = 0x8000
, ALL_TAGS = 0xFFFF
};
/*---------------------------------------------------------------------------------*/
/* Constructors & Destructor */
/*---------------------------------------------------------------------------------*/
SHCollisionTag () noexcept;
SHCollisionTag (uint16_t tagValue) noexcept;
SHCollisionTag (eTag tagValue) noexcept;
SHCollisionTag (const SHCollisionTag&) noexcept = default;
SHCollisionTag (SHCollisionTag&&) noexcept = default;
~SHCollisionTag () = default;
/*---------------------------------------------------------------------------------*/
/* Operator Overloads */
/*---------------------------------------------------------------------------------*/
SHCollisionTag& operator=(const SHCollisionTag&) noexcept = default;
SHCollisionTag& operator=(SHCollisionTag&&) noexcept = default;
[[nodiscard]] bool operator==(const SHCollisionTag& rhs) const noexcept;
[[nodiscard]] bool operator!=(const SHCollisionTag& rhs) const noexcept;
operator uint16_t() const noexcept;
/*---------------------------------------------------------------------------------*/
/* Getter Functions */
/*---------------------------------------------------------------------------------*/
[[nodiscard]] uint16_t GetTagValue () const noexcept;
[[nodiscard]] bool GetTagState (eTag tag) const noexcept;
[[nodiscard]] bool GetTagState (int tagIndex) const;
/*---------------------------------------------------------------------------------*/
/* Setter Functions */
/*---------------------------------------------------------------------------------*/
void SetValue (uint16_t tagValue) noexcept;
void SetTagState (eTag tag, bool tagState) noexcept;
void SetTagState (const std::string& tagName, bool tagState) noexcept;
void SetTagState (int tagIndex, bool tagState);
/*---------------------------------------------------------------------------------*/
/* Function Members */
/*---------------------------------------------------------------------------------*/
static void Init (const std::filesystem::path& tagNameFilePath) noexcept;
static void Exit (const std::filesystem::path& tagNameFilePath) noexcept;
static void SetTagName (const std::string& newTagName, int tagIndex);
static void RemoveTagName (int tagIndex);
[[nodiscard]] static const std::string& GetTagName (int tagIndex);
private:
/*---------------------------------------------------------------------------------*/
/* Static Data Members */
/*---------------------------------------------------------------------------------*/
static constexpr int NUM_TAGS = 16;
static std::string tagNames[NUM_TAGS];
/*---------------------------------------------------------------------------------*/
/* Data Members */
/*---------------------------------------------------------------------------------*/
uint16_t mask;
};
} // namespace SHADE
SHADE::SHCollisionTag::eTag SH_API operator|(SHADE::SHCollisionTag::eTag lhs, SHADE::SHCollisionTag::eTag rhs) noexcept;

17
SHADE_Engine/src/Physics/Interface/SHCollisionShape.cpp
View File

@ -134,6 +134,11 @@ namespace SHADE
return type; return type;
} }
const SHCollisionTag& SHCollisionShape::GetCollisionTags() const noexcept
{
return collisionTags;
}
float SHCollisionShape::GetFriction() const noexcept float SHCollisionShape::GetFriction() const noexcept
{ {
return material.GetFriction(); return material.GetFriction();
@ -240,6 +245,18 @@ namespace SHADE
isTrigger = trigger; isTrigger = trigger;
} }
void SHCollisionShape::SetCollisionTags(const SHCollisionTag& newCollisionTag) noexcept
{
dirty = true;
collisionTags = newCollisionTag;
}
void SHCollisionShape::SetCollisionTags(SHCollisionTag::eTag newCollisionTag) noexcept
{
dirty = true;
collisionTags = SHCollisionTag{ newCollisionTag };
}
void SHCollisionShape::SetFriction(float friction) noexcept void SHCollisionShape::SetFriction(float friction) noexcept
{ {
dirty = true; dirty = true;

6
SHADE_Engine/src/Physics/Interface/SHCollisionShape.h
View File

@ -17,6 +17,7 @@
#include "Math/Geometry/SHShape.h" #include "Math/Geometry/SHShape.h"
#include "Math/SHQuaternion.h" #include "Math/SHQuaternion.h"
#include "SHPhysicsMaterial.h" #include "SHPhysicsMaterial.h"
#include "Physics/Collision/SHCollisionTags.h"
namespace SHADE namespace SHADE
{ {
@ -74,6 +75,8 @@ namespace SHADE
[[nodiscard]] Type GetType () const noexcept; [[nodiscard]] Type GetType () const noexcept;
[[nodiscard]] const SHCollisionTag& GetCollisionTags () const noexcept;
[[nodiscard]] float GetFriction () const noexcept; [[nodiscard]] float GetFriction () const noexcept;
[[nodiscard]] float GetBounciness () const noexcept; [[nodiscard]] float GetBounciness () const noexcept;
[[nodiscard]] float GetDensity () const noexcept; [[nodiscard]] float GetDensity () const noexcept;
@ -92,6 +95,8 @@ namespace SHADE
void SetBoundingSphere (float radius); void SetBoundingSphere (float radius);
void SetIsTrigger (bool isTrigger) noexcept; void SetIsTrigger (bool isTrigger) noexcept;
void SetCollisionTags (const SHCollisionTag& newCollisionTag) noexcept;
void SetCollisionTags (SHCollisionTag::eTag newCollisionTag) noexcept;
void SetFriction (float friction) noexcept; void SetFriction (float friction) noexcept;
void SetBounciness (float bounciness) noexcept; void SetBounciness (float bounciness) noexcept;
void SetDensity (float density) noexcept; void SetDensity (float density) noexcept;
@ -109,6 +114,7 @@ namespace SHADE
EntityID entityID; // The entity this collider belongs to EntityID entityID; // The entity this collider belongs to
bool isTrigger; bool isTrigger;
bool dirty; bool dirty;
SHCollisionTag collisionTags;
SHShape* shape; SHShape* shape;
SHPhysicsMaterial material; SHPhysicsMaterial material;
SHVec3 positionOffset; SHVec3 positionOffset;

8
SHADE_Engine/src/Physics/PhysicsObject/SHPhysicsObject.cpp
View File

@ -311,6 +311,9 @@ namespace SHADE
syncMaterial(i, collisionShape); syncMaterial(i, collisionShape);
// Sync tags
collisionShape.dirty = false; collisionShape.dirty = false;
} }
} }
@ -327,6 +330,11 @@ namespace SHADE
rp3dMaterial.setMassDensity(collisionShape.GetDensity()); rp3dMaterial.setMassDensity(collisionShape.GetDensity());
} }
void SHPhysicsObject::syncTags(int colliderIndex, SHCollisionShape& collisionShape) const noexcept
{
}
void SHPhysicsObject::addBoxShape(SHCollisionShape& boxShape) const noexcept void SHPhysicsObject::addBoxShape(SHCollisionShape& boxShape) const noexcept
{ {
const rp3d::Transform OFFSETS const rp3d::Transform OFFSETS

1
SHADE_Engine/src/Physics/PhysicsObject/SHPhysicsObject.h
View File

@ -97,6 +97,7 @@ namespace SHADE
/*---------------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------------*/
void syncMaterial (int colliderIndex, SHCollisionShape& collisionShape) const noexcept; void syncMaterial (int colliderIndex, SHCollisionShape& collisionShape) const noexcept;
void syncTags (int colliderIndex, SHCollisionShape& collisionShape) const noexcept;
// Box Shapes // Box Shapes