From 9e35115be8950e2891232027aaf4bef7be44ace2 Mon Sep 17 00:00:00 2001 From: Elizabeth Hunt Date: Fri, 24 Nov 2023 18:19:30 -0700 Subject: [PATCH] rm old camera --- inc/camera.hpp | 14 -------------- src/camera.cpp | 3 --- src/main.cpp | 21 +++++++++++++++++++-- 3 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 inc/camera.hpp delete mode 100644 src/camera.cpp diff --git a/inc/camera.hpp b/inc/camera.hpp deleted file mode 100644 index 56dd89b..0000000 --- a/inc/camera.hpp +++ /dev/null @@ -1,14 +0,0 @@ -#include - -#ifndef CAMERA_HPP -#define CAMERA_HPP - -class Camera { -private: - std::uint32_t m_pos; - -public: - Camera(); -}; - -#endif diff --git a/src/camera.cpp b/src/camera.cpp deleted file mode 100644 index e77b881..0000000 --- a/src/camera.cpp +++ /dev/null @@ -1,3 +0,0 @@ -#include "Camera.hpp" - -Camera::Camera() : m_pos(0) {} diff --git a/src/main.cpp b/src/main.cpp index 24a5e01..f147f2f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,13 +1,30 @@ -#include "Camera.hpp" +#include "palette.hpp" +#include "vector.hpp" #include int main() { + // interrupt & mode 4 foo irq_init(NULL); irq_enable(II_VBLANK); + REG_DISPCNT = DCNT_MODE4 | DCNT_BG2; - REG_DISPCNT = DCNT_MODE4; + // initialize our palette + palette::put_palette((std::uint16_t *)MEM_PAL); + // begin + bmp16_line(1, 3, 1 + SCREEN_WIDTH / 2 - 2, SCREEN_HEIGHT, 0x0101, vid_page, + SCREEN_WIDTH); + vid_flip(); + bmp16_line(2, 3, 2 + SCREEN_WIDTH / 2 - 2, SCREEN_HEIGHT, 0x0101, vid_page, + SCREEN_WIDTH); + + std::uint32_t frame = 0; while (1) { + frame = (frame + 1) % 60; + if (frame == 0) { + vid_flip(); + } + VBlankIntrWait(); } }