walkero
/
blobwarsAttrition
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Focus camera on doors, etc., that are opened when offscreen.

This commit is contained in:
Steve 2018-02-07 19:21:13 +00:00
parent 3afbfabeb5
commit b862123c95
4 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/world/camera.c
View File

@ -90,5 +90,10 @@ void clipCamera(void)
int isOnScreen(Entity *e)
{
return (e->x >= camera.x && e->y >= camera.y && e->x < camera.x + SCREEN_WIDTH && e->y < camera.y + SCREEN_HEIGHT);
int x, y;
x = (-camera.x + e->x);
y = (-camera.y + e->y);
return (x >= 0 && y >= 0 && x - e->w < SCREEN_WIDTH && y - e->h < SCREEN_HEIGHT);
}

2
src/world/entities.c
View File

@ -130,6 +130,8 @@ void doEntities(void)
self->tick();
self->observationTime = limit(self->observationTime - 1, 0, FPS * 5);
self->isOnGround = 0;
if (self->dy >= 0 && (!(self->flags & EF_WEIGHTLESS)))

44
src/world/world.c
View File

@ -36,6 +36,7 @@ static int canAdd(Unit *u, int mx, int my);
void startMission(void);
static Texture *background;
static int observationIndex;
void initWorld(void)
{
@ -61,6 +62,8 @@ void initWorld(void)
world.state = WS_START;
observationIndex = 0;
if (world.isBossMission)
{
startMission();
@ -79,6 +82,8 @@ void initWorld(void)
app.delegate.draw = draw;
startMission();
world.bob->y += MAP_TILE_SIZE * 4;
}
static void logic(void)
@ -225,9 +230,7 @@ static void doWorldInProgress(void)
if (world.observationTimer > 0)
{
world.observationTimer--;
if (world.observationTimer == FPS * 1.5)
if (--world.observationTimer == FPS * 1.5)
{
world.entityToTrack = world.entitiesToObserve[0];
@ -240,21 +243,32 @@ static void doWorldObserving(void)
{
int i;
world.observationTimer--;
cameraTrack(world.entityToTrack);
if (world.observationTimer == 0)
if (--world.observationTimer == 0)
{
for (i = 0 ; i < MAX_ENTS_TO_OBSERVE ; i++)
if (++observationIndex < MAX_ENTS_TO_OBSERVE && world.entitiesToObserve[observationIndex] != NULL)
{
if (world.entitiesToObserve[i])
{
world.entitiesToObserve[i]->observationTime = SDL_GetTicks() + 5000;
}
}
world.entityToTrack = world.entitiesToObserve[observationIndex];
memset(world.entitiesToObserve, 0, sizeof(Entity*) * MAX_ENTS_TO_OBSERVE);
world.entityToTrack = (Entity*)world.bob;
world.state = WS_IN_PROGRESS;
world.observationTimer = FPS * 1.5;
}
else
{
for (i = 0 ; i < MAX_ENTS_TO_OBSERVE ; i++)
{
if (world.entitiesToObserve[i] != NULL)
{
world.entitiesToObserve[i]->observationTime = FPS * 5;
}
}
memset(world.entitiesToObserve, 0, sizeof(Entity*) * MAX_ENTS_TO_OBSERVE);
world.entityToTrack = (Entity*)world.bob;
world.state = WS_IN_PROGRESS;
observationIndex = 0;
}
}
}
@ -497,7 +511,7 @@ void observeActivation(Entity *e)
{
int i;
if (e->observationTime < SDL_GetTicks() && !e->isVisible)
if (e->observationTime == 0 && !isOnScreen(e))
{
for (i = 0 ; i < MAX_ENTS_TO_OBSERVE ; i++)
{

1
src/world/world.h
View File

@ -60,6 +60,7 @@ extern void initEffects(void);
extern void drawParticles(int plane);
extern void initItems(void);
extern void doPlayer(void);
extern int isOnScreen(Entity *e);
extern App app;
extern Dev dev;