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

fix smoke color

Browse Source
This commit is contained in:
milek7
2019-09-17 21:52:44 +02:00
parent ebbd653656
commit c44c570509
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
renderer.cpp
View File

@@ -105,9 +105,8 @@ opengl_particles::update( opengl_camera const &Camera ) {
auto const particlecolor { auto const particlecolor {
glm::clamp( glm::clamp(
source.second.color() source.second.color()
* ( glm::vec3 { Global.DayLight.ambient } + 0.35f * glm::vec3{ Global.DayLight.diffuse } ) * ( glm::vec3 { Global.DayLight.ambient } + 0.35f * glm::vec3{ Global.DayLight.diffuse } ),
* 255.f, glm::vec3{ 0.f }, glm::vec3{ 1.f } ) };
glm::vec3{ 0.f }, glm::vec3{ 255.f } ) };
auto const &particles { source.second.sequence() }; auto const &particles { source.second.sequence() };
// TODO: put sanity cap on the overall amount of particles that can be drawn // TODO: put sanity cap on the overall amount of particles that can be drawn
auto const sizestep { 256.0 * billboard_vertices.size() }; auto const sizestep { 256.0 * billboard_vertices.size() };
@@ -115,9 +114,9 @@ opengl_particles::update( opengl_camera const &Camera ) {
sizestep * std::ceil( m_particlevertices.size() + ( particles.size() * billboard_vertices.size() ) / sizestep ) ); sizestep * std::ceil( m_particlevertices.size() + ( particles.size() * billboard_vertices.size() ) / sizestep ) );
for( auto const &particle : particles ) { for( auto const &particle : particles ) {
// TODO: particle color support // TODO: particle color support
vertex.color[ 0 ] = static_cast<std::uint8_t>( particlecolor.r ); vertex.color[ 0 ] = particlecolor.r;
vertex.color[ 1 ] = static_cast<std::uint8_t>( particlecolor.g ); vertex.color[ 1 ] = particlecolor.g;
vertex.color[ 2 ] = static_cast<std::uint8_t>( particlecolor.b ); vertex.color[ 2 ] = particlecolor.b;
vertex.color.a = std::clamp(particle.opacity, 0.0f, 1.0f); vertex.color.a = std::clamp(particle.opacity, 0.0f, 1.0f);
auto const offset { glm::vec3{ particle.position - Camera.position() } }; auto const offset { glm::vec3{ particle.position - Camera.position() } };