revert part

Author: xMasterX

base_pack/air_arkanoid/engine/canvas.c

@@ -25,39 +25,4 @@ size_t canvas_printf_width(Canvas* canvas, const char* format, ...) {
     furi_string_free(string);
 
     return size;
-}
-
-void canvas_printf_aligned(
-    Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
-    Align h,
-    Align v,
-    const char* format,
-    ...) {
-    FuriString* string = furi_string_alloc();
-    va_list args;
-    va_start(args, format);
-    furi_string_vprintf(string, format, args);
-    va_end(args);
-
-    canvas_draw_str_aligned(canvas, x, y, h, v, furi_string_get_cstr(string));
-
-    furi_string_free(string);
-}
-
-void canvas_draw_str_aligned_outline(
-    Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
-    Align h,
-    Align v,
-    const char* cstr) {
-    canvas_invert_color(canvas);
-    canvas_draw_str_aligned(canvas, x + 1, y + 0, h, v, cstr);
-    canvas_draw_str_aligned(canvas, x - 1, y - 0, h, v, cstr);
-    canvas_draw_str_aligned(canvas, x + 0, y + 1, h, v, cstr);
-    canvas_draw_str_aligned(canvas, x - 0, y - 1, h, v, cstr);
-    canvas_invert_color(canvas);
-    canvas_draw_str_aligned(canvas, x, y, h, v, cstr);
 }

base_pack/air_arkanoid/engine/canvas.h

@@ -15,8 +15,7 @@ extern "C" {
  * @param format format string
  * @param ...  arguments
  */
-void canvas_printf(Canvas* canvas, uint8_t x, uint8_t y, const char* format, ...)
-    __attribute__((__format__(__printf__, 4, 5)));
+void canvas_printf(Canvas* canvas, uint8_t x, uint8_t y, const char* format, ...);
 
 /**
  * @brief Get width of formatted string
@@ -26,46 +25,7 @@ void canvas_printf(Canvas* canvas, uint8_t x, uint8_t y, const char* format, ...
  * @param ... arguments
  * @return size_t width of formatted string
  */
-size_t canvas_printf_width(Canvas* canvas, const char* format, ...)
-    __attribute__((__format__(__printf__, 2, 3)));
-
-/**
- * @brief Print formatted string to canvas with alignment
- * 
- * @param canvas canvas instance
- * @param x x position
- * @param y y position
- * @param h horizontal alignment
- * @param v vertical alignment
- * @param format format string
- * @param ... arguments
- */
-void canvas_printf_aligned(
-    Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
-    Align h,
-    Align v,
-    const char* format,
-    ...) __attribute__((__format__(__printf__, 6, 7)));
-
-/**
- * @brief Draw aligned string with outline
- * 
- * @param canvas 
- * @param x 
- * @param y 
- * @param h 
- * @param v 
- * @param cstr 
- */
-void canvas_draw_str_aligned_outline(
-    Canvas* canvas,
-    uint8_t x,
-    uint8_t y,
-    Align h,
-    Align v,
-    const char* cstr);
+size_t canvas_printf_width(Canvas* canvas, const char* format, ...);
 
 #ifdef __cplusplus
 }

base_pack/air_arkanoid/engine/entity.c

@@ -2,7 +2,6 @@
 #include "entity_i.h"
 #include <stdlib.h>
 #include <furi.h>
-#include <math.h>
 
 #ifdef ENTITY_DEBUG
 #define ENTITY_D(...) FURI_LOG_D("Entity", __VA_ARGS__)
@@ -135,8 +134,10 @@ bool entity_collider_circle_circle(Entity* entity, Entity* other) {
     Vector pos1 = entity_collider_position_get(entity);
     Vector pos2 = entity_collider_position_get(other);
 
-    Vector delta = vector_sub(pos1, pos2);
-    return vector_length(delta) < entity->collider->circle.radius + other->collider->circle.radius;
+    float dx = pos1.x - pos2.x;
+    float dy = pos1.y - pos2.y;
+    float distance = sqrtf(dx * dx + dy * dy);
+    return distance < entity->collider->circle.radius + other->collider->circle.radius;
 }
 
 bool entity_collider_rect_rect(Entity* entity, Entity* other) {

base_pack/air_arkanoid/engine/game_engine.c

@@ -1,18 +1,12 @@
 #include "game_engine.h"
 #include <furi.h>
-#include <furi_hal_rtc.h>
 #include <gui/gui.h>
 #include <input/input.h>
 #include <notification/notification_messages.h>
 #include "clock_timer.h"
 
 typedef _Atomic uint32_t AtomicUint32;
 
-typedef struct {
-    bool lefty;
-    AtomicUint32 state;
-} InputHolder;
-
 GameEngineSettings game_engine_settings_init() {
     GameEngineSettings settings;
     settings.target_fps = 30.0f;
@@ -67,7 +61,7 @@ static void clock_timer_callback(void* context) {
     furi_thread_flags_set(engine->thread_id, GameThreadFlagUpdate);
 }
 
-static const GameKey keys_right_hand[] = {
+static const GameKey keys[] = {
     [InputKeyUp] = GameKeyUp,
     [InputKeyDown] = GameKeyDown,
     [InputKeyRight] = GameKeyRight,
@@ -76,32 +70,19 @@ static const GameKey keys_right_hand[] = {
     [InputKeyBack] = GameKeyBack,
 };
 
-static const GameKey keys_left_hand[] = {
-    [InputKeyUp] = GameKeyDown,
-    [InputKeyDown] = GameKeyUp,
-    [InputKeyRight] = GameKeyLeft,
-    [InputKeyLeft] = GameKeyRight,
-    [InputKeyOk] = GameKeyOk,
-    [InputKeyBack] = GameKeyBack,
-};
-static_assert(
-    sizeof(keys_right_hand) == sizeof(keys_left_hand),
-    "keys_right_hand and keys_left_hand do not match!");
-
-static const size_t keys_count = sizeof(keys_right_hand) / sizeof(keys_right_hand[0]);
+static const size_t keys_count = sizeof(keys) / sizeof(keys[0]);
 
 static void input_events_callback(const void* value, void* context) {
-    InputHolder* holder = context;
+    AtomicUint32* input_state = context;
     const InputEvent* event = value;
-    const GameKey* keys = holder->lefty ? keys_left_hand : keys_right_hand;
 
     if(event->key < keys_count) {
         switch(event->type) {
         case InputTypePress:
-            holder->state |= (keys[event->key]);
+            *input_state |= (keys[event->key]);
             break;
         case InputTypeRelease:
-            holder->state &= ~(keys[event->key]);
+            *input_state &= ~(keys[event->key]);
             break;
         default:
             break;
@@ -111,10 +92,7 @@ static void input_events_callback(const void* value, void* context) {
 
 void game_engine_run(GameEngine* engine) {
     // input state
-    InputHolder input_state = {
-        .lefty = furi_hal_rtc_is_flag_set(FuriHalRtcFlagHandOrient),
-        .state = 0,
-    };
+    AtomicUint32 input_state = 0;
     uint32_t input_prev_state = 0;
 
     // set backlight if needed
@@ -152,7 +130,7 @@ void game_engine_run(GameEngine* engine) {
             time_start = time_end;
 
             // update input state
-            uint32_t input_current_state = input_state.state;
+            uint32_t input_current_state = input_state;
             InputState input = {
                 .held = input_current_state,
                 .pressed = input_current_state & ~input_prev_state,
@@ -172,7 +150,7 @@ void game_engine_run(GameEngine* engine) {
             // show fps if needed
             if(engine->settings.show_fps) {
                 canvas_set_color(canvas, ColorXOR);
-                canvas_printf(canvas, 0, 7, "%lu", (uint32_t)roundf(engine->fps));
+                canvas_printf(canvas, 0, 7, "%u", (uint32_t)roundf(engine->fps));
             }
 
             // and output screen buffer

base_pack/air_arkanoid/engine/game_manager.c

@@ -159,16 +159,4 @@ Sprite* game_manager_sprite_load(GameManager* manager, const char* path) {
     furi_string_free(path_full);
 
     return sprite;
-}
-
-Level* game_manager_entity_level_get(GameManager* manager, Entity* entity) {
-    LevelList_it_t it;
-    LevelList_it(it, manager->levels);
-    while(!LevelList_end_p(it)) {
-        if(level_contains_entity(*LevelList_cref(it), entity)) {
-            return *LevelList_cref(it);
-        }
-        LevelList_next(it);
-    }
-    return NULL;
 }

base_pack/air_arkanoid/engine/game_manager.h

@@ -13,27 +13,8 @@ Level* game_manager_add_level(GameManager* manager, const LevelBehaviour* behavi
 
 void game_manager_next_level_set(GameManager* manager, Level* level);
 
-/**
- * @brief Get the current level
- * @warning This function returns current level, but in entity start or stop callbacks, the level may be different from entity's level.
- * For example, if an entity is added to a level_game and you currently are in level_pause, this function will return level_pause.
- * Use game_manager_entity_level_get to get the entity's level, or save the level pointer somewhere.
- * 
- * @param manager game manager instance
- * @return Level* level instance
- */
 Level* game_manager_current_level_get(GameManager* manager);
 
-/**
- * @brief Get the level of an entity
- * @warning This function is kinda slow, use it only when other methods are not possible
- * 
- * @param manager 
- * @param entity 
- * @return Level* 
- */
-Level* game_manager_entity_level_get(GameManager* manager, Entity* entity);
-
 GameEngine* game_manager_engine_get(GameManager* manager);
 
 InputState game_manager_input_get(GameManager* manager);