mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-11-25 09:44:02 +00:00
Code Issues Releases Wiki Activity

Merge pull request #19 from jbeich/glm095

Browse source 
Unbreak build with glm-0.9.5
This commit is contained in:
False.Genesis 2015-09-30 23:24:16 +02:00
commit b1e3cfbcba
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
BBGE/RenderObject.cpp
View file

@ -316,10 +316,9 @@ static glm::mat4 matrixChain(const RenderObject *ro)
); );
if (ro->isfh()) if (ro->isfh())
tranformMatrix *= glm::rotate(180.0f, 0.0f, 1.0f, 0.0f); tranformMatrix *= glm::rotate(180.0f, glm::vec3(0.0f, 1.0f, 0.0f));
tranformMatrix *= glm::translate(ro->internalOffset.x, ro->internalOffset.y, 0.0f);
tranformMatrix *= glm::translate(glm::vec3(ro->internalOffset.x, ro->internalOffset.y, 0.0f));
return tranformMatrix; return tranformMatrix;
} }
#else #else