16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-21 13:39:18 +02:00

geometry shaders, map poi icons

This commit is contained in:
milek7
2019-03-17 20:30:25 +01:00
parent 3091e13433
commit 4383b0c7e0
16 changed files with 193 additions and 46 deletions

View File

@@ -31,13 +31,13 @@ class semaphore_window : public popup
virtual void render_content() override;
};
class switch_window : public popup
class launcher_window : public popup
{
std::shared_ptr<map::track_switch> m_switch;
std::shared_ptr<map::launcher> m_switch;
command_relay m_relay;
public:
switch_window(ui_panel &panel, std::shared_ptr<map::track_switch> &&sw);
launcher_window(ui_panel &panel, std::shared_ptr<map::launcher> &&sw);
virtual void render_content() override;
};
@@ -67,9 +67,11 @@ class obstacle_remove_window : public popup
class map_panel : public ui_panel
{
std::unique_ptr<gl::program> m_shader;
std::unique_ptr<gl::program> m_track_shader;
std::unique_ptr<gl::program> m_poi_shader;
std::unique_ptr<gl::framebuffer> m_msaa_fb;
std::unique_ptr<gl::renderbuffer> m_msaa_rb;
texture_handle m_icon_atlas;
std::unique_ptr<gl::framebuffer> m_fb;
std::unique_ptr<opengl_texture> m_tex;