Merge remote-tracking branch 'origin/master' into Animations

# Conflicts: # assets # include/Engine/Rendering/Model.h # src/Engine/Collision/Collision.cpp
2016-02-10 14:13:08 +01:00
parent afebf879a0 645ee9013a
commit 08328a781c
31 changed files with 1434 additions and 489 deletions
@@ -4,6 +4,7 @@
 #include "Rendering/RawModelCustom.h"
 //#include "Rendering/RawModelAssimp.h"
 #include "../OpenGL.h"
+#include "Core/AABB.h"

 class Model : public ThreadUnsafeResource
 {
@@ -18,13 +19,15 @@ public:
    const glm::mat4& Matrix() const { return m_RawModel->m_Matrix; }
    const RawModel::Vertex* Vertices() const { return m_RawModel->Vertices(); }
 	unsigned int NumberOfVertices() const { return m_RawModel->NumVertices(); }
+    const AABB& Box() const { return m_Box; }
 	bool isSkined() const { return m_RawModel->isSkined(); }
 	GLuint VAO;
 	GLuint ElementBuffer;
    RawModel* m_RawModel;

 private:
-    
+    AABB m_Box;
+
 	GLuint VertexBuffer;
 	GLuint NormalBuffer;
 	GLuint TangentNormalsBuffer;