Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/gui/debugRenderer.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#ifndef DEBUG_RENDERER_H
#define DEBUG_RENDERER_H
#pragma once

#include "Renderable.h"
#include "timer.h"
Expand All @@ -23,5 +22,3 @@ class DebugRenderer : public Renderable

virtual void render(sp::RenderTarget& target) override;
};

#endif//DEBUG_RENDERER_H
3 changes: 3 additions & 0 deletions src/gui/hotkeyConfig.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,9 @@ Keys::Keys() :

spectator_show_callsigns("SPECTATOR_SHOW_CALLSIGNS", "C"),

#ifdef DEBUG
debug_show_colliders("DEBUG_SHOW_COLLIDERS", "F12"),
#endif
debug_show_fps("DEBUG_SHOW_FPS", "F10"),
debug_show_timing("DEBUG_SHOW_TIMING", "F11")
{
Expand Down
8 changes: 4 additions & 4 deletions src/gui/hotkeyConfig.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#ifndef HOTKEY_CONFIG_H
#define HOTKEY_CONFIG_H
#pragma once

#include <tuple>
#include <array>
Expand Down Expand Up @@ -200,7 +199,8 @@ class Keys
//Debug
sp::io::Keybinding debug_show_fps;
sp::io::Keybinding debug_show_timing;
#ifdef DEBUG
sp::io::Keybinding debug_show_colliders;
#endif
};
extern Keys keys;

#endif//HOTKEY_CONFIG_H
16 changes: 16 additions & 0 deletions src/systems/debugrender.cpp
Original file line number Diff line number Diff line change
@@ -1,14 +1,27 @@
#include "debugrender.h"
#include "gui/hotkeyConfig.h"
#include <graphics/opengl.h>
#include <glm/gtc/type_ptr.hpp>


DebugRenderSystem::DebugRenderSystem()
{
#ifdef DEBUG
show_colliders = true;
#endif
}

void DebugRenderSystem::update(float delta)
{
#ifdef DEBUG
if (keys.debug_show_colliders.getDown()) show_colliders = !show_colliders;
#endif
}

void DebugRenderSystem::render3D(sp::ecs::Entity e, sp::Transform& transform, sp::Physics& physics)
{
if (!show_colliders) return;

ShaderRegistry::ScopedShader color_shader(ShaderRegistry::Shaders::BasicColor);

glDisable(GL_DEPTH_TEST);
Expand Down Expand Up @@ -53,7 +66,10 @@ void DebugRenderSystem::render3D(sp::ecs::Entity e, sp::Transform& transform, sp

void DebugRenderSystem::renderOnRadar(sp::RenderTarget& renderer, sp::ecs::Entity e, glm::vec2 screen_position, float scale, float rotation, sp::Physics& physics)
{
if (!show_colliders) return;

glm::u8vec4 color{255, 255, 255, 128};

switch(physics.getType())
{
case sp::Physics::Type::Sensor: color = {255,128,128,128}; break;
Expand Down
4 changes: 4 additions & 0 deletions src/systems/debugrender.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,12 @@
class DebugRenderSystem : public sp::ecs::System, public RenderRadarInterface<sp::Physics, 100, RadarRenderSystem::FlagShortRange>, public Render3DInterface<sp::Physics, true>
{
public:
DebugRenderSystem();

void update(float delta) override;
void render3D(sp::ecs::Entity e, sp::Transform& transform, sp::Physics& shields) override;

void renderOnRadar(sp::RenderTarget& renderer, sp::ecs::Entity e, glm::vec2 screen_position, float scale, float rotation, sp::Physics& component) override;
private:
bool show_colliders = false;
};
Loading