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

restore (presumably) correct sun/moon sizes

Browse Source
This commit is contained in:
milek7
2020-12-02 02:40:07 +01:00
parent a182eec2a1
commit f481fbb7cc
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
opengl33renderer.cpp
View File

@@ -1799,12 +1799,12 @@ bool opengl33_renderer::Render(world_environment *Environment)
glm::vec4 color(suncolor.x, suncolor.y, suncolor.z, clamp(1.5f - Global.Overcast, 0.f, 1.f) * fogfactor); glm::vec4 color(suncolor.x, suncolor.y, suncolor.z, clamp(1.5f - Global.Overcast, 0.f, 1.f) * fogfactor);
auto const sunvector = Environment->m_sun.getDirection(); auto const sunvector = Environment->m_sun.getDirection();
float const size = interpolate( // TODO: expose distance/scale factor from the moon object /*float const size = interpolate( // TODO: expose distance/scale factor from the moon object
0.0325f, 0.0325f,
0.0275f, 0.0275f,
clamp( Environment->m_sun.getAngle(), 0.f, 90.f ) / 90.f ); clamp( Environment->m_sun.getAngle(), 0.f, 90.f ) / 90.f );*/
model_ubs.param[0] = color; model_ubs.param[0] = color;
model_ubs.param[1] = glm::vec4(glm::vec3(modelview * glm::vec4(sunvector, 1.0f)), /*0.00463f*/ size); model_ubs.param[1] = glm::vec4(glm::vec3(modelview * glm::vec4(sunvector, 1.0f)), 0.00463f /* size */);
model_ubs.param[2] = glm::vec4(0.0f, 1.0f, 1.0f, 0.0f); model_ubs.param[2] = glm::vec4(0.0f, 1.0f, 1.0f, 0.0f);
model_ubo->update(model_ubs); model_ubo->update(model_ubs);
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
@@ -1875,13 +1875,14 @@ bool opengl33_renderer::Render(world_environment *Environment)
moonu = 0.0f; moonu = 0.0f;
} }
/*
float const size = interpolate( // TODO: expose distance/scale factor from the moon object float const size = interpolate( // TODO: expose distance/scale factor from the moon object
0.0160f, 0.0160f,
0.0135f, 0.0135f,
clamp( Environment->m_moon.getAngle(), 0.f, 90.f ) / 90.f ); clamp( Environment->m_moon.getAngle(), 0.f, 90.f ) / 90.f );*/
model_ubs.param[0] = color; model_ubs.param[0] = color;
model_ubs.param[1] = glm::vec4(glm::vec3(modelview * glm::vec4(moonvector, 1.0f)), /*0.00451f*/ size); model_ubs.param[1] = glm::vec4(glm::vec3(modelview * glm::vec4(moonvector, 1.0f)), 0.00451f /* size */);
model_ubs.param[2] = glm::vec4(moonu, moonv, 0.333f, 0.0f); model_ubs.param[2] = glm::vec4(moonu, moonv, 0.333f, 0.0f);
model_ubo->update(model_ubs); model_ubo->update(model_ubs);
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);