improved pixel window rendering

Pixel window rendering is now at the same state as the character rendering.

1 files changed, 191 insertions, 12 deletions

diff --git a/main.cpp b/main.cpp
index eb8f117..732588a 100644
--- a/main.cpp
+++ b/main.cpp
@@ -5,6 +5,7 @@
 #include <vector>
 #include <SDL2/SDL.h>
 #include "chfb.h"
+#include "pixfb.h"
 #include "obj3d.h"
 #include "math_vector.h"
 #include "vertex.h"
@@ -277,21 +278,199 @@ void main_SDL() {
     }
     renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED);
     texture = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_STREAMING, SCREEN_WIDTH, SCREEN_HEIGHT);
-    std::vector<uint32_t> pixels(SCREEN_WIDTH * SCREEN_HEIGHT);
-    for (int y = 0; y < SCREEN_HEIGHT; y++) {
-        for (int x = 0; x < SCREEN_WIDTH; x++) {
-            pixels[x + y * SCREEN_WIDTH] = ((uint32_t) (x + y * SCREEN_WIDTH) << 8) | 0xFF;
-        }
-    }
-    SDL_UpdateTexture(texture, NULL, pixels.data(), SCREEN_WIDTH * 4);
-    SDL_RenderClear(renderer);
-    SDL_RenderCopy(renderer, texture, NULL, NULL);
-    SDL_RenderPresent(renderer);
-    SDL_UpdateWindowSurface(window);
+    PixelFrameBuffer pfb{SCREEN_WIDTH, SCREEN_HEIGHT};
+
+    MathVector3 a{0.f, 0.f, 0.f};
+    float dist = 4.f;
     SDL_Event e;
     bool quit = false;
     while (!quit) {
-        while (SDL_PollEvent(&e)) {
+        a.x += .0050f;
+        a.y += .0065f;
+        a.z += .0080f;
+
+        float rad = 5.f;
+        MathVector3 ca{std::cos(a.x), std::cos(a.y), std::cos(a.z)};
+        MathVector3 sa{std::sin(a.x), std::sin(a.y), std::sin(a.z)};
+
+        std::array<MathVector3, 3> rot_x = {{
+            { 1.f, 0.f, 0.f },
+            { 0.f, ca.x, sa.x },
+            { 0.f, -sa.x, ca.x },
+        }};
+        std::array<MathVector3, 3> rot_y = {{
+            { ca.y, 0.f, -sa.y },
+            { 0.f, 1.f, 0.f },
+            { sa.y, 0.f, ca.y },
+        }};
+        std::array<MathVector3, 3> rot_z = {{
+            { ca.z, sa.z, 0.f },
+            { -sa.z, ca.z, 0.f },
+            { 0.f, 0.f, 1.f },
+        }};
+
+        auto [e_x, e_y, e_z] = rot_x;
+        e_x = e_x.x * rot_y[0] + e_x.y * rot_y[1] + e_x.z * rot_y[2];
+        e_y = e_y.x * rot_y[0] + e_y.y * rot_y[1] + e_y.z * rot_y[2];
+        e_z = e_z.x * rot_y[0] + e_z.y * rot_y[1] + e_z.z * rot_y[2];
+        e_x = e_x.x * rot_z[0] + e_x.y * rot_z[1] + e_x.z * rot_z[2];
+        e_y = e_y.x * rot_z[0] + e_y.y * rot_z[1] + e_y.z * rot_z[2];
+        e_z = e_z.x * rot_z[0] + e_z.y * rot_z[1] + e_z.z * rot_z[2];
+
+        std::array<Object3D, 2> objs{{
+            {
+                {
+                    {
+                        rad * (-e_x + -e_y + -e_z - .5f * (e_x + e_y + e_z)) - dist * rad * MathVector3{0.f, 0.f, 1.f},
+                        {}
+                    },
+                    {
+                        rad * (+e_x + -e_y + -e_z - .5f * (e_x + e_y + e_z)) - dist * rad * MathVector3{0.f, 0.f, 1.f},
+                        {}
+                    },
+                    {
+                        rad * (-e_x + +e_y + -e_z - .5f * (e_x + e_y + e_z)) - dist * rad * MathVector3{0.f, 0.f, 1.f},
+                        {}
+                    },
+                    {
+                        rad * (+e_x + +e_y + -e_z - .5f * (e_x + e_y + e_z)) - dist * rad * MathVector3{0.f, 0.f, 1.f},
+                        {}
+                    },
+                    {
+                        rad * (-e_x + -e_y + +e_z - .5f * (e_x + e_y + e_z)) - dist * rad * MathVector3{0.f, 0.f, 1.f},
+                        {}
+                    },
+                    {
+                        rad * (+e_x + -e_y + +e_z - .5f * (e_x + e_y + e_z)) - dist * rad * MathVector3{0.f, 0.f, 1.f},
+                        {}
+                    },
+                    {
+                        rad * (-e_x + +e_y + +e_z - .5f * (e_x + e_y + e_z)) - dist * rad * MathVector3{0.f, 0.f, 1.f},
+                        {}
+                    },
+                    {
+                        rad * (+e_x + +e_y + +e_z - .5f * (e_x + e_y + e_z)) - dist * rad * MathVector3{0.f, 0.f, 1.f},
+                        {}
+                    }
+                },
+                {
+                    // face 1
+                    { 0, 2, 3 },
+                    { 0, 3, 1 },
+
+                    // face 2
+                    { 0, 4, 6 },
+                    { 0, 6, 2 },
+
+                    // face 3
+                    { 0, 1, 5 },
+                    { 0, 5, 4 },
+
+                    // face 4
+                    { 7, 6, 4 },
+                    { 7, 4, 5 },
+
+                    // face 5
+                    { 7, 3, 2 },
+                    { 7, 2, 6 },
+
+                    // face 6
+                    { 7, 5, 1 },
+                    { 7, 1, 3 },
+                }
+            },
+            {
+                {
+                    {
+                        rad * (-e_x + -e_y + -e_z + .5f * (e_x + e_y + e_z)) - dist * rad * MathVector3{0.f, 0.f, 1.f},
+                        {}
+                    },
+                    {
+                        rad * (+e_x + -e_y + -e_z + .5f * (e_x + e_y + e_z)) - dist * rad * MathVector3{0.f, 0.f, 1.f},
+                        {}
+                    },
+                    {
+                        rad * (-e_x + +e_y + -e_z + .5f * (e_x + e_y + e_z)) - dist * rad * MathVector3{0.f, 0.f, 1.f},
+                        {}
+                    },
+                    {
+                        rad * (+e_x + +e_y + -e_z + .5f * (e_x + e_y + e_z)) - dist * rad * MathVector3{0.f, 0.f, 1.f},
+                        {}
+                    },
+                    {
+                        rad * (-e_x + -e_y + +e_z + .5f * (e_x + e_y + e_z)) - dist * rad * MathVector3{0.f, 0.f, 1.f},
+                        {}
+                    },
+                    {
+                        rad * (+e_x + -e_y + +e_z + .5f * (e_x + e_y + e_z)) - dist * rad * MathVector3{0.f, 0.f, 1.f},
+                        {}
+                    },
+                    {
+                        rad * (-e_x + +e_y + +e_z + .5f * (e_x + e_y + e_z)) - dist * rad * MathVector3{0.f, 0.f, 1.f},
+                        {}
+                    },
+                    {
+                        rad * (+e_x + +e_y + +e_z + .5f * (e_x + e_y + e_z)) - dist * rad * MathVector3{0.f, 0.f, 1.f},
+                        {}
+                    }
+                },
+                {
+                    // face 1
+                    { 0, 2, 3 },
+                    { 0, 3, 1 },
+
+                    // face 2
+                    { 0, 4, 6 },
+                    { 0, 6, 2 },
+
+                    // face 3
+                    { 0, 1, 5 },
+                    { 0, 5, 4 },
+
+                    // face 4
+                    { 7, 6, 4 },
+                    { 7, 4, 5 },
+
+                    // face 5
+                    { 7, 3, 2 },
+                    { 7, 2, 6 },
+
+                    // face 6
+                    { 7, 5, 1 },
+                    { 7, 1, 3 },
+                }
+            }
+        }};
+        pfb.clear();
+        float min_z = 2.f, max_z = 50.f;
+        float fac_for_aspect_ratio = 2.f * static_cast<float>(pfb.height()) / static_cast<float>(pfb.width());
+        for (auto obj : objs) {
+            for (auto triangle : obj) {
+                TriangleVertex4 t{triangle};
+
+                // should be multiplied by a matrix, temporary replacement
+                t.vertex1.point.x *= fac_for_aspect_ratio;
+                t.vertex1.point.y = -t.vertex1.point.y;
+                t.vertex1.point.w = -t.vertex1.point.z;
+                t.vertex1.point.z = 2.f * (-t.vertex1.point.z - min_z) / (max_z - min_z) - 1.f;
+                t.vertex2.point.x *= fac_for_aspect_ratio;
+                t.vertex2.point.y = -t.vertex2.point.y;
+                t.vertex2.point.w = -t.vertex2.point.z;
+                t.vertex2.point.z = 2.f * (-t.vertex2.point.z - min_z) / (max_z - min_z) - 1.f;
+                t.vertex3.point.x *= fac_for_aspect_ratio;
+                t.vertex3.point.y = -t.vertex3.point.y;
+                t.vertex3.point.w = -t.vertex3.point.z;
+                t.vertex3.point.z = 2.f * (-t.vertex3.point.z - min_z) / (max_z - min_z) - 1.f;
+
+                pfb.draw_triangle(t);
+            }
+        }
+        SDL_UpdateTexture(texture, NULL, pfb.pixels(), SCREEN_WIDTH * 4);
+        SDL_RenderClear(renderer);
+        SDL_RenderCopy(renderer, texture, NULL, NULL);
+        SDL_RenderPresent(renderer);
+        SDL_UpdateWindowSurface(window);
+        while (SDL_WaitEventTimeout(&e, 10)) {
             if (e.type == SDL_QUIT) {
                 quit = true;
             }