eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-20 06:49:19 +02:00
Code Issues 123 Wiki Activity

Merge branch 'tmj-dev' into milek-dev

Browse Source
This commit is contained in:
milek7
2018-10-12 23:13:51 +02:00
parent 2a00d52525 68f82be451
commit c7741c6618
32 changed files with 27 additions and 1514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PyInt.h
View File

@@ -39,7 +39,7 @@ class render_task {
public:
// constructors
render_task( PyObject *Renderer, PyObject *Input, material_handle Target ) :
render_task( PyObject *Renderer, PyObject *Input, texture_handle Target ) :
m_renderer( Renderer ), m_input( Input ), m_target( Target )
{}
// methods
@@ -49,7 +49,7 @@ private:
// members
PyObject *m_renderer {nullptr};
PyObject *m_input { nullptr };
material_handle m_target { null_handle };
texture_handle m_target { null_handle };
};
class python_taskqueue {
@@ -60,7 +60,7 @@ public:
std::string const &renderer;
PyObject *input;
material_handle target;
texture_handle target;
};
// constructors
python_taskqueue() = default;