Merge branch 'main' into PlayerController

SHADE_Engine/src/Math/Geometry/SHBox.cpp

@@ -178,14 +178,23 @@ namespace SHADE
   /* Public Function Member Definitions                                                */
   /*-----------------------------------------------------------------------------------*/
 
-  bool SHBox::TestPoint(const SHVec3& point) noexcept
+  bool SHBox::TestPoint(const SHVec3& point) const noexcept
   {
     return BoundingBox::Contains(point);
   }
 
-  bool SHBox::Raycast(const SHRay& ray, float& distance) noexcept
+  SHRaycastResult SHBox::Raycast(const SHRay& ray) const noexcept
   {
-    return BoundingBox::Intersects(ray.position, ray.direction, distance);
+    SHRaycastResult result;
+
+    result.hit = Intersects(ray.position, ray.direction, result.distance);
+    if (result.hit)
+    {
+      result.position = ray.position + ray.direction * result.distance;
+      result.angle    = SHVec3::Angle(ray.position, result.position);
+    }
+
+    return result;
   }
 
   bool SHBox::Contains(const SHBox& rhs) const noexcept

SHADE_Engine/src/Math/Geometry/SHBox.h

@@ -76,8 +76,8 @@ namespace SHADE
     /* Function Members                                                                */
     /*---------------------------------------------------------------------------------*/
 
-    [[nodiscard]] bool    TestPoint   (const SHVec3& point)               noexcept override;
+    [[nodiscard]] bool            TestPoint   (const SHVec3& point) const noexcept override;
-    [[nodiscard]] bool    Raycast     (const SHRay& ray, float& distance) noexcept override;
+    [[nodiscard]] SHRaycastResult Raycast(const SHRay& ray) const noexcept override;
 
     [[nodiscard]] bool    Contains    (const SHBox& rhs)  const noexcept;
     [[nodiscard]] float   Volume      ()  const noexcept;

SHADE_Engine/src/Math/Geometry/SHShape.h

@@ -69,8 +69,8 @@ namespace SHADE
     /* Function Members                                                                */
     /*---------------------------------------------------------------------------------*/
 
-    [[nodiscard]] virtual bool  TestPoint (const SHVec3& point) noexcept = 0;
+    [[nodiscard]] virtual bool            TestPoint (const SHVec3& point) const noexcept = 0;
-    [[nodiscard]] virtual bool  Raycast   (const SHRay& ray, float& distance)  noexcept = 0;
+    [[nodiscard]] virtual SHRaycastResult Raycast   (const SHRay& ray)    const noexcept = 0;
 
   protected:
     /*---------------------------------------------------------------------------------*/

SHADE_Engine/src/Math/Geometry/SHSphere.cpp

@@ -138,14 +138,23 @@ namespace SHADE
   /* Public Function Member Definitions                                                */
   /*-----------------------------------------------------------------------------------*/
 
-  bool SHSphere::TestPoint(const SHVec3& point) noexcept
+  bool SHSphere::TestPoint(const SHVec3& point) const noexcept
   {
     return BoundingSphere::Contains(point);
   }
 
-  bool SHSphere::Raycast(const SHRay& ray, float& distance) noexcept
+  SHRaycastResult SHSphere::Raycast(const SHRay& ray) const noexcept
   {
-    return Intersects(ray.position, ray.direction, distance);
+    SHRaycastResult result;
+
+    result.hit = Intersects(ray.position, ray.direction, result.distance);
+    if (result.hit)
+    {
+      result.position = ray.position + ray.direction * result.distance;
+      result.angle    = SHVec3::Angle(ray.position, result.position);
+    }
+
+    return result;
   }
 
   bool SHSphere::Contains(const SHSphere& rhs) const noexcept

SHADE_Engine/src/Math/Geometry/SHSphere.h

@@ -64,8 +64,8 @@ namespace SHADE
     /* Function Members                                                                */
     /*---------------------------------------------------------------------------------*/
 
-    [[nodiscard]] bool    TestPoint   (const SHVec3& point)               noexcept override;
+    [[nodiscard]] bool            TestPoint   (const SHVec3& point) const noexcept override;
-    [[nodiscard]] bool    Raycast     (const SHRay& ray, float& distance) noexcept override;
+    [[nodiscard]] SHRaycastResult Raycast(const SHRay& ray) const noexcept override;
 
     [[nodiscard]] bool    Contains    (const SHSphere& rhs) const noexcept;
     [[nodiscard]] float   Volume      () const noexcept;

SHADE_Engine/src/Physics/PhysicsObject/SHPhysicsObjectManager.cpp

@@ -265,11 +265,11 @@ namespace SHADE
       return;
     }
 
-    const int NUM_SHAPES = static_cast<int>(componentGroup.colliderComponent->GetCollisionShapes().size());
+    //const int NUM_SHAPES = static_cast<int>(componentGroup.colliderComponent->GetCollisionShapes().size());
-    for (int i = 0; i < NUM_SHAPES; ++i)
+    //for (int i = 0; i < NUM_SHAPES; ++i)
-      physicsObject->AddCollisionShape(i);
+    //  physicsObject->AddCollisionShape(i);
 
-    physicsObject->SyncColliders(*componentGroup.colliderComponent);
+    //physicsObject->SyncColliders(*componentGroup.colliderComponent);
   }
 
   void SHPhysicsObjectManager::removeRigidBody(const QueueCommand&, SHPhysicsObject* physicsObject, const PhysicsComponentGroup& componentGroup)

SHADE_Managed/src/Components/Collider.cxx

@@ -168,7 +168,7 @@ namespace SHADE
     }
     bool BoxCollider::Raycast(Ray ray, float maxDistance)
     {
-        return getNativeCollisionShape<SHBox>().Raycast(Convert::ToNative(ray), maxDistance);
+        return getNativeCollisionShape<SHBox>().Raycast(Convert::ToNative(ray));
     }
 
     /*---------------------------------------------------------------------------------*/
@@ -200,7 +200,7 @@ namespace SHADE
     }
     bool SphereCollider::Raycast(Ray ray, float maxDistance)
     {
-        return getNativeCollisionShape<SHBox>().Raycast(Convert::ToNative(ray), maxDistance);
+        return getNativeCollisionShape<SHBox>().Raycast(Convert::ToNative(ray));
     }
 
     /*---------------------------------------------------------------------------------*/