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

python screen windows without context sharing

This commit is contained in:
milek7
2019-03-18 17:02:54 +01:00
parent efb041aaa0
commit 99e7ef5513
12 changed files with 156 additions and 54 deletions

View File

@@ -100,7 +100,7 @@ class TTrain
float hv_voltage;
std::array<float, 3> hv_current;
};
typedef std::tuple<std::string, GLuint, std::unique_ptr<python_screen_viewer>> screen_entry;
typedef std::tuple<std::string, std::shared_ptr<python_rt>, std::unique_ptr<python_screen_viewer>> screen_entry;
typedef std::vector<screen_entry> screen_map;
// methods
@@ -672,7 +672,7 @@ private:
float m_mastercontrollerreturndelay { 0.f };
int iRadioChannel { 1 }; // numer aktualnego kana?u radiowego
screen_map m_screens;
uint16_t vid { 0 };
uint16_t vid { 0 }; // train network recipient id
public:
float fPress[20][3]; // cisnienia dla wszystkich czlonow