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

alerter fixes, removing obstacles, python config changes

This commit is contained in:
milek7
2019-03-16 12:43:34 +01:00
parent 608af111a2
commit 8b642205eb
12 changed files with 105 additions and 28 deletions

View File

@@ -42,13 +42,23 @@ class switch_window : public popup
virtual void render_content() override;
};
class obstacle_window : public popup
class obstacle_insert_window : public popup
{
glm::dvec3 m_position;
std::vector<std::pair<std::string, std::string>> m_obstacles;
public:
obstacle_window(ui_panel &panel, glm::dvec3 const &pos);
obstacle_insert_window(ui_panel &panel, glm::dvec3 const &pos);
virtual void render_content() override;
};
class obstacle_remove_window : public popup
{
std::shared_ptr<map::obstacle> m_obstacle;
public:
obstacle_remove_window(ui_panel &panel, std::shared_ptr<map::obstacle> &&obstacle);
virtual void render_content() override;
};