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

Merge branch 'tmj-dev' into milek-dev

This commit is contained in:
milek7
2018-06-30 18:45:58 +02:00
37 changed files with 672 additions and 498 deletions

View File

@@ -52,6 +52,8 @@ struct opengl_technique {
class opengl_camera {
public:
// constructors
opengl_camera() = default;
// methods:
inline
void
@@ -113,10 +115,10 @@ class opengl_renderer {
public:
// types
// constructors
opengl_renderer() = default;
// destructor
~opengl_renderer() { gluDeleteQuadric( m_quadric ); }
// methods
bool
Init( GLFWwindow *Window );
@@ -287,7 +289,7 @@ private:
bool
Render_cab( TDynamicObject const *Dynamic, bool const Alpha = false );
void
Render( TMemCell *Memcell );
Render( TMemCell const *Memcell );
void
Render_Alpha( scene::basic_region *Region );
void