@@ -80,7 +80,7 @@ void Enemy::update(float delta)
dz = target.z - position.z;
length = sqrt(dx*dx + dz*dz);
- if (length > 0.03)
+ if (length > 1)
{
dx /= length;
dz /= length;
@@ -6,6 +6,7 @@
#include "CrystalPoint.h"
#include <fstream>
#include <iostream>
+#include "WorldHandler.h"
World::World(const std::string &fileName)
@@ -181,6 +182,8 @@ void World::update(float elapsedTime)
}
+ WorldHandler* worldhandler = WorldHandler::getInstance();
+ enemy->position.y = worldhandler->getHeight(enemy->position.x, enemy->position.z) + 2.0f;
//tot hier
@@ -5,7 +5,7 @@
"color":100,
"file": "models/boom/Boom.obj",
- "collision": false
+ "collision": true
]
},
@@ -13,5 +13,11 @@
"startposition": [ 20, 5, 20 ]
"objects": [],
- "enemies": []
+ "enemies": [
+ {
+ "file": "models/squid/Blooper.obj",
+ "pos": [ 20, 5, 10 ],
+ "scale": 0.01
+ }
+ ]