mirror of
https://github.com/DarkFlippers/unleashed-firmware
synced 2024-11-27 06:50:21 +00:00
Merge pull request #149 from an4tur0r/feature/flappy_assets
Flappy Bird: draw bird via icon animation
This commit is contained in:
commit
8ea0178a0d
7 changed files with 23 additions and 78 deletions
|
@ -9,4 +9,5 @@ App(
|
|||
order=100,
|
||||
fap_icon="flappy_10px.png",
|
||||
fap_category="Games",
|
||||
fap_icon_assets="assets",
|
||||
)
|
||||
|
|
BIN
applications/plugins/flappy_bird/assets/bird/frame_01.png
Normal file
BIN
applications/plugins/flappy_bird/assets/bird/frame_01.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 113 B |
BIN
applications/plugins/flappy_bird/assets/bird/frame_02.png
Normal file
BIN
applications/plugins/flappy_bird/assets/bird/frame_02.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 116 B |
BIN
applications/plugins/flappy_bird/assets/bird/frame_03.png
Normal file
BIN
applications/plugins/flappy_bird/assets/bird/frame_03.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 116 B |
1
applications/plugins/flappy_bird/assets/bird/frame_rate
Normal file
1
applications/plugins/flappy_bird/assets/bird/frame_rate
Normal file
|
@ -0,0 +1 @@
|
|||
3
|
|
@ -1,54 +0,0 @@
|
|||
#include <furi.h>
|
||||
|
||||
uint8_t bird_array[3][15][11] = {
|
||||
{
|
||||
{0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0},
|
||||
{0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0},
|
||||
{0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0},
|
||||
{0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 0},
|
||||
{0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0},
|
||||
{0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 1},
|
||||
{1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1},
|
||||
{1, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1},
|
||||
{1, 1, 0, 0, 0, 0, 1, 0, 1, 0, 1},
|
||||
{1, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0},
|
||||
{1, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0},
|
||||
{0, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0},
|
||||
{0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0},
|
||||
{0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0},
|
||||
{0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0},
|
||||
},
|
||||
{
|
||||
{0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0},
|
||||
{0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0},
|
||||
{0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0},
|
||||
{0, 0, 1, 1, 1, 0, 0, 0, 1, 0, 0},
|
||||
{0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0},
|
||||
{0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1},
|
||||
{1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1},
|
||||
{1, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1},
|
||||
{1, 1, 0, 0, 0, 0, 1, 0, 1, 0, 1},
|
||||
{1, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0},
|
||||
{1, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0},
|
||||
{0, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0},
|
||||
{0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0},
|
||||
{0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0},
|
||||
{0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0},
|
||||
},
|
||||
{
|
||||
{0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0},
|
||||
{0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0},
|
||||
{0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0},
|
||||
{0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0},
|
||||
{0, 1, 0, 1, 0, 0, 0, 1, 0, 1, 0},
|
||||
{0, 1, 0, 0, 1, 0, 1, 0, 0, 0, 1},
|
||||
{1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1},
|
||||
{1, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1},
|
||||
{1, 1, 0, 0, 0, 0, 1, 0, 1, 0, 1},
|
||||
{1, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0},
|
||||
{1, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0},
|
||||
{0, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0},
|
||||
{0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0},
|
||||
{0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0},
|
||||
{0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0},
|
||||
}};
|
|
@ -1,9 +1,10 @@
|
|||
#include <furi.h>
|
||||
#include <gui/gui.h>
|
||||
#include <input/input.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "bird.h"
|
||||
#include <FlappyBird_icons.h>
|
||||
#include <furi.h>
|
||||
#include <gui/gui.h>
|
||||
#include <gui/icon_animation_i.h>
|
||||
#include <input/input.h>
|
||||
|
||||
#define TAG "Flappy"
|
||||
#define DEBUG false
|
||||
|
@ -36,6 +37,7 @@ typedef struct {
|
|||
typedef struct {
|
||||
float gravity;
|
||||
POINT point;
|
||||
IconAnimation* sprite;
|
||||
} BIRD;
|
||||
|
||||
typedef struct {
|
||||
|
@ -89,6 +91,7 @@ static void flappy_game_state_init(GameState* const game_state) {
|
|||
bird.gravity = 0.0f;
|
||||
bird.point.x = 15;
|
||||
bird.point.y = 32;
|
||||
bird.sprite = icon_animation_alloc(&A_bird);
|
||||
|
||||
game_state->debug = DEBUG;
|
||||
game_state->bird = bird;
|
||||
|
@ -100,6 +103,11 @@ static void flappy_game_state_init(GameState* const game_state) {
|
|||
flappy_game_random_pilar(game_state);
|
||||
}
|
||||
|
||||
static void flappy_game_state_free(GameState* const game_state) {
|
||||
icon_animation_free(game_state->bird.sprite);
|
||||
free(game_state);
|
||||
}
|
||||
|
||||
static void flappy_game_tick(GameState* const game_state) {
|
||||
if(game_state->state == GameStateLife) {
|
||||
if(!game_state->debug) {
|
||||
|
@ -213,27 +221,16 @@ static void flappy_game_render_callback(Canvas* const canvas, void* ctx) {
|
|||
FLIPPER_LCD_HEIGHT - pilar->height - FLAPPY_GAB_HEIGHT);
|
||||
}
|
||||
}
|
||||
// Flappy
|
||||
for(int h = 0; h < FLAPPY_BIRD_HEIGHT; h++) {
|
||||
for(int w = 0; w < FLAPPY_BIRD_WIDTH; w++) {
|
||||
|
||||
// Switch animation
|
||||
int bird = 1;
|
||||
game_state->bird.sprite->frame = 1;
|
||||
if(game_state->bird.gravity < -0.5)
|
||||
bird = 0;
|
||||
game_state->bird.sprite->frame = 0;
|
||||
else if(game_state->bird.gravity > 0.5)
|
||||
bird = 2;
|
||||
game_state->bird.sprite->frame = 2;
|
||||
|
||||
// Draw bird pixels
|
||||
if(bird_array[bird][h][w] == 1) {
|
||||
int x = game_state->bird.point.x + h;
|
||||
int y = game_state->bird.point.y + w;
|
||||
|
||||
canvas_draw_dot(canvas, x, y);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Stats
|
||||
canvas_draw_icon_animation(
|
||||
canvas, game_state->bird.point.x, game_state->bird.point.y, game_state->bird.sprite);
|
||||
|
||||
canvas_set_font(canvas, FontSecondary);
|
||||
char buffer[12];
|
||||
|
@ -366,7 +363,7 @@ int32_t flappy_game_app(void* p) {
|
|||
delete_mutex(&state_mutex);
|
||||
|
||||
free_and_exit:
|
||||
free(game_state);
|
||||
flappy_game_state_free(game_state);
|
||||
furi_message_queue_free(event_queue);
|
||||
|
||||
return return_code;
|
||||
|
|
Loading…
Reference in a new issue