Added new Johan Code

2016-05-20 13:00:04 +02:00
parent 1120a3e144
commit a8415db4ac
24 changed files with 2287 additions and 32 deletions
@@ -1,12 +1,20 @@
 #include "LevelObject.h"

+#include "Model.h"


-LevelObject::LevelObject()
+LevelObject::LevelObject(const std::string &fileName, const Vec3f &position, const Vec3f &rotation, const float &scale, const bool &hasCollision)
 {
+	model = Model::load(fileName);
+	this->position = position;
+	this->rotation = rotation;
+	this->scale = scale;
+	this->canCollide = hasCollision;
 }


 LevelObject::~LevelObject()
 {
+	if (model)
+		Model::unload(model);
 }