eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-03 01:30:16 +01:00
Code Issues 157 Wiki Activity

Merge remote-tracking branch 'jano211/siec-radio' into feat/renderers-cleanup

Browse Source
This commit is contained in:
Hirek
2026-10-26 16:36:36 +01:00
parent 719c729929 619f048f31
commit 550d47e97c
57 changed files with 23957 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
rendering/common/scenewalk.cpp
View File

@@ -21,6 +21,7 @@ http://mozilla.org/MPL/2.0/.
#include "simulation/simulation.h"
#include "world/Track.h"
#include "world/Traction.h"
#include "world/catenary_span.h"
#include "world/MemCell.h"
#include "world/TrackSleepers.h"
#include "model/AnimModel.h"
@@ -2656,6 +2657,33 @@ void scene_walk::Render_Alpha(TTraction *Traction)
walk_draw(Traction->m_geometry);
// up close also the solids of a span drawn by the type of the catenary: the wires and ropes in their real thickness and the fittings.
// they're opaque, so they're drawn without blending and write the depth; otherwise they'd cover one another by the order they're drawn in
if (auto const solid{catenary_span_solid(*Traction, Global.pCamera.Pos)}; solid.wires != null_handle)
{
auto const blending{walk_blending_enabled()};
if (m_renderpass.draw_mode != rendermode::shadows)
walk_blending(false);
model_ubs.param[0] = glm::vec4(Traction->wire_color(), 1.0f);
walk_draw(solid.wires);
++m_renderpass.draw_stats.drawcalls;
if (solid.fittings != null_handle)
{
walk_draw(solid.fittings);
++m_renderpass.draw_stats.drawcalls;
}
// the rope of the tensioning device at the end of the span (steel)
if (solid.rope != null_handle)
{
auto const &steel{catenary_rope_metal()};
model_ubs.param[0] = glm::vec4(steel.color[0], steel.color[1], steel.color[2], 1.0f);
walk_draw(solid.rope);
++m_renderpass.draw_stats.drawcalls;
}
if (m_renderpass.draw_mode != rendermode::shadows)
walk_blending(blending);
}
// debug data
++m_renderpass.draw_stats.traction;
++m_renderpass.draw_stats.drawcalls;