eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 15:09:19 +02:00
Code Issues 123 Wiki Activity

debug configurable headlight

Browse Source
This commit is contained in:
milek7
2018-12-09 19:55:53 +01:00
parent 3c33bf8133
commit bd8c5ed59a
5 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gl/glsl_common.cpp
View File

@@ -31,6 +31,7 @@ void gl::glsl_common_setup()
float linear; float linear;
float quadratic; float quadratic;
float ambient;
}; };
layout(std140) uniform light_ubo layout(std140) uniform light_ubo

3
gl/ubo.h
View File

@@ -88,7 +88,8 @@ namespace gl
float linear; float linear;
float quadratic; float quadratic;
UBS_PAD(8); float ambient;
UBS_PAD(4);
}; };
static_assert(sizeof(light_element_ubs) == 64, "bad size of ubs"); static_assert(sizeof(light_element_ubs) == 64, "bad size of ubs");

21
renderer.cpp
View File

@@ -633,6 +633,17 @@ void opengl_renderer::Render_pass(rendermode const Mode)
if (!Global.gfx_usegles && !Global.gfx_shadergamma) if (!Global.gfx_usegles && !Global.gfx_shadergamma)
glDisable(GL_FRAMEBUFFER_SRGB); glDisable(GL_FRAMEBUFFER_SRGB);
if (DebugModeFlag)
{
ImGui::Begin("light conf");
ImGui::SliderFloat("in_cutoff", &in_cutoff, 0.9f, 1.1f);
ImGui::SliderFloat("out_cutoff", &out_cutoff, 0.9f, 1.1f);
ImGui::SliderFloat("linear", &linear, 0.0f, 1.0f, "%.3f", 2.0f);
ImGui::SliderFloat("quadratic", &quadratic, 0.0f, 1.0f, "%.3f", 2.0f);
ImGui::SliderFloat("ambient", &ambient, 0.0f, 1.0f);
ImGui::End();
}
glDebug("uilayer render"); glDebug("uilayer render");
Application.render_ui(); Application.render_ui();
@@ -3700,11 +3711,12 @@ void opengl_renderer::Update_Lights(light_array &Lights)
l->pos = mv * glm::vec4(renderlight->position, 1.0f); l->pos = mv * glm::vec4(renderlight->position, 1.0f);
l->dir = mv * glm::vec4(renderlight->direction, 0.0f); l->dir = mv * glm::vec4(renderlight->direction, 0.0f);
l->type = gl::light_element_ubs::SPOT; l->type = gl::light_element_ubs::SPOT;
l->in_cutoff = 0.997f; l->in_cutoff = in_cutoff;
l->out_cutoff = 0.99f; l->out_cutoff = out_cutoff;
l->color = renderlight->diffuse * renderlight->factor; l->color = renderlight->diffuse * renderlight->factor;
l->linear = 0.007f; l->linear = linear / 10.0f;
l->quadratic = 0.0002f; l->quadratic = quadratic / 100.0f;
l->ambient = ambient;
light_i++; light_i++;
++renderlight; ++renderlight;
@@ -3714,6 +3726,7 @@ void opengl_renderer::Update_Lights(light_array &Lights)
light_ubs.lights[0].type = gl::light_element_ubs::DIR; light_ubs.lights[0].type = gl::light_element_ubs::DIR;
light_ubs.lights[0].dir = mv * glm::vec4(m_sunlight.direction, 0.0f); light_ubs.lights[0].dir = mv * glm::vec4(m_sunlight.direction, 0.0f);
light_ubs.lights[0].color = m_sunlight.diffuse * m_sunlight.factor; light_ubs.lights[0].color = m_sunlight.diffuse * m_sunlight.factor;
light_ubs.lights[0].ambient = 0.0f;
light_ubs.lights_count = light_i; light_ubs.lights_count = light_i;
light_ubs.fog_color = Global.FogColor; light_ubs.fog_color = Global.FogColor;

2
renderer.h
View File

@@ -411,6 +411,8 @@ class opengl_renderer
bool m_blendingenabled; bool m_blendingenabled;
bool m_widelines_supported; bool m_widelines_supported;
float in_cutoff=0.997f, out_cutoff=0.99f, linear=0.07f, quadratic=0.02f, ambient=0.25f;
}; };
extern opengl_renderer GfxRenderer; extern opengl_renderer GfxRenderer;

3
shaders/light_common.glsl
View File

@@ -44,7 +44,7 @@ vec2 calc_light(vec3 light_dir)
#endif #endif
vec3 view_dir = normalize(vec3(0.0f, 0.0f, 0.0f) - f_pos.xyz); vec3 view_dir = normalize(vec3(0.0f, 0.0f, 0.0f) - f_pos.xyz);
vec3 halfway_dir = normalize(light_dir + view_dir); vec3 halfway_dir = normalize(light_dir + view_dir);
float diffuse_v = max(dot(normal, light_dir), 0.0); float diffuse_v = max(dot(normal, light_dir), 0.0);
float specular_v = pow(max(dot(normal, halfway_dir), 0.0), 15.0); float specular_v = pow(max(dot(normal, halfway_dir), 0.0), 15.0);
@@ -55,6 +55,7 @@ vec2 calc_point_light(light_s light)
{ {
vec3 light_dir = normalize(light.pos - f_pos.xyz); vec3 light_dir = normalize(light.pos - f_pos.xyz);
vec2 val = calc_light(light_dir); vec2 val = calc_light(light_dir);
val.x += light.ambient;
float distance = length(light.pos - f_pos.xyz); float distance = length(light.pos - f_pos.xyz);
float atten = 1.0f / (1.0f + light.linear * distance + light.quadratic * (distance * distance)); float atten = 1.0f / (1.0f + light.linear * distance + light.quadratic * (distance * distance));