Avans/CrystalPoint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'developer' into feature/OpenAL

Browse Source 
# Conflicts:
#	CrystalPoint.vcxproj.filters
#	Enemy.cpp
#	Enemy.h
#	worlds/small.json
This commit is contained in:
Aaldert
2016-06-09 11:44:45 +02:00
parent 117010b9fe 593b9547cf
commit 5c24a34202
17 changed files with 2003 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Enemy.cpp
+8 -3
View File
@@ -59,9 +59,14 @@ void Enemy::inEyeSight(Vec3f & TargetPosition)
hasTarget = false;
}
bool Enemy::hasCollison(Vec3f &)
void Enemy::collide(const Entity * entity)
{
return false;
Vec3f difference = position - entity->position; //zou misschien omgedraait moeten worden
difference.y = 0;
difference.Normalize();
difference = difference * (entity->model->radius + 0.01f);
position.x = difference.x + entity->position.x;
position.z = difference.z + entity->position.z;
}
void Enemy::update(float delta)
@@ -76,7 +81,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;