Fix issue #16

RogueMaster · Jul 27, 2023 · 545df87 · 545df87
1 parent 4c931fd
commit 545df87
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 103 deletions.
diff --git a/src-fap/views/camera_suite_view_camera.c b/src-fap/views/camera_suite_view_camera.c
@@ -28,7 +28,29 @@ void camera_suite_view_camera_set_callback(
     instance->context = context;
 }
 
-static void camera_suite_view_camera_draw(Canvas* canvas, UartDumpModel* model) {
+// Function to draw pixels on the canvas based on camera orientation
+static void draw_pixel_by_orientation(Canvas* canvas, uint8_t x, uint8_t y, uint8_t orientation) {
+    switch(orientation) {
+    case 0: // Camera rotated 0 degrees (right side up, default)
+        canvas_draw_dot(canvas, x, y);
+        break;
+    case 1: // Camera rotated 90 degrees
+        canvas_draw_dot(canvas, y, FRAME_WIDTH - 1 - x);
+        break;
+    case 2: // Camera rotated 180 degrees (upside down)
+        canvas_draw_dot(canvas, FRAME_WIDTH - 1 - x, FRAME_HEIGHT - 1 - y);
+        break;
+    case 3: // Camera rotated 270 degrees
+        canvas_draw_dot(canvas, FRAME_HEIGHT - 1 - y, x);
+        break;
+    default:
+        break;
+    }
+}
+
+static void camera_suite_view_camera_draw(Canvas* canvas, void* _model) {
+    UartDumpModel* model = _model;
+
     // Clear the screen.
     canvas_set_color(canvas, ColorBlack);
 
@@ -37,116 +59,17 @@ static void camera_suite_view_camera_draw(Canvas* canvas, UartDumpModel* model)
 
     CameraSuite* app = current_instance->context;
 
-    // Draw the pixels with rotation.
     for(size_t p = 0; p < FRAME_BUFFER_LENGTH; ++p) {
         uint8_t x = p % ROW_BUFFER_LENGTH; // 0 .. 15
         uint8_t y = p / ROW_BUFFER_LENGTH; // 0 .. 63
 
-        int16_t rotated_x, rotated_y;
-
-        // Apply rotation
-        switch(app->orientation) {
-        case 1: // 90 degrees
-            rotated_x = y;
-            rotated_y = FRAME_WIDTH - 1 - x;
-            break;
-        case 2: // 180 degrees
-            rotated_x = FRAME_WIDTH - 1 - x;
-            rotated_y = FRAME_HEIGHT - 1 - y;
-            break;
-        case 3: // 270 degrees
-            rotated_x = FRAME_HEIGHT - 1 - y;
-            rotated_y = x;
-            break;
-        case 0: // 0 degrees
-        default:
-            rotated_x = x;
-            rotated_y = y;
-            break;
-        }
-
         for(uint8_t i = 0; i < 8; ++i) {
             if((model->pixels[p] & (1 << (7 - i))) != 0) {
-                uint16_t screen_x, screen_y;
-                // Adjust the coordinates based on the new screen dimensions
-                switch(app->orientation) {
-                /**
-                 * Orientation: 90 degrees.
-                 * 
-                 * TODO: Fix bug here, the image has horizontal blocks going
-                 * across the screen. Fill entire screen. Example below:
-                 *  ___________________________
-                 *  |------------|            |
-                 *  |------------|            |
-                 *  |--PICTURE---|   Fill me  |
-                 *  |------------|            |
-                 *  |------------|            |
-                 *  ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
-                 */
-                case 1: {
-                    screen_x = rotated_x;
-                    screen_y = FRAME_HEIGHT - 8 + (rotated_y * 8) + i;
-                    break;
-                }
-                /**
-                 * Orientation: 180 degrees.
-                 * 
-                 * TODO: Fix bug here, the image has vertial blocks going up
-                 * the screen. Example below:
-                 *  ___________________________
-                 *  | | | | | | | | | | | | | |
-                 *  | | | | | | | | | | | | | |
-                 *  | | | |P|I|C|T|U|R|E| | | |
-                 *  | | | | | | | | | | | | | |
-                 *  | | | | | | | | | | | | | |
-                 *  ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
-                 */
-                case 2: {
-                    screen_x = FRAME_WIDTH - 8 + (rotated_x * 8) + i;
-                    screen_y = FRAME_HEIGHT - 1 - rotated_y;
-                    break;
-                }
-                /**
-                 * Orientation: 270 degrees.
-                 * 
-                 * This is working great visually.
-                 * TODO: Fill entire screen. Current:
-                 *  ___________________________
-                 *  |            |            |
-                 *  |            |            |
-                 *  |  Fill me   |   Picture  |
-                 *  |            |            |
-                 *  |            |            |
-                 *  ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
-                 */
-                case 3: {
-                    screen_x = FRAME_WIDTH - 1 - rotated_x;
-                    screen_y = rotated_y * 8 + i;
-                    break;
-                }
-                /** 
-                 * Orientation: 0 degrees (+default).
-                 * 
-                 * This is working great visually.
-                 *  ___________________________
-                 *  |                         |
-                 *  |                         |
-                 *  |         Picture         |
-                 *  |                         |
-                 *  |                         |
-                 *  ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
-                 */
-                case 0:
-                default: {
-                    screen_x = rotated_x * 8 + i;
-                    screen_y = rotated_y;
-                    break;
-                }
-                }
-                canvas_draw_dot(canvas, screen_x, screen_y);
+                draw_pixel_by_orientation(canvas, (x * 8) + i, y, app->orientation);
             }
         }
     }
+
     // Draw the guide if the camera is not initialized.
     if(!model->initialized) {
         canvas_draw_icon(canvas, 74, 16, &I_DolphinCommon_56x48);

diff --git a/src-fap/views/camera_suite_view_camera.h b/src-fap/views/camera_suite_view_camera.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#define FRAME_WIDTH 129
+#define FRAME_WIDTH 128
 #define FRAME_HEIGHT 64
 #define FRAME_BIT_DEPTH 1
 #define FRAME_BUFFER_LENGTH 1024