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

Merge branch 'milek-dev' into gfx-work

This commit is contained in:
milek7
2018-10-10 19:33:08 +02:00
49 changed files with 1697 additions and 1026 deletions

View File

@@ -10,6 +10,7 @@ http://mozilla.org/MPL/2.0/.
#pragma once
#include "applicationmode.h"
#include "PyInt.h"
class eu07_application {
@@ -29,6 +30,8 @@ public:
init( int Argc, char *Argv[] );
int
run();
bool
request( python_taskqueue::task_request const &Task );
void
exit();
void
@@ -61,11 +64,9 @@ public:
void
on_scroll( double const Xoffset, double const Yoffset );
void on_char(unsigned int c);
inline
// gives access to specified window, creates a new window if index == -1
GLFWwindow *
window() {
return m_window; }
window( int const Windowindex = 0 );
private:
// types
@@ -82,12 +83,13 @@ private:
int init_audio();
int init_modes();
// members
GLFWwindow * m_window { nullptr };
bool m_screenshot_queued = false;
modeptr_array m_modes { nullptr }; // collection of available application behaviour modes
mode_stack m_modestack; // current behaviour mode
python_taskqueue m_taskqueue;
std::vector<GLFWwindow *> m_windows;
};
extern eu07_application Application;