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

depthmask mode fixes, fix particle triangle winding order

Browse Source
This commit is contained in:
milek7
2019-08-09 19:02:29 +02:00
parent 163c1155c2
commit bfff2d506d
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
renderer.cpp
View File

@@ -71,10 +71,9 @@ std::vector<std::pair<glm::vec3, glm::vec2>> const billboard_vertices {
{ { -0.5f, -0.5f, 0.f }, { 0.f, 0.f } }, { { -0.5f, -0.5f, 0.f }, { 0.f, 0.f } },
{ { 0.5f, -0.5f, 0.f }, { 1.f, 0.f } }, { { 0.5f, -0.5f, 0.f }, { 1.f, 0.f } },
{ { 0.5f, 0.5f, 0.f }, { 1.f, 1.f } }, { { 0.5f, 0.5f, 0.f }, { 1.f, 1.f } },
{ { -0.5f, -0.5f, 0.f }, { 0.f, 0.f } }, { { -0.5f, -0.5f, 0.f }, { 0.f, 0.f } },
{ { 0.5f, 0.5f, 0.f }, { 1.f, 1.f } },
{ { -0.5f, 0.5f, 0.f }, { 0.f, 1.f } }, { { -0.5f, 0.5f, 0.f }, { 0.f, 1.f } },
{ { 0.5f, 0.5f, 0.f }, { 1.f, 1.f } }
}; };
void void
@@ -2708,7 +2707,9 @@ void opengl_renderer::Render(TSubModel *Submodel)
glDepthMask(GL_FALSE); glDepthMask(GL_FALSE);
draw(Submodel->m_geometry); draw(Submodel->m_geometry);
glDepthMask(GL_TRUE);
if (!m_blendingenabled)
glDepthMask(GL_TRUE);
} }
model_ubs.param[1].x = pointsize * resolutionratio * 2.0f; model_ubs.param[1].x = pointsize * resolutionratio * 2.0f;
model_ubs.param[0] = glm::vec4(glm::vec3(lightcolor), Submodel->fVisible * std::min(1.f, lightlevel)); model_ubs.param[0] = glm::vec4(glm::vec3(lightcolor), Submodel->fVisible * std::min(1.f, lightlevel));
@@ -3047,17 +3048,12 @@ void opengl_renderer::Render(TMemCell *Memcell)
void opengl_renderer::Render_particles() void opengl_renderer::Render_particles()
{ {
// momentarily disable depth write, to allow vehicle cab drawn afterwards to mask it instead of leaving it 'inside'
glDepthMask(GL_FALSE);
model_ubs.set_modelview(OpenGLMatrices.data(GL_MODELVIEW)); model_ubs.set_modelview(OpenGLMatrices.data(GL_MODELVIEW));
model_ubo->update(model_ubs); model_ubo->update(model_ubs);
Bind_Texture(0, m_smoketexture); Bind_Texture(0, m_smoketexture);
m_particlerenderer.update(m_renderpass.pass_camera); m_particlerenderer.update(m_renderpass.pass_camera);
m_particlerenderer.render(); m_particlerenderer.render();
glDepthMask(GL_TRUE);
} }
void opengl_renderer::Render_precipitation() void opengl_renderer::Render_precipitation()
@@ -3107,12 +3103,8 @@ void opengl_renderer::Render_precipitation()
model_ubs.param[1].x = simulation::Environment.m_precipitation.get_textureoffset(); model_ubs.param[1].x = simulation::Environment.m_precipitation.get_textureoffset();
model_ubo->update(model_ubs); model_ubo->update(model_ubs);
// momentarily disable depth write, to allow vehicle cab drawn afterwards to mask it instead of leaving it 'inside'
::glDepthMask(GL_FALSE);
simulation::Environment.m_precipitation.render(); simulation::Environment.m_precipitation.render();
::glDepthMask(GL_TRUE);
::glPopMatrix(); ::glPopMatrix();
} }
@@ -3557,7 +3549,8 @@ void opengl_renderer::Render_Alpha(TSubModel *Submodel)
// main draw call // main draw call
draw(m_billboardgeometry); draw(m_billboardgeometry);
glDepthMask(GL_TRUE); if (!m_blendingenabled)
glDepthMask(GL_TRUE);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
::glPopMatrix(); ::glPopMatrix();