diff --git a/Source/Engine/Physics/Physics.cpp b/Source/Engine/Physics/Physics.cpp index 6b3889e99..9c6879c79 100644 --- a/Source/Engine/Physics/Physics.cpp +++ b/Source/Engine/Physics/Physics.cpp @@ -228,6 +228,11 @@ bool Physics::LineCast(const Vector3& start, const Vector3& end, API_PARAM(Out)R return DefaultScene->LineCast(start, end, hitInfo, layerMask, hitTriggers); } +bool Physics::LineCastAll(const Vector3& start, const Vector3& end, API_PARAM(Out)Array& results, uint32 layerMask, bool hitTriggers) +{ + return DefaultScene->LineCastAll(start, end, results, layerMask, hitTriggers); +} + bool Physics::RayCast(const Vector3& origin, const Vector3& direction, const float maxDistance, uint32 layerMask, bool hitTriggers) { return DefaultScene->RayCast(origin, direction, maxDistance, layerMask, hitTriggers); @@ -474,6 +479,13 @@ bool PhysicsScene::LineCast(const Vector3& start, const Vector3& end, API_PARAM( return PhysicsBackend::RayCast(_scene, start, directionToEnd, hitInfo, distanceToEnd, layerMask, hitTriggers); } +bool PhysicsScene::LineCastAll(const Vector3& start, const Vector3& end, API_PARAM(Out)Array& results, uint32 layerMask, bool hitTriggers) +{ + float distanceToEnd = Vector3::Distance(start, end); + Vector3 directionToEnd = (end - start).GetNormalized(); + return PhysicsBackend::RayCastAll(_scene, start, directionToEnd, results, distanceToEnd, layerMask, hitTriggers); +} + bool PhysicsScene::RayCast(const Vector3& origin, const Vector3& direction, const float maxDistance, uint32 layerMask, bool hitTriggers) { return PhysicsBackend::RayCast(_scene, origin, direction, maxDistance, layerMask, hitTriggers); diff --git a/Source/Engine/Physics/Physics.h b/Source/Engine/Physics/Physics.h index 9fede6222..3e7bff8d9 100644 --- a/Source/Engine/Physics/Physics.h +++ b/Source/Engine/Physics/Physics.h @@ -116,6 +116,17 @@ public: /// True if ray hits an matching object, otherwise false. API_FUNCTION() static bool LineCast(const Vector3& start, const Vector3& end, API_PARAM(Out) RayCastHit& hitInfo, uint32 layerMask = MAX_uint32, bool hitTriggers = true); + // + /// Performs a line between two points in the scene, returns all hitpoints infos. + /// + /// The origin of the ray. + /// The normalized direction of the ray. + /// The result hits. Valid only when method returns true. + /// The layer mask used to filter the results. + /// If set to true triggers will be hit, otherwise will skip them. + /// True if ray hits an matching object, otherwise false. + API_FUNCTION() static bool LineCastAll(const Vector3& start, const Vector3& end, API_PARAM(Out) Array& results, uint32 layerMask = MAX_uint32, bool hitTriggers = true); + /// /// Performs a raycast against objects in the scene. /// diff --git a/Source/Engine/Physics/PhysicsScene.h b/Source/Engine/Physics/PhysicsScene.h index 3bd98e9c0..683261eb8 100644 --- a/Source/Engine/Physics/PhysicsScene.h +++ b/Source/Engine/Physics/PhysicsScene.h @@ -148,6 +148,17 @@ public: /// True if ray hits an matching object, otherwise false. API_FUNCTION() bool LineCast(const Vector3& start, const Vector3& end, API_PARAM(Out) RayCastHit& hitInfo, uint32 layerMask = MAX_uint32, bool hitOnTriggers = true); + // + /// Performs a line between two points in the scene, returns all hitpoints infos. + /// + /// The origin of the ray. + /// The normalized direction of the ray. + /// The result hits. Valid only when method returns true. + /// The layer mask used to filter the results. + /// If set to true triggers will be hit, otherwise will skip them. + /// True if ray hits an matching object, otherwise false. + API_FUNCTION() bool LineCastAll(const Vector3& start, const Vector3& end, API_PARAM(Out) Array& results, uint32 layerMask = MAX_uint32, bool hitTriggers = true); + /// /// Performs a raycast against objects in the scene. ///