unified speed properly

This commit is contained in:
Filipriec
2025-12-11 16:25:12 +01:00
parent 42d07e9715
commit 50f523b52d
4 changed files with 18 additions and 13 deletions

View File

@@ -27,16 +27,20 @@ constexpr int STACK_SIZE = 4096;
Thread logic_thread(osPriorityNormal, STACK_SIZE);
Thread render_thread(osPriorityNormal, STACK_SIZE);
void logic_loop() {
void logic_loop(void *arg) {
int speed = *(int *)arg;
MovementState player_state;
AnimationController animation;
ButtonHandler button;
MovementController mover(PLAYER_X, VIEW_WIDTH);
SpeedController timing;
timing.set_ground_speed(6);
timing.set_ground_speed(speed);
CharacterPosition pos = {PLAYER_X, PLAYER_Y};
player_state.set_state(PlayerState::Walk);
if (speed < 3)
player_state.set_state(PlayerState::Run);
else
player_state.set_state(PlayerState::Walk);
Timer spawn_timer;
spawn_timer.start();
@@ -51,11 +55,11 @@ void logic_loop() {
while (!game_over) {
tick_counter++;
mover.update_position(6, timing.get_ground_speed());
mover.update_position(speed, timing.get_ground_speed());
pos.x = mover.get_position();
// Spawn periodically
if (spawn_timer.elapsed_time() > 2s) {
if (spawn_timer.elapsed_time() > 5s) {
spawn_timer.reset();
spawn_obstacle(CrawlObstacleType::Crawl1, VIEW_WIDTH);
}
@@ -71,7 +75,7 @@ void logic_loop() {
player_state.update();
bool anim_tick = animation.tick(6);
bool anim_tick = animation.tick(speed);
if (anim_tick) {
anim_tick_counter++;
// move obstacles
@@ -84,7 +88,7 @@ void logic_loop() {
}
}
player_state.toggle_walk_frame(6, anim_tick_counter);
player_state.toggle_walk_frame(speed, anim_tick_counter);
FrameSelection frame = player_state.get_frame_selection();
CharacterPosition draw_pos =
get_aligned_frame_position(pos, frame.movement, frame.frame_index);
@@ -166,9 +170,13 @@ void render_loop(int speed) {
g_state.game_over = false;
g_state_mutex.unlock();
logic_thread.start(logic_loop);
int *speed_ptr = new int(speed);
logic_thread.start(callback(logic_loop, (void *)speed_ptr));
render_thread.start(render_loop_thread);
logic_thread.join();
render_thread.join();
delete speed_ptr;
}