mirror of
https://gitlab.com/dosowisko.net/libsuperderpy.git
synced 2025-02-08 06:06:43 +01:00
update intro animations from Anna Karlik
This commit is contained in:
parent
4ffea03d70
commit
5065f49b5a
2 changed files with 11 additions and 7 deletions
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE QtCreatorProject>
|
||||
<!-- Written by Qt Creator 2.5.81, 2012-05-22T17:27:41. -->
|
||||
<!-- Written by Qt Creator 2.5.81, 2012-05-25T22:27:03. -->
|
||||
<qtcreator>
|
||||
<data>
|
||||
<variable>GenericProjectManager.GenericProject.Toolchain</variable>
|
||||
|
|
16
src/intro.c
16
src/intro.c
|
@ -27,8 +27,12 @@ void AnimPage(struct Game *game, int page, ALLEGRO_COLOR tint) {
|
|||
int offset = 0;
|
||||
if (game->intro.in_animation) offset = -1*al_get_display_width(game->display) + (cos(((-1*((game->intro.position)%al_get_display_width(game->display)))/(float)al_get_display_width(game->display))*(ALLEGRO_PI))/2.0)*al_get_display_width(game->display) + al_get_display_width(game->display)/2.0;
|
||||
|
||||
if (page<6) al_draw_tinted_bitmap_region(game->intro.animsprites[page-1],tint,al_get_display_width(game->display)*0.3125*(int)fmod(game->intro.anim,3),al_get_display_height(game->display)*0.63*(((int)(game->intro.anim/3))%3),al_get_display_width(game->display)*0.3125, al_get_display_height(game->display)*0.63,offset+al_get_display_width(game->display)*0.08, al_get_display_height(game->display)*0.18,0);
|
||||
if (page<5) al_draw_tinted_bitmap_region(game->intro.animsprites[page],tint,al_get_display_width(game->display)*0.3125*(int)fmod(game->intro.anim,3),al_get_display_height(game->display)*0.63*(((int)(game->intro.anim/3))%3),al_get_display_width(game->display)*0.3125, al_get_display_height(game->display)*0.63,offset+al_get_display_width(game->display)*1.08, al_get_display_height(game->display)*0.18,0);
|
||||
int amount1 = 2, amount2 = 2;
|
||||
if (page==3) amount1=3;
|
||||
if (page==2) amount2=3;
|
||||
|
||||
if (page<6) al_draw_tinted_bitmap_region(game->intro.animsprites[page-1],tint,al_get_display_width(game->display)*0.3125*(int)fmod(game->intro.anim,amount1),al_get_display_height(game->display)*0.63*(((int)(game->intro.anim/amount1))%amount1),al_get_display_width(game->display)*0.3125, al_get_display_height(game->display)*0.63,offset+al_get_display_width(game->display)*0.08, al_get_display_height(game->display)*0.18,0);
|
||||
if (page<5) al_draw_tinted_bitmap_region(game->intro.animsprites[page],tint,al_get_display_width(game->display)*0.3125*(int)fmod(game->intro.anim,amount2),al_get_display_height(game->display)*0.63*(((int)(game->intro.anim/amount2))%amount2),al_get_display_width(game->display)*0.3125, al_get_display_height(game->display)*0.63,offset+al_get_display_width(game->display)*1.08, al_get_display_height(game->display)*0.18,0);
|
||||
|
||||
game->intro.anim += tps(game, 2);
|
||||
}
|
||||
|
@ -210,15 +214,15 @@ void Intro_Preload(struct Game *game, void (*progress)(struct Game*, float)) {
|
|||
game->intro.in_animation = false;
|
||||
game->intro.anim = 0;
|
||||
|
||||
game->intro.animsprites[0] = LoadScaledBitmap("intro/1.png", (int)(al_get_display_width(game->display)*0.3125)*3, al_get_display_height(game->display)*0.63*3);
|
||||
game->intro.animsprites[0] = LoadScaledBitmap("intro/1.png", (int)(al_get_display_width(game->display)*0.3125)*2, al_get_display_height(game->display)*0.63*2);
|
||||
PROGRESS;
|
||||
game->intro.animsprites[1] = LoadScaledBitmap("levels/derpy/walk.png", (int)(al_get_display_width(game->display)*0.3125)*3, al_get_display_height(game->display)*0.63*3);
|
||||
game->intro.animsprites[1] = LoadScaledBitmap("levels/derpy/walk.png", (int)(al_get_display_width(game->display)*0.3125)*2, al_get_display_height(game->display)*0.63*2);
|
||||
PROGRESS;
|
||||
game->intro.animsprites[2] = LoadScaledBitmap("intro/3.png", (int)(al_get_display_width(game->display)*0.3125)*3, al_get_display_height(game->display)*0.63*3);
|
||||
PROGRESS;
|
||||
game->intro.animsprites[3] = LoadScaledBitmap("loading.png", (int)(al_get_display_width(game->display)*0.3125)*3, al_get_display_height(game->display)*0.63*3);
|
||||
game->intro.animsprites[3] = LoadScaledBitmap("intro/4.png", (int)(al_get_display_width(game->display)*0.3125)*2, al_get_display_height(game->display)*0.63*2);
|
||||
PROGRESS;
|
||||
game->intro.animsprites[4] = LoadScaledBitmap("about/letter.png", (int)(al_get_display_width(game->display)*0.3125)*3, al_get_display_height(game->display)*0.63*3);
|
||||
game->intro.animsprites[4] = LoadScaledBitmap("about/letter.png", (int)(al_get_display_width(game->display)*0.3125)*2, al_get_display_height(game->display)*0.63*2);
|
||||
PROGRESS;
|
||||
|
||||
game->intro.table_bitmap =LoadScaledBitmap("intro/paper.png", al_get_display_width(game->display), al_get_display_height(game->display));
|
||||
|
|
Loading…
Reference in a new issue