Compare commits
No commits in common. "9e151e2f3f837081a5d3a3fb48310665cecb4aca" and "472a16dd2e20f4d8a3b817a1fc99d90fcb47c5fb" have entirely different histories.
9e151e2f3f
...
472a16dd2e
|
|
@ -23,15 +23,15 @@ void camera_update(void)
|
||||||
{
|
{
|
||||||
if(game.camera.tracking_pos)
|
if(game.camera.tracking_pos)
|
||||||
{
|
{
|
||||||
game.camera.view_rect.x = (int)game.camera.tracking_pos->x + game.camera.tracking_center_offset.x - game.camera.view_rect.w / 2;
|
game.camera.view_rect.x = game.camera.tracking_pos->x + game.camera.tracking_center_offset.x - game.camera.view_rect.w / 2;
|
||||||
game.camera.view_rect.y = (int)game.camera.tracking_pos->y + game.camera.tracking_center_offset.y - game.camera.view_rect.h / 2;
|
game.camera.view_rect.y = game.camera.tracking_pos->y + game.camera.tracking_center_offset.y - game.camera.view_rect.h / 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(game.map)
|
if(game.map)
|
||||||
{
|
{
|
||||||
if(game.camera.view_rect.w > game.map->width * TILE_SIZE)
|
if(game.camera.view_rect.w > game.map->width * TILE_SIZE)
|
||||||
{
|
{
|
||||||
game.camera.view_rect.x = (game.map->width * TILE_SIZE - game.camera.view_rect.w) / 2;
|
game.camera.view_rect.x = game.map->width * TILE_SIZE / 2 - game.camera.view_rect.w / 2;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
@ -47,7 +47,7 @@ void camera_update(void)
|
||||||
|
|
||||||
if(game.camera.view_rect.h > game.map->height * TILE_SIZE)
|
if(game.camera.view_rect.h > game.map->height * TILE_SIZE)
|
||||||
{
|
{
|
||||||
game.camera.view_rect.y = (game.map->height * TILE_SIZE - game.camera.view_rect.h) / 2;
|
game.camera.view_rect.y = game.map->height * TILE_SIZE / 2 - game.camera.view_rect.h / 2;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,7 @@ inline int display_init(void)
|
||||||
return EXIT_FAILURE;
|
return EXIT_FAILURE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!SDL_SetRenderVSync(game.display.renderer, 1))
|
if(!SDL_SetRenderVSync(game.display.renderer, SDL_RENDERER_VSYNC_ADAPTIVE))
|
||||||
{
|
{
|
||||||
error_printf("Failed to activate adaptative vsync : %s", SDL_GetError());
|
error_printf("Failed to activate adaptative vsync : %s", SDL_GetError());
|
||||||
return EXIT_FAILURE;
|
return EXIT_FAILURE;
|
||||||
|
|
|
||||||
|
|
@ -54,13 +54,6 @@ texture_t *load_texture(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
SDL_DestroySurface(tmp_surface);
|
SDL_DestroySurface(tmp_surface);
|
||||||
|
|
||||||
if(!SDL_SetTextureScaleMode(texture, SDL_SCALEMODE_NEAREST))
|
|
||||||
{
|
|
||||||
error_printf("Failed to set texture scale mode.");
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
return texture;
|
return texture;
|
||||||
|
|
||||||
failure:
|
failure:
|
||||||
|
|
|
||||||
|
|
@ -46,13 +46,13 @@ inline int display_init(void)
|
||||||
error_printf("Failed to create renderer : %s", SDL_GetError());
|
error_printf("Failed to create renderer : %s", SDL_GetError());
|
||||||
return EXIT_FAILURE;
|
return EXIT_FAILURE;
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
if(!SDL_SetRenderVSync(game.display.renderer, 1))
|
if(!SDL_SetRenderVSync(game.display.renderer, SDL_RENDERER_VSYNC_ADAPTIVE))
|
||||||
{
|
{
|
||||||
error_printf("Failed to activate adaptative vsync : %s", SDL_GetError());
|
error_printf("Failed to activate adaptative vsync : %s", SDL_GetError());
|
||||||
return EXIT_FAILURE;
|
return EXIT_FAILURE;
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
if(!SDL_SetRenderDrawBlendMode(game.display.renderer, SDL_BLENDMODE_BLEND))
|
if(!SDL_SetRenderDrawBlendMode(game.display.renderer, SDL_BLENDMODE_BLEND))
|
||||||
{
|
{
|
||||||
error_printf("Failed to set renderer draw blend mode : %s", SDL_GetError());
|
error_printf("Failed to set renderer draw blend mode : %s", SDL_GetError());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue