From 4913576c796b473892aa2d3e5d87f191fd0e915a Mon Sep 17 00:00:00 2001 From: rodri Date: Fri, 12 Jun 2020 20:02:35 +0000 Subject: correct the jail and its limits. --- main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/main.c b/main.c index 63aa648..1971e68 100644 --- a/main.c +++ b/main.c @@ -166,13 +166,13 @@ flockstep(Flock *f) f->cohesion(f); for(b = f->birds; b < f->birds + f->nbirds; b++){ b->p = addpt2(b->p, mulpt2(b->v, Δt)); - if(b->p.x < f->jail.min.x) + if(b->p.x < f->jail.min.x+BORDER) b->v.x += a.x; - if(b->p.y < f->jail.min.y) + if(b->p.y < f->jail.min.y+BORDER) b->v.y += a.y; - if(b->p.x > f->jail.max.x) + if(b->p.x > f->jail.max.x-BORDER) b->v.x -= a.x; - if(b->p.y > f->jail.max.y) + if(b->p.y > f->jail.max.y-BORDER) b->v.y -= a.y; } } @@ -180,7 +180,7 @@ flockstep(Flock *f) void resetflock(void) { - flock = newflock(nbirds, Rect(BORDER,BORDER,Dx(screen->r)-BORDER,Dy(screen->r)-BORDER)); + flock = newflock(nbirds, Rect(0,0,Dx(screen->r),Dy(screen->r))); } Point @@ -224,7 +224,7 @@ resized(void) sysfatal("resize failed"); unlockdisplay(display); worldrf.p = Pt2(screen->r.min.x,screen->r.max.y,1); - flock->jail = Rect(BORDER,BORDER,Dx(screen->r)-BORDER,Dy(screen->r)-BORDER); + flock->jail = Rect(0,0,Dx(screen->r),Dy(screen->r)); redraw(); } -- cgit v1.2.3