eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'd8170c932b448ba6888e702746b5ae22632062d8' into sim

Browse Source
This commit is contained in:
milek7
2022-01-05 01:02:56 +01:00
parent ff3c38a506 d8170c932b
commit 5bafa31f9d
76 changed files with 9277 additions and 5749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
widgets/map.cpp
View File

@@ -141,7 +141,7 @@ void ui::map_panel::render_map_texture(glm::mat4 transform, glm::vec2 surface_si
glViewport(0, 0, surface_size.x, surface_size.y);
scene_ubs.projection = transform;
scene_ubs.cascade_end = glm::vec3(0.5f, 0.5f, 0.5f);
scene_ubs.cascade_end = glm::vec4(0.5f, 0.5f, 0.5f, 0.0f);
scene_ubo->update(scene_ubs);
scene_ubo->bind_uniform();
@@ -152,25 +152,25 @@ void ui::map_panel::render_map_texture(glm::mat4 transform, glm::vec2 surface_si
if (m_widelines_supported)
glLineWidth(4.5f);
scene_ubs.cascade_end = glm::vec3(0.7f, 0.7f, 0.0f);
scene_ubs.cascade_end = glm::vec4(0.7f, 0.7f, 0.0f, 0.0f);
scene_ubo->update(scene_ubs);
gl33->Draw_Geometry(m_colored_paths.future.begin(), m_colored_paths.future.end());
if (m_widelines_supported)
glLineWidth(3.0f);
scene_ubs.cascade_end = glm::vec3(0.0f, 1.0f, 0.0f);
scene_ubs.cascade_end = glm::vec4(0.0f, 1.0f, 0.0f, 0.0f);
scene_ubo->update(scene_ubs);
gl33->Draw_Geometry(m_colored_paths.switches.begin(), m_colored_paths.switches.end());
if (m_widelines_supported)
glLineWidth(1.5f);
scene_ubs.cascade_end = glm::vec3(1.0f, 0.0f, 0.0f);
scene_ubs.cascade_end = glm::vec4(1.0f, 0.0f, 0.0f, 0.0f);
scene_ubo->update(scene_ubs);
gl33->Draw_Geometry(m_colored_paths.occupied.begin(), m_colored_paths.occupied.end());
if (m_widelines_supported)
glLineWidth(4.0f);
scene_ubs.cascade_end = glm::vec3(0.3f, 0.3f, 1.0f);
scene_ubs.cascade_end = glm::vec4(0.3f, 0.3f, 1.0f, 0.0f);
scene_ubo->update(scene_ubs);
gl33->Draw_Geometry(m_colored_paths.highlighted.begin(), m_colored_paths.highlighted.end());

4
widgets/vehicleparams.cpp
View File

@@ -106,11 +106,11 @@ void ui::vehicleparams_panel::render_contents()
TTrain *train_ptr = simulation::Trains.find(m_vehicle_name);
if (train_ptr) {
const TTrain::screen_map &screens = train_ptr->get_screens();
const TTrain::screenentry_sequence &screens = train_ptr->get_screens();
for (const auto &viewport : Global.python_viewports) {
for (auto const &entry : screens) {
if (entry.rendererpath != viewport.surface)
if (entry.script != viewport.surface)
continue;
std::string window_name = STR("Screen") + "##" + viewport.surface;