Started rewriting

2016-05-17 15:31:49 +02:00
parent 5df4a1d8d0
commit 876ec56780
29 changed files with 884 additions and 79 deletions
@@ -1,7 +1,6 @@
 #pragma once
 #include "Header.h"
-#include "ModelLoader.h"
-#include "Vector.h"
+#include "ModelInstance.h"

 class Model
 {
@@ -59,10 +58,15 @@ private:
 	std::vector<ObjGroup*> groups;
 	std::vector<MaterialInfo*> materials;

+	std::vector<ModelInstance*> instances;
+
 	void loadMaterialFile(std::string fileName, std::string dirName);
 public:
 	Model(std::string filename);
+	Model(void);
 	~Model(void);

+	void AddInstance(ModelInstance* inst);
+
 	void draw();
 };