GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix gizmos debug draw shapes

Browse Source
This commit is contained in:
Wojtek Figat
2021-06-01 14:38:24 +02:00
parent accbef6841
commit c30e338f0a
4 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Editor/Viewport/MainEditorGizmoViewport.cs
View File

@@ -450,6 +450,12 @@ namespace FlaxEditor.Viewport
/// <inheritdoc />
public void DrawEditorPrimitives(GPUContext context, ref RenderContext renderContext, GPUTexture target, GPUTexture targetDepth)
{
// Draw gizmos
for (int i = 0; i < Gizmos.Count; i++)
{
Gizmos[i].Draw(ref renderContext);
}
// Draw selected objects debug shapes and visuals
if (DrawDebugDraw && (renderContext.View.Flags & ViewFlags.DebugDraw) == ViewFlags.DebugDraw)
{
@@ -463,12 +469,6 @@ namespace FlaxEditor.Viewport
DebugDraw.Draw(ref renderContext, target.View(), targetDepth.View(), true);
}
// Draw gizmos
for (int i = 0; i < Gizmos.Count; i++)
{
Gizmos[i].Draw(ref renderContext);
}
}
private void OnPostRender(GPUContext context, RenderContext renderContext)

4
Source/Editor/Viewport/PrefabWindowViewport.cs
View File

@@ -865,13 +865,13 @@ namespace FlaxEditor.Viewport
/// <inheritdoc />
public override void DrawEditorPrimitives(GPUContext context, ref RenderContext renderContext, GPUTexture target, GPUTexture targetDepth)
{
base.DrawEditorPrimitives(context, ref renderContext, target, targetDepth);
// Draw gizmos
for (int i = 0; i < Gizmos.Count; i++)
{
Gizmos[i].Draw(ref renderContext);
}
base.DrawEditorPrimitives(context, ref renderContext, target, targetDepth);
}
/// <inheritdoc />

7
Source/Engine/Level/Actors/PointLight.cpp
View File

@@ -136,8 +136,11 @@ void PointLight::Draw(RenderContext& renderContext)
void PointLight::OnDebugDraw()
{
// Draw source tube
DEBUG_DRAW_WIRE_TUBE(GetPosition(), GetOrientation(), SourceRadius, SourceLength, Color::Orange, 0, true);
if (SourceRadius > ZeroTolerance || SourceLength > ZeroTolerance)
{
// Draw source tube
DEBUG_DRAW_WIRE_TUBE(GetPosition(), GetOrientation(), SourceRadius, SourceLength, Color::Orange, 0, true);
}
// Base
LightWithShadow::OnDebugDraw();

7
Source/Engine/Level/Actors/SpotLight.cpp
View File

@@ -184,8 +184,11 @@ void SpotLight::Draw(RenderContext& renderContext)
void SpotLight::OnDebugDraw()
{
// Draw source tube
DEBUG_DRAW_WIRE_SPHERE(BoundingSphere(GetPosition(), SourceRadius), Color::Orange, 0, true);
if (SourceRadius > ZeroTolerance)
{
// Draw source tube
DEBUG_DRAW_WIRE_SPHERE(BoundingSphere(GetPosition(), SourceRadius), Color::Orange, 0, true);
}
// Base
LightWithShadow::OnDebugDraw();