From ef1f660f245ca7404fcffad69c026e2d2702a87d Mon Sep 17 00:00:00 2001 From: "Valeriano A.R" Date: Sat, 28 Jun 2014 19:58:17 +0200 Subject: [PATCH] Add margin to the bounding box --- GameLib/Draw.h | 1 - GameLib/Entity.c | 5 +++-- GameLib/Entity.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/GameLib/Draw.h b/GameLib/Draw.h index cb28b7f..cfbf2ae 100644 --- a/GameLib/Draw.h +++ b/GameLib/Draw.h @@ -64,7 +64,6 @@ void Draw_SetOffset(DrawImg img,int x,int y); void Draw_GetOffset(DrawImg img,int *x,int *y); - ///////////////////////////// // Draw_DrawImg // diff --git a/GameLib/Entity.c b/GameLib/Entity.c index 48d6255..35c8ecd 100644 --- a/GameLib/Entity.c +++ b/GameLib/Entity.c @@ -149,10 +149,11 @@ Entity Entity_Copy(Entity e){ // Entity_CalcBBox // // +#define BBox_ExtraMargin 10 #define max(a,b) ((a)>(b)?(a):(b)) void Entity_CalcBBox(Entity e){ - int hHeight=(max(e->height,e->radius)/2)+2; - int hWidth=(max(e->width,e->radius)/2)+2; + float hHeight=(max(e->height,e->radius)/2)+BBox_ExtraMargin; + float hWidth=(max(e->width,e->radius)/2)+BBox_ExtraMargin; if(e->vel[0]>0){ e->maxX=e->pos[0]+e->vel[0]+hWidth; e->minX=e->pos[0]-hWidth; diff --git a/GameLib/Entity.h b/GameLib/Entity.h index 87fbfd4..1b6e477 100644 --- a/GameLib/Entity.h +++ b/GameLib/Entity.h @@ -63,8 +63,8 @@ struct TEntity { int D; Entity child; - int maxX,minX; - int maxY,minY; + float maxX,minX; + float maxY,minY; Entity next; };