mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-10-17 17:59:19 +02:00
* refactor(sonar): use override instead of redundant virtual (cpp:S3471) * refactor(sonar): remove empty statements, one declaration per statement (cpp:S1116, cpp:S1659) * refactor(sonar): drop redundant lambda return types (cpp:S3574) * refactor(sonar): prefer using over typedef (cpp:S5416) * refactor(sonar): use =default for trivial special members (cpp:S3490) * refactor(sonar): use nullptr literal (cpp:S4962) * refactor(sonar): remove redundant access specifiers (cpp:S3539) * refactor(sonar): remove redundant casts (cpp:S1905) * refactor(sonar): use std::scoped_lock instead of std::lock_guard (cpp:S5997) * refactor(sonar): construct elements in place with emplace_back (cpp:S6003) * refactor(sonar): make narrowing conversions explicit (cpp:S5276) * refactor(sonar): mark unused parameters (cpp:S1172) Unused names are commented out; parameters used only on some platforms are marked [[maybe_unused]]. * refactor(sonar): declare non-mutating member functions const (cpp:S5817) Virtual functions are left untouched so overrides keep matching. * refactor(sonar): merge collapsible nested if statements (cpp:S1066) Comments that preceded the inner if are kept above the merged statement. * refactor(sonar): scope single-use variables in if init-statements (cpp:S6004) * fix(sonar): give polymorphic base classes virtual destructors (cpp:S1235) * refactor(sonar): use try_emplace for map insertion (cpp:S6030) * refactor(sonar): use auto where the type is spelled out on the right (cpp:S5827) * refactor(sonar): remove redundant parentheses (cpp:S1110) * refactor(sonar): document intentionally empty functions (cpp:S1186) * refactor(sonar): remove dead stores (cpp:S1854) Side effects (e.g. LISTLINE++) are kept. * refactor(sonar): remove unused variables, captures and private fields (cpp:S1481, cpp:S1068) * refactor(sonar): use structured bindings for pair access (cpp:S6005) * refactor(sonar): use range-based loops and ranges algorithms (cpp:S5566) * refactor(sonar): split chained assignments (cpp:S1121) * refactor(sonar): add default cases to switch statements (cpp:S3562) * refactor(sonar): use std::size for array lengths (cpp:S7127) * refactor(sonar): use std::ranges algorithms and std::erase(_if) (cpp:S6197) * refactor(sonar): access static members through the class (cpp:S2209) * refactor(sonar): add braces around nested if-else (cpp:S5261) * refactor(sonar): avoid side effects inside typeid operands (cpp:S5279) * refactor(sonar): drop top-level const from by-value return types (cpp:S5951) * refactor(sonar): declare variables separately from their type definitions (cpp:S3646) * refactor(sonar): declare loop counters in the for statement (cpp:S5955) * refactor(sonar): rely on class template argument deduction (cpp:S6012) * refactor(sonar): inherit base constructors instead of forwarding them (cpp:S5952) * refactor(sonar): rename locals that shadow outer declarations (cpp:S1117) Only local variables and definition parameters are renamed; shadowing struct fields and enumerators in headers are left for a separate change. * refactor(sonar): reduce enum qualification with using enum (cpp:S6177) Applied only where no unqualified name in the block could be captured by the introduced enumerators. * refactor(sonar): mark converting constructors explicit (cpp:S1709) sound_source and the gl::object conversion operators stay implicit; they are relied upon by copy-list-initialisation and GL calls. * refactor(sonar): initialise members in initialiser lists or declarations (cpp:S3230) * refactor(sonar): make read-only local references and pointers const (cpp:S5350) * refactor(sonar): take read-only pointer and reference parameters as const (cpp:S995) TTrain command handlers keep their signature, it is fixed by the handler table. * refactor(sonar): pass expensive-to-copy parameters by const reference (cpp:S1238) Signatures declared in files touched by PR 206 (Driver.h, EU07.cpp) and virtual overrides are left unchanged. * refactor(sonar): use transparent comparators for string-keyed maps (cpp:S6045) std::unordered_map instances and map types exposed in headers used by other modules are left as they are. * fix(sonar): do not use UI text as a printf format string (cpp:S5281) Text lines containing '%' would otherwise be interpreted as format specifiers by ImGui::TextColored. * refactor(sonar): use std::bind_front for callbacks (cpp:S5995) * refactor(sonar): drop const_cast on string literals passed to the Python C API (cpp:S859) * refactor(sonar): take read-only string parameters as std::string_view (cpp:S6009) The Windows messaging helpers keep std::string, they need c_str(). * refactor(sonar): make read-only global tables const (cpp:S5421) Mutable global state (flags, timers, singletons) is left as is. * refactor(sonar): replace single-case switch statements with if (cpp:S1301) * refactor(sonar): format UUIDs and log timestamps with std::format (cpp:S6494, cpp:S5945) * refactor(sonar): use std::array for local fixed-size arrays (cpp:S5945) Arrays that are class members or part of headers are left unchanged. * fix(sonar): test the bearing damage bit, not bit 0 (cpp:S872) 'DamageFlag & dtrain_bearing > 0' parsed as 'DamageFlag & (dtrain_bearing > 0)', i.e. DamageFlag & 1, so bearing friction reacted to the wrong damage flag. * refactor(sonar): assorted small fixes - empty() instead of size() comparisons (cpp:S1155) - member initialisers in declaration order (cpp:S3229) - no redundant c_str() when a std::string is accepted (cpp:S7121) - contains() on associative containers (cpp:S6171) - const reference instead of a copying range-for (cpp:S6032) - starts_with() for prefix checks (cpp:S6178) - no std::move on temporaries (cpp:S5274) - has_value() on std::optional (cpp:S7172) - bool literals for bool members (cpp:S5820) - inline only on the definition (cpp:S3548) - explicit base access specifier (cpp:S5965) - explicit element access instead of dereferencing an array (cpp:S7116) - rely on the C++20 rewritten operator!= (cpp:S6186) * refactor(sonar): more small fixes - std::format instead of iostream manipulators in to_string/to_hex_str (cpp:S6495); output verified identical, negative hex values keep the unsigned form - remove an empty compound statement (cpp:S108) - drop an always-false unsigned < 0 branch (cpp:S1768) - explicit lambda capture (cpp:S3608) - std::make_unique (cpp:S5950) * chore: strip stray carriage returns left in TTrain constructor comments * fix: keep quantize() in its own value type The S5276 change cast the result of the generic quantize<Type_>() to unsigned int, which truncated float/double callers (shadow angle slider, editor rotation snapping, AI speed control steps) and broke negative values. * fix(sonar): use integer loop counters in segment sampling (cpp:S2193) * refactor(sonar): clean up issues reported on PR 209 - remove locals left unused after the dead-store cleanup (cpp:S1481, cpp:S1854) - unnamed unused parameter (cpp:S1172) - single-use declarations moved into if init-statements (cpp:S6004) - auto for casted initialisers (cpp:S5827) - const references and pointers where nothing is modified (cpp:S5350) - rename structured bindings shadowed by inner declarations (cpp:S1117)
141 lines
4.6 KiB
C++
141 lines
4.6 KiB
C++
/*
|
|
This Source Code Form is subject to the
|
|
terms of the Mozilla Public License, v.
|
|
2.0. If a copy of the MPL was not
|
|
distributed with this file, You can
|
|
obtain one at
|
|
http://mozilla.org/MPL/2.0/.
|
|
*/
|
|
|
|
#include "stdafx.h"
|
|
#include "rendering/opengl33particles.h"
|
|
|
|
#include "rendering/particles.h"
|
|
#include "rendering/openglcamera.h"
|
|
#include "simulation/simulation.h"
|
|
#include "simulation/simulationenvironment.h"
|
|
|
|
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 }, { 1.f, 0.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 }, { 1.f, 1.f } },
|
|
{ { -0.5f, 0.5f, 0.f }, { 0.f, 1.f } },
|
|
};
|
|
|
|
void
|
|
opengl33_particles::update( opengl_camera const &Camera ) {
|
|
|
|
if (!Global.Smoke)
|
|
return;
|
|
|
|
m_particlevertices.clear();
|
|
// build a list of visible smoke sources
|
|
// NOTE: arranged by distance to camera, if we ever need sorting and/or total amount cap-based culling
|
|
std::multimap<float, smoke_source const &> sources;
|
|
|
|
for( auto const &source : simulation::Particles.sequence() ) {
|
|
if( false == Camera.visible( source.area() ) ) { continue; }
|
|
// NOTE: the distance is negative when the camera is inside the source's bounding area
|
|
sources.emplace(
|
|
static_cast<float>( glm::length( Camera.position() - source.area().center ) - source.area().radius ),
|
|
source );
|
|
}
|
|
|
|
if( true == sources.empty() ) { return; }
|
|
|
|
// build billboard data for particles from visible sources
|
|
auto const camerarotation { glm::mat3( Camera.modelview() ) };
|
|
particle_vertex vertex;
|
|
for( auto const &[sourcekey, sourcedata] : sources ) {
|
|
|
|
auto const particlecolor {
|
|
glm::clamp(
|
|
sourcedata.color()
|
|
* ( glm::vec3 { Global.DayLight.ambient }
|
|
+ 0.35f * glm::vec3{ Global.DayLight.diffuse } ) * simulation::Environment.light_intensity(),
|
|
glm::vec3{ 0.f }, glm::vec3{ 1.f } ) };
|
|
auto const &particles { sourcedata.sequence() };
|
|
// TODO: put sanity cap on the overall amount of particles that can be drawn
|
|
auto const sizestep { 256.0 * billboard_vertices.size() };
|
|
m_particlevertices.reserve(
|
|
static_cast<std::size_t>( sizestep * std::ceil( static_cast<double>(m_particlevertices.size()) + ( static_cast<double>(particles.size() * billboard_vertices.size()) ) / sizestep ) ) );
|
|
for( auto const &particle : particles ) {
|
|
// TODO: particle color support
|
|
vertex.color[ 0 ] = particlecolor.r;
|
|
vertex.color[ 1 ] = particlecolor.g;
|
|
vertex.color[ 2 ] = particlecolor.b;
|
|
vertex.color.a = std::clamp(particle.opacity, 0.0f, 1.0f);
|
|
|
|
auto const offset { glm::vec3{ particle.position - Camera.position() } };
|
|
auto const rotation { glm::angleAxis( particle.rotation, glm::vec3{ 0.f, 0.f, 1.f } ) };
|
|
|
|
for( auto const &[billboardoffset, billboardtexture] : billboard_vertices ) {
|
|
vertex.position = offset + ( rotation * billboardoffset * particle.size ) * camerarotation;
|
|
vertex.texture = billboardtexture;
|
|
|
|
m_particlevertices.emplace_back( vertex );
|
|
}
|
|
}
|
|
}
|
|
|
|
// ship the billboard data to the gpu:
|
|
// make sure we have enough room...
|
|
if( m_buffercapacity < m_particlevertices.size() ) {
|
|
m_buffercapacity = m_particlevertices.size();
|
|
if (!m_buffer)
|
|
m_buffer.emplace();
|
|
|
|
m_buffer->allocate(gl::buffer::ARRAY_BUFFER,
|
|
m_buffercapacity * sizeof(particle_vertex), GL_STREAM_DRAW);
|
|
}
|
|
|
|
if (m_buffer) {
|
|
// ...send the data...
|
|
m_buffer->upload(gl::buffer::ARRAY_BUFFER,
|
|
m_particlevertices.data(), 0, m_particlevertices.size() * sizeof(particle_vertex));
|
|
}
|
|
}
|
|
|
|
std::size_t
|
|
opengl33_particles::render() {
|
|
|
|
if( false == Global.Smoke ) { return 0; }
|
|
if( m_buffercapacity == 0 ) { return 0; }
|
|
if( m_particlevertices.empty() ) { return 0; }
|
|
|
|
if (!m_vao) {
|
|
m_vao.emplace();
|
|
|
|
m_vao->setup_attrib(*m_buffer, 0, 3, GL_FLOAT, sizeof(particle_vertex), 0);
|
|
m_vao->setup_attrib(*m_buffer, 1, 4, GL_FLOAT, sizeof(particle_vertex), 12);
|
|
m_vao->setup_attrib(*m_buffer, 2, 2, GL_FLOAT, sizeof(particle_vertex), 28);
|
|
|
|
gl::buffer::unbind(gl::buffer::ARRAY_BUFFER);
|
|
gl::vao::unbind();
|
|
}
|
|
|
|
if (!m_shader) {
|
|
gl::shader vert("smoke.vert");
|
|
gl::shader frag("smoke.frag");
|
|
auto prog = new gl::program({vert, frag});
|
|
m_shader = std::unique_ptr<gl::program>(prog);
|
|
}
|
|
|
|
m_buffer->bind(gl::buffer::ARRAY_BUFFER);
|
|
m_shader->bind();
|
|
m_vao->bind();
|
|
|
|
glDrawArrays(GL_TRIANGLES, 0, static_cast<GLsizei>(m_particlevertices.size()));
|
|
|
|
gl::program::unbind();
|
|
gl::vao::unbind();
|
|
gl::buffer::unbind(gl::buffer::ARRAY_BUFFER);
|
|
|
|
return m_particlevertices.size() / 6;
|
|
}
|
|
|
|
//---------------------------------------------------------------------------
|