From dbccd866229a4b06d10fbafc3eb3343015caedba Mon Sep 17 00:00:00 2001 From: Elizabeth Hunt Date: Sun, 26 Nov 2023 16:09:41 -0700 Subject: checkpoint --- src/main.cpp | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index f147f2f..0c91536 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,29 +1,33 @@ +#include "cube.hpp" #include "palette.hpp" +#include "renderable.hpp" +#include "scene.hpp" #include "vector.hpp" #include +class Box : public Renderable { +public: + virtual void render(std::shared_ptr scene) { + scene->draw_line({0, 0}, {2 << FIX_SHIFT, 3 << FIX_SHIFT}, 1); + } +}; + int main() { // interrupt & mode 4 foo irq_init(NULL); irq_enable(II_VBLANK); REG_DISPCNT = DCNT_MODE4 | DCNT_BG2; - - // 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); + auto scene = std::make_shared(); + // auto cube = std::shared_ptr((Renderable *)new Cube()); + // scene->renderables.add(cube); + auto box = std::shared_ptr((Renderable *)new Box()); + + scene->renderables.add(box); - std::uint32_t frame = 0; while (1) { - frame = (frame + 1) % 60; - if (frame == 0) { - vid_flip(); - } + Scene::render(scene); VBlankIntrWait(); } -- cgit v1.2.3-70-g09d2 From 1b96b0211ed98afba515f0ac9880116f79ead2e5 Mon Sep 17 00:00:00 2001 From: Elizabeth Hunt Date: Tue, 28 Nov 2023 13:58:18 -0700 Subject: render the front face of a cube --- inc/scene.hpp | 4 ++-- src/main.cpp | 20 +++++++++----------- src/model_instance.cpp | 17 +++++++++-------- src/scene.cpp | 16 +++++++--------- 4 files changed, 27 insertions(+), 30 deletions(-) (limited to 'src/main.cpp') diff --git a/inc/scene.hpp b/inc/scene.hpp index 05cdac0..6dd4c35 100644 --- a/inc/scene.hpp +++ b/inc/scene.hpp @@ -10,9 +10,9 @@ class Scene { public: usu::vector> renderables; - std::tuple + std::tuple viewport_dimension; // - std::tuple scene_dimension; + std::tuple scene_dimension; VECTOR directional_light; FIXED z_plane; diff --git a/src/main.cpp b/src/main.cpp index 0c91536..c08b584 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -5,13 +5,6 @@ #include "vector.hpp" #include -class Box : public Renderable { -public: - virtual void render(std::shared_ptr scene) { - scene->draw_line({0, 0}, {2 << FIX_SHIFT, 3 << FIX_SHIFT}, 1); - } -}; - int main() { // interrupt & mode 4 foo irq_init(NULL); @@ -20,14 +13,19 @@ int main() { palette::put_palette((std::uint16_t *)MEM_PAL); auto scene = std::make_shared(); - // auto cube = std::shared_ptr((Renderable *)new Cube()); - // scene->renderables.add(cube); - auto box = std::shared_ptr((Renderable *)new Box()); - scene->renderables.add(box); + auto cube = std::shared_ptr((Mesh *)new Cube); + + ModelInstance modelInstance(cube, int2fx(2), {0x0C7F, 0x0000, 0}, + {int2fx(0), 0, int2fx(0)}); + + auto modelInstancePtr = std::shared_ptr(&modelInstance); + scene->renderables.add(modelInstancePtr); while (1) { + Scene::render(scene); + vid_flip(); VBlankIntrWait(); } diff --git a/src/model_instance.cpp b/src/model_instance.cpp index 65ed6a8..61204ff 100644 --- a/src/model_instance.cpp +++ b/src/model_instance.cpp @@ -9,11 +9,12 @@ ModelInstance::ModelInstance(std::shared_ptr mesh, FIXED scale, VECTOR rotate(VECTOR v, VECTOR rot) { FIXED sin_theta_x, sin_theta_y, sin_theta_z; FIXED cos_theta_x, cos_theta_y, cos_theta_z; + VECTOR res = {v.x, v.y, v.z}; if (rot.x != 0) { - sin_theta_x = lu_sin(rot.x) >> 4; - cos_theta_x = lu_cos(rot.x) >> 4; + sin_theta_x = float2fx(0.707); // lu_sin(rot.x) >> 4; + cos_theta_x = float2fx(0.707); // lu_cos(rot.x) >> 4; res.y = fxmul(res.y, cos_theta_x) - fxmul(res.z, sin_theta_x); res.z = fxmul(res.z, cos_theta_x) + fxmul(res.y, sin_theta_x); } @@ -36,14 +37,14 @@ VECTOR rotate(VECTOR v, VECTOR rot) { } void ModelInstance::render(std::shared_ptr scene_context) { - usu::vector transformed(m_mesh->vertices.size()); - usu::vector projected(transformed.size()); + usu::vector projected(m_mesh->vertices.size()); - for (std::uint32_t i = 0; i < transformed.size(); i++) { - VECTOR rotated = rotate(m_mesh->vertices[i], m_rot); - vec_add(&transformed[i], &rotated, &m_pos); + for (std::uint32_t i = 0; i < projected.size(); i++) { + VECTOR transformed = + m_mesh->vertices[i]; // rotate(m_mesh->vertices[i], m_rot); + // vec_add(&transformed, &transformed, &m_pos); - projected[i] = scene_context->project_2d(m_mesh->vertices[i]); + projected[i] = scene_context->project_2d(transformed); } for (const TRIANGLE triangle : m_mesh->triangles) { diff --git a/src/scene.cpp b/src/scene.cpp index f69398d..44e7028 100644 --- a/src/scene.cpp +++ b/src/scene.cpp @@ -2,7 +2,7 @@ Scene::Scene() { directional_light = {0, 0, -1}; - viewport_dimension = {2, 3}; + viewport_dimension = {3, 2}; scene_dimension = {SCREEN_WIDTH / 2, SCREEN_HEIGHT}; z_plane = int2fx(1); @@ -21,13 +21,11 @@ POINT Scene::project_2d(VECTOR vertex) { } POINT Scene::viewport_to_scene(POINT p) { - FIXED x = fxmul( - p.x, (std::get<0>(scene_dimension) / std::get<0>(viewport_dimension)) - << FIX_SHIFT); - FIXED y = fxmul( - p.y, (std::get<1>(scene_dimension) / std::get<1>(viewport_dimension)) - << FIX_SHIFT); - return {x, y}; + FIXED x = fxmul(p.x, int2fx(std::get<0>(scene_dimension) / + std::get<0>(viewport_dimension))); + FIXED y = fxmul(p.y, int2fx(std::get<1>(scene_dimension) / + std::get<1>(viewport_dimension))); + return {x >> FIX_SHIFT, y >> FIX_SHIFT}; } void Scene::draw_line(POINT p0, POINT p1, std::uint8_t pal_idx) { @@ -36,5 +34,5 @@ void Scene::draw_line(POINT p0, POINT p1, std::uint8_t pal_idx) { std::uint16_t pixels = (pal_idx << 8) | pal_idx; bmp16_line(scene_p0.x, scene_p0.y, scene_p1.x, scene_p1.y, pixels, vid_page, - M4_WIDTH); + SCREEN_WIDTH); } -- cgit v1.2.3-70-g09d2 From 3197f9e40cd7079e19990c64c98de667e2457d75 Mon Sep 17 00:00:00 2001 From: Elizabeth Hunt Date: Tue, 28 Nov 2023 14:39:20 -0700 Subject: draw the whole cube --- inc/model_instance.hpp | 1 + src/cube.cpp | 8 ++++++-- src/main.cpp | 19 ++++++++++++------- src/model_instance.cpp | 7 ++++--- 4 files changed, 23 insertions(+), 12 deletions(-) (limited to 'src/main.cpp') diff --git a/inc/model_instance.hpp b/inc/model_instance.hpp index 997e9a6..8126278 100644 --- a/inc/model_instance.hpp +++ b/inc/model_instance.hpp @@ -16,6 +16,7 @@ private: public: ModelInstance(std::shared_ptr mesh, FIXED scale, VECTOR m_rotation, VECTOR m_pos); + void add_pos(VECTOR d_pos); virtual void render(std::shared_ptr scene_context); }; diff --git a/src/cube.cpp b/src/cube.cpp index c181794..60422a2 100644 --- a/src/cube.cpp +++ b/src/cube.cpp @@ -1,8 +1,12 @@ #include "cube.hpp" Cube::Cube() { - for (std::uint8_t i = 0; i < 8; ++i) - vertices.add({(i >> 2) & 1, (i >> 1) & 1, i & 1}); + for (std::uint8_t i = 0; i < 8; ++i) { + VECTOR vertex = {int2fx((((i >> 2) & 1) << 1) - 1), + int2fx((((i >> 1) & 1) << 1) - 1), + int2fx(((i & 1) << 1) - 1)}; + vertices.add(vertex); + } triangles.add({{0, 4, 5}, 1}); triangles.add({{0, 1, 5}, 1}); diff --git a/src/main.cpp b/src/main.cpp index c08b584..cc21223 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -16,16 +16,21 @@ int main() { auto cube = std::shared_ptr((Mesh *)new Cube); - ModelInstance modelInstance(cube, int2fx(2), {0x0C7F, 0x0000, 0}, - {int2fx(0), 0, int2fx(0)}); + ModelInstance model_instance(cube, float2fx(0.25), {0, 0x0C00, 0}, + {int2fx(3), int2fx(3), int2fx(3)}); - auto modelInstancePtr = std::shared_ptr(&modelInstance); - scene->renderables.add(modelInstancePtr); + auto model_instance_ptr = std::shared_ptr(&model_instance); + scene->renderables.add(model_instance_ptr); + std::uint8_t frame = 0; while (1) { - - Scene::render(scene); - vid_flip(); + if (frame == 0) { + model_instance.add_pos({0, 0, float2fx(0.2)}); + M4_CLEAR(); + Scene::render(scene); + vid_flip(); + } + frame = (frame + 1) % 10; VBlankIntrWait(); } diff --git a/src/model_instance.cpp b/src/model_instance.cpp index 61204ff..db28243 100644 --- a/src/model_instance.cpp +++ b/src/model_instance.cpp @@ -40,9 +40,8 @@ void ModelInstance::render(std::shared_ptr scene_context) { usu::vector projected(m_mesh->vertices.size()); for (std::uint32_t i = 0; i < projected.size(); i++) { - VECTOR transformed = - m_mesh->vertices[i]; // rotate(m_mesh->vertices[i], m_rot); - // vec_add(&transformed, &transformed, &m_pos); + VECTOR transformed = rotate(m_mesh->vertices[i], m_rot); + vec_add(&transformed, &transformed, &m_pos); projected[i] = scene_context->project_2d(transformed); } @@ -57,3 +56,5 @@ void ModelInstance::render(std::shared_ptr scene_context) { scene_context->draw_line(v2, v0, triangle.color_idx); } } + +void ModelInstance::add_pos(VECTOR d_pos) { vec_add(&m_pos, &m_pos, &d_pos); } -- cgit v1.2.3-70-g09d2