filipriec/pvs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usage of enums for frames

Browse Source
This commit is contained in:
Priec
2025-11-14 19:20:14 +01:00
parent 9170524d33
commit 8fa8bf392b
5 changed files with 52 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
semestralka1/src/render/loop.cpp
View File

@@ -86,16 +86,16 @@ static bool update_animation(Timer &anim_timer, int &shift, int speed) {
return false; return false;
} }
static int get_player_frame(PlayerState state) { static PlayerFrame get_player_frame(PlayerState state) {
switch (state) { switch (state) {
case PlayerState::Walk1: case PlayerState::Walk1:
return 0; return PlayerFrame::Walk1;
case PlayerState::Walk2: case PlayerState::Walk2:
return 1; return PlayerFrame::Walk2;
case PlayerState::Crawl1: case PlayerState::Crawl1:
return 2; return PlayerFrame::Crawl1;
default: default:
return 0; return PlayerFrame::Walk1;
} }
} }
@@ -157,8 +157,8 @@ void render_loop(int speed) {
if (need_redraw) { if (need_redraw) {
draw_mask(bg_file, shift, message_active ? message : nullptr); draw_mask(bg_file, shift, message_active ? message : nullptr);
int player_frame = get_player_frame(player_state.current_state); PlayerFrame player_frame = get_player_frame(player_state.current_state);
PlayerPosition draw_pos = get_aligned_frame_position(pos, player_frame); PlayerPosition draw_pos = get_aligned_frame_position(pos, static_cast<int>(player_frame));
draw_player(draw_pos.x, draw_pos.y, player_frame); draw_player(draw_pos.x, draw_pos.y, player_frame);
// alternate between frame 0 and 1 when not crawling // alternate between frame 0 and 1 when not crawling

34
semestralka1/src/render/player.cpp
View File

@@ -1,25 +1,33 @@
// src/render/player.cpp // src/render/player.cpp
#include "player.h" #include "player.h"
#include "player_mask.h" #include "player_mask.h"
#include <cstdio> #include <cstdio>
void draw_player(int x, int y, int frame_index) { void draw_player(int x, int y, PlayerFrame frame) {
int frame_index = static_cast<int>(frame);
if (frame_index < 0 || frame_index >= PLAYER_FRAME_COUNT) if (frame_index < 0 || frame_index >= PLAYER_FRAME_COUNT)
frame_index = 0; // fallback safety frame_index = 0; // fallback safety
const char **sprite = PLAYER_FRAMES[frame_index]; const char **character = PLAYER_FRAMES[frame_index];
int sprite_height = 0;
if (frame_index == 0)
sprite_height = PLAYER_MASK_LINES_FRAME_1;
else if (frame_index == 1)
sprite_height = PLAYER_MASK_LINES_FRAME_2;
else
sprite_height = PLAYER_MASK_LINES_FRAME_3;
// Draw the sprite starting from (x, y) int character_height = 0;
for (int i = 0; i < sprite_height; i++) { switch (frame) {
printf("\033[%d;%dH%s", y + i + 1, x + 1, sprite[i]); case PlayerFrame::Walk1:
character_height = PLAYER_MASK_LINES_FRAME_1;
break;
case PlayerFrame::Walk2:
character_height = PLAYER_MASK_LINES_FRAME_2;
break;
case PlayerFrame::Crawl1:
character_height = PLAYER_MASK_LINES_FRAME_3;
break;
default:
character_height = PLAYER_MASK_LINES_FRAME_1;
break;
}
for (int i = 0; i < character_height; i++) {
printf("\033[%d;%dH%s", y + i + 1, x + 1, character[i]);
} }
fflush(stdout); fflush(stdout);
} }

3
semestralka1/src/render/player.h
View File

@@ -1,5 +1,6 @@
// src/render/player.h // src/render/player.h
#pragma once #pragma once
#include "player_mask.h"
// Draw the player object starting at given (x, y) // Draw the player object starting at given (x, y)
void draw_player(int x, int y, int frame_index); void draw_player(int x, int y, PlayerFrame frame);

30
semestralka1/src/render/player_mask.h
View File

@@ -32,19 +32,23 @@ static const char *PLAYER_MASK_FRAME_3[] = {
"aa@W@." "aa@W@."
}; };
// Combine frames for easy access enum class PlayerFrame {
static const char **PLAYER_FRAMES[] = { Walk1 = 0,
PLAYER_MASK_FRAME_1, // 0 Walk2,
PLAYER_MASK_FRAME_2, // 1 Crawl1,
PLAYER_MASK_FRAME_3 // 2 (triggered) COUNT // number of frames, must stay last
}; };
static const int PLAYER_FRAME_COUNT = sizeof(PLAYER_FRAMES) / sizeof(PLAYER_FRAMES[0]); // Combine frames for easy access
static const char **PLAYER_FRAMES[] = {
PLAYER_MASK_FRAME_1, // Walk1
PLAYER_MASK_FRAME_2, // Walk1
PLAYER_MASK_FRAME_3 // Crawl1
};
// Line counts per frame static const int PLAYER_FRAME_COUNT = static_cast<int>(PlayerFrame::COUNT);
static const int PLAYER_MASK_LINES_FRAME_1 =
sizeof(PLAYER_MASK_FRAME_1) / sizeof(PLAYER_MASK_FRAME_1[0]); // Height per frame
static const int PLAYER_MASK_LINES_FRAME_2 = static const int PLAYER_MASK_LINES_FRAME_1 = sizeof(PLAYER_MASK_FRAME_1) / sizeof(PLAYER_MASK_FRAME_1[0]);
sizeof(PLAYER_MASK_FRAME_2) / sizeof(PLAYER_MASK_FRAME_2[0]); static const int PLAYER_MASK_LINES_FRAME_2 = sizeof(PLAYER_MASK_FRAME_2) / sizeof(PLAYER_MASK_FRAME_2[0]);
static const int PLAYER_MASK_LINES_FRAME_3 = static const int PLAYER_MASK_LINES_FRAME_3 = sizeof(PLAYER_MASK_FRAME_3) / sizeof(PLAYER_MASK_FRAME_3[0]);
sizeof(PLAYER_MASK_FRAME_3) / sizeof(PLAYER_MASK_FRAME_3[0]);

10
semestralka1/src/render/player_positioning.cpp
View File

@@ -8,17 +8,17 @@ PlayerPosition get_aligned_frame_position(PlayerPosition base, int frame_index)
if (frame_index < 0 || frame_index >= PLAYER_FRAME_COUNT) if (frame_index < 0 || frame_index >= PLAYER_FRAME_COUNT)
frame_index = 0; frame_index = 0;
int sprite_height = 0; int character_height = 0;
if (frame_index == 0) if (frame_index == 0)
sprite_height = PLAYER_MASK_LINES_FRAME_1; character_height = PLAYER_MASK_LINES_FRAME_1;
else if (frame_index == 1) else if (frame_index == 1)
sprite_height = PLAYER_MASK_LINES_FRAME_2; character_height = PLAYER_MASK_LINES_FRAME_2;
else else
sprite_height = PLAYER_MASK_LINES_FRAME_3; character_height = PLAYER_MASK_LINES_FRAME_3;
PlayerPosition draw_pos; PlayerPosition draw_pos;
draw_pos.x = base.x; draw_pos.x = base.x;
draw_pos.y = (VIEW_HEIGHT - base.y) - sprite_height; draw_pos.y = (VIEW_HEIGHT - base.y) - character_height;
return draw_pos; return draw_pos;
} }