mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-10-17 09:49: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)
160 lines
5.7 KiB
C++
160 lines
5.7 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/opengl33precipitation.h"
|
|
|
|
#include "utilities/Globals.h"
|
|
#include "rendering/renderer.h"
|
|
#include "simulation/simulationenvironment.h"
|
|
|
|
opengl33_precipitation::~opengl33_precipitation() {
|
|
// TODO: release allocated resources
|
|
}
|
|
|
|
void
|
|
opengl33_precipitation::create( int const Tesselation ) {
|
|
|
|
m_vertices.clear();
|
|
m_uvs.clear();
|
|
m_indices.clear();
|
|
|
|
auto const heightfactor { 10.f }; // height-to-radius factor
|
|
auto const verticaltexturestretchfactor { 1.5f }; // crude motion blur
|
|
|
|
// create geometry chunk
|
|
auto const latitudes { 3 }; // just a cylinder with end cones
|
|
auto const longitudes { Tesselation };
|
|
auto const longitudehalfstep { 0.5f * static_cast<float>( 2.0 * M_PI * 1.f / longitudes ) }; // for crude uv correction
|
|
|
|
std::uint16_t index = 0;
|
|
|
|
// auto const radius { 25.f }; // cylinder radius
|
|
std::vector radii { 25.f, 10.f, 5.f, 1.f };
|
|
for( auto radius : radii ) {
|
|
|
|
for( int i = 0; i <= latitudes; ++i ) {
|
|
|
|
auto const latitude{ static_cast<float>( M_PI * ( -0.5f + (float)( i ) / latitudes ) ) };
|
|
auto const z{ std::sin( latitude ) };
|
|
auto const zr{ std::cos( latitude ) };
|
|
|
|
for( int j = 0; j <= longitudes; ++j ) {
|
|
// NOTE: for the first and last row half of the points we create end up unused but, eh
|
|
auto const longitude{ static_cast<float>( 2.0 * M_PI * (float)( j ) / longitudes ) };
|
|
auto const x{ std::cos( longitude ) };
|
|
auto const y{ std::sin( longitude ) };
|
|
// NOTE: cartesian to opengl swap would be: -x, -z, -y
|
|
m_vertices.emplace_back( glm::vec3( -x * zr, -z * heightfactor, -y * zr ) * radius );
|
|
// uvs
|
|
// NOTE: first and last row receives modified u values to deal with limitation of mapping onto triangles
|
|
auto u = (
|
|
i == 0 ? longitude + longitudehalfstep :
|
|
i == latitudes ? longitude - longitudehalfstep :
|
|
longitude );
|
|
m_uvs.emplace_back(
|
|
u / ( 2.0 * M_PI ) * radius,
|
|
1.f - (float)( i ) / latitudes * radius * heightfactor * 0.5f / verticaltexturestretchfactor );
|
|
|
|
if( ( i == 0 ) || ( j == 0 ) ) {
|
|
// initial edge of the dome, don't start indices yet
|
|
++index;
|
|
}
|
|
else {
|
|
// the end cones are built from one triangle of each quad, the middle rows use both
|
|
if( i < latitudes ) {
|
|
m_indices.emplace_back( index - 1 - ( longitudes + 1 ) );
|
|
m_indices.emplace_back( index - 1 );
|
|
m_indices.emplace_back( index );
|
|
}
|
|
if( i > 1 ) {
|
|
m_indices.emplace_back( index );
|
|
m_indices.emplace_back( index - ( longitudes + 1 ) );
|
|
m_indices.emplace_back( index - 1 - ( longitudes + 1 ) );
|
|
}
|
|
++index;
|
|
}
|
|
} // longitude
|
|
} // latitude
|
|
} // radius
|
|
}
|
|
|
|
void
|
|
opengl33_precipitation::update() {
|
|
|
|
if (!m_shader)
|
|
{
|
|
gl::shader vert("precipitation.vert");
|
|
gl::shader frag("precipitation.frag");
|
|
m_shader.emplace(std::vector<std::reference_wrapper<const gl::shader>>({vert, frag}));
|
|
}
|
|
|
|
if (!m_vertexbuffer) {
|
|
m_vao.emplace();
|
|
m_vao->bind();
|
|
|
|
if( m_vertices.empty() ) {
|
|
// create visualization mesh
|
|
create( 18 );
|
|
}
|
|
// build the buffers
|
|
m_vertexbuffer.emplace();
|
|
m_vertexbuffer->allocate(gl::buffer::ARRAY_BUFFER, m_vertices.size() * sizeof( glm::vec3 ), GL_STATIC_DRAW);
|
|
m_vertexbuffer->upload(gl::buffer::ARRAY_BUFFER, m_vertices.data(), 0, m_vertices.size() * sizeof( glm::vec3 ));
|
|
|
|
m_vao->setup_attrib(*m_vertexbuffer, 0, 3, GL_FLOAT, sizeof(glm::vec3), 0);
|
|
|
|
m_uvbuffer.emplace();
|
|
m_uvbuffer->allocate(gl::buffer::ARRAY_BUFFER, m_uvs.size() * sizeof( glm::vec2 ), GL_STATIC_DRAW);
|
|
m_uvbuffer->upload(gl::buffer::ARRAY_BUFFER, m_uvs.data(), 0, m_uvs.size() * sizeof( glm::vec2 ));
|
|
|
|
m_vao->setup_attrib(*m_uvbuffer, 1, 2, GL_FLOAT, sizeof(glm::vec2), 0);
|
|
|
|
m_indexbuffer.emplace();
|
|
m_indexbuffer->allocate(gl::buffer::ELEMENT_ARRAY_BUFFER, m_indices.size() * sizeof( unsigned short ), GL_STATIC_DRAW);
|
|
m_indexbuffer->upload(gl::buffer::ELEMENT_ARRAY_BUFFER, m_indices.data(), 0, m_indices.size() * sizeof( unsigned short ));
|
|
m_vao->setup_ebo(*m_indexbuffer);
|
|
|
|
gl::vao::unbind();
|
|
// NOTE: vertex and index source data is superfluous past this point, but, eh
|
|
}
|
|
|
|
// TODO: include weather type check in the entry conditions
|
|
if( m_overcast == Global.Overcast ) { return; }
|
|
|
|
m_overcast = Global.Overcast;
|
|
|
|
std::string const densitysuffix { (
|
|
m_overcast < 1.35 ?
|
|
"_light" :
|
|
"_medium" ) };
|
|
if( Global.Weather == "rain:" ) {
|
|
m_texture = GfxRenderer->Fetch_Texture( "fx/rain" + densitysuffix );
|
|
}
|
|
else if( Global.Weather == "snow:" ) {
|
|
m_texture = GfxRenderer->Fetch_Texture( "fx/snow" + densitysuffix );
|
|
}
|
|
}
|
|
|
|
void
|
|
opengl33_precipitation::render() {
|
|
|
|
if( !m_shader ) { return; }
|
|
if( !m_vao ) { return; }
|
|
|
|
GfxRenderer->Bind_Texture( 0, m_texture );
|
|
|
|
m_shader->bind();
|
|
m_vao->bind();
|
|
|
|
::glDrawElements( GL_TRIANGLES, static_cast<GLsizei>( m_indices.size() ), GL_UNSIGNED_SHORT, reinterpret_cast<void const*>( 0 ) );
|
|
|
|
gl::vao::unbind();
|
|
}
|