Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer

# Conflicts: # include/Engine/Collision/Collision.h # src/Engine/Rendering/Model.cpp # src/Engine/Rendering/RawModelAssimp.cpp
2016-01-15 18:00:30 +01:00
parent 8437b9c734 d28583ca9e
commit 16c39df439
109 changed files with 3705 additions and 1382 deletions
@@ -4,7 +4,7 @@
 #include "RawModelAssimp.h"
 #include "../OpenGL.h"

-class Model : public RawModel
+class Model : public ThreadUnsafeResource
 {
 	friend class ResourceManager;

@@ -13,11 +13,15 @@ private:

 public:
 	~Model();
+    const std::vector<RawModel::MaterialGroup>& MaterialGroups() const { return m_RawModel->MaterialGroups; }
+    const glm::mat4& Matrix() const { return m_RawModel->m_Matrix; }
+    const std::vector<RawModel::Vertex>& Vertices() const { return m_RawModel->m_Vertices; }

 	GLuint VAO;
 	GLuint ElementBuffer;

 private:
+    RawModel* m_RawModel;
 	GLuint VertexBuffer;
 	GLuint DiffuseVertexColorBuffer;
 	GLuint SpecularVertexColorBuffer;