Added world loading and other various improvements

2016-05-25 22:29:18 +02:00
parent 33a61ca2ed
commit 908786897f
23 changed files with 506 additions and 280 deletions
@@ -9,14 +9,13 @@
 Enemy::Enemy(const std::string &fileName,
 	const Vec3f &position,
 	Vec3f &rotation,
-	const float &scale,
-	const bool &hasCollision)
+	const float &scale)
 {
 	model = Model::load(fileName);
 	this->position = position;
 	this->rotation = rotation;
 	this->scale = scale;
-	this->canCollide = hasCollision;
+	this->canCollide = true;
 	target = position;
 	speed = 1;
 	radius = 10;