Skip to content

Commit 411d76d

Browse files
committed
Added missing UBO and SSBO sets for debug rendering.
1 parent da77ac7 commit 411d76d

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

source/OpenGL/DebugRenderer.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ namespace OpenGL
6161
m_line_mb.clear();
6262
m_tri_mb.clear();
6363
}
64-
void DebugRenderer::render(System::SceneSystem& p_scene, const Buffer& p_view_properties, const FBO& p_target_FBO)
64+
void DebugRenderer::render(System::SceneSystem& p_scene, const Buffer& p_view_properties, const Buffer& p_point_lights_buffer, const FBO& p_target_FBO)
6565
{
6666
if (!m_line_mb.empty())
6767
{
@@ -99,17 +99,20 @@ namespace OpenGL
9999
dc.m_polygon_offset_units = opt.m_position_offset_units;
100100
dc.set_uniform("model", model);
101101
dc.set_uniform("colour", p_collider.m_collided ? glm::vec4(opt.m_bounding_box_collided_colour, 1.f) : glm::vec4(opt.m_bounding_box_colour, 1.f));
102+
dc.set_UBO("ViewProperties", p_view_properties);
102103
dc.submit(*m_bound_shader, m_AABB_outline_mesh->get_VAO(), p_target_FBO);
103104
}
104105
if (opt.m_fill_bounding_box)
105106
{
106107
DrawCall dc;
108+
dc.m_blending_enabled = true;
107109
dc.m_cull_face_enabled = false;
108110
dc.m_polygon_offset_enabled = true;
109111
dc.m_polygon_offset_factor = opt.m_position_offset_factor;
110112
dc.m_polygon_offset_units = opt.m_position_offset_units;
111113
dc.set_uniform("model", model);
112114
dc.set_uniform("colour", p_collider.m_collided ? glm::vec4(opt.m_bounding_box_collided_colour, 0.2f) : glm::vec4(opt.m_bounding_box_colour, 0.2f));
115+
dc.set_UBO("ViewProperties", p_view_properties);
113116
dc.submit(*m_bound_shader, m_AABB_filled_mesh->get_VAO(), p_target_FBO);
114117
}
115118
});
@@ -122,6 +125,8 @@ namespace OpenGL
122125
{
123126
DrawCall dc;
124127
dc.set_uniform("scale", opt.m_light_position_scale);
128+
dc.set_UBO("ViewProperties", p_view_properties);
129+
dc.set_SSBO("PointLightsBuffer", p_point_lights_buffer);
125130
dc.submit_instanced(*m_light_position_shader, m_point_light_mesh->get_VAO(), p_target_FBO, point_light_count);
126131
}
127132
}

source/OpenGL/DebugRenderer.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ namespace OpenGL
7575
static void init();
7676
static void deinit();
7777
static void clear();
78-
static void render(System::SceneSystem& p_scene, const Buffer& p_view_properties, const FBO& p_target_FBO);
78+
static void render(System::SceneSystem& p_scene, const Buffer& p_view_properties, const Buffer& p_point_lights_buffer, const FBO& p_target_FBO);
7979

8080
static void add(const Geometry::Cone& p_cone, const glm::vec4& p_colour = glm::vec4(1.f), size_t segments = m_debug_options.m_segments);
8181
static void add(const Geometry::Cylinder& p_cylinder, const glm::vec4& p_colour = glm::vec4(1.f), size_t segments = m_debug_options.m_segments);

source/OpenGL/OpenGLRenderer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ namespace OpenGL
251251

252252
void OpenGLRenderer::end_frame()
253253
{
254-
OpenGL::DebugRenderer::render(m_scene_system, m_view_properties_buffer, m_screen_framebuffer);
254+
OpenGL::DebugRenderer::render(m_scene_system, m_view_properties_buffer, m_phong_renderer.get_point_lights_buffer(), m_screen_framebuffer);
255255

256256
// Draw the colour output from m_screen_framebuffer colour texture to the default FBO as a fullscreen quad.
257257

0 commit comments

Comments
 (0)