Merge remote-tracking branch 'origin/master' into 1.9
This commit is contained in:
@@ -27,6 +27,8 @@
|
||||
#include "Engine/Render2D/FontAsset.h"
|
||||
#if USE_EDITOR
|
||||
#include "Editor/Editor.h"
|
||||
#include "Engine/Level/Actors/Light.h"
|
||||
#include "Engine/Physics/Colliders/Collider.h"
|
||||
#endif
|
||||
|
||||
// Debug draw service configuration
|
||||
@@ -950,9 +952,26 @@ void DebugDraw::DrawActorsTree(Actor* actor)
|
||||
actor->TreeExecute(function);
|
||||
}
|
||||
|
||||
#if USE_EDITOR
|
||||
void DebugDraw::DrawColliderDebugPhysics(Collider* collider, RenderView& view)
|
||||
{
|
||||
if (!collider)
|
||||
return;
|
||||
|
||||
collider->DrawPhysicsDebug(view);
|
||||
}
|
||||
|
||||
void DebugDraw::DrawLightDebug(Light* light, RenderView& view)
|
||||
{
|
||||
if (!light)
|
||||
return;
|
||||
|
||||
light->DrawLightsDebug(view);
|
||||
}
|
||||
#endif
|
||||
void DebugDraw::DrawAxisFromDirection(const Vector3& origin, const Vector3& direction, float size, float duration, bool depthTest)
|
||||
{
|
||||
ASSERT(direction.IsNormalized());
|
||||
CHECK_DEBUG(direction.IsNormalized());
|
||||
const auto rot = Quaternion::FromDirection(direction);
|
||||
const Vector3 up = (rot * Vector3::Up);
|
||||
const Vector3 forward = (rot * Vector3::Forward);
|
||||
@@ -978,7 +997,7 @@ void DebugDraw::DrawRay(const Vector3& origin, const Vector3& direction, const C
|
||||
|
||||
void DebugDraw::DrawRay(const Vector3& origin, const Vector3& direction, const Color& color, float length, float duration, bool depthTest)
|
||||
{
|
||||
ASSERT(direction.IsNormalized());
|
||||
CHECK_DEBUG(direction.IsNormalized());
|
||||
if (isnan(length) || isinf(length))
|
||||
return;
|
||||
DrawLine(origin, origin + (direction * length), color, duration, depthTest);
|
||||
|
||||
Reference in New Issue
Block a user