eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tmj-dev'

Browse Source
This commit is contained in:
milek7
2018-03-11 21:19:53 +01:00
parent 81a6d753e5 d96b259191
commit dd0fa23e11
15 changed files with 58 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
openglmatrixstack.h
View File

@@ -39,9 +39,9 @@ public:
m_stack.emplace( m_stack.top() ); }
void
pop_matrix() {
m_stack.pop();
if( m_stack.empty() ) { m_stack.emplace( 1.f ); }
upload(); }
if( m_stack.size() > 1 ) {
m_stack.pop();
upload(); } }
void
load_identity() {
m_stack.top() = glm::mat4( 1.f );
@@ -85,7 +85,7 @@ private:
// methods:
void
upload() { ::glLoadMatrixf( &m_stack.top()[0][0] ); }
upload() { ::glLoadMatrixf( glm::value_ptr( m_stack.top() ) ); }
// members:
mat4_stack m_stack;