Changeset 677

Timestamp:

Jul 29, 2015, 5:52:17 PM (9 years ago)

Author:

guerin

Message:

raycast: draw textures

File:

• soft/giet_vm/applications/raycast/disp.c (modified) (7 diffs)

soft/giet_vm/applications/raycast/disp.c

@@ -14 +14 @@
 // Globals
 
-unsigned char buf0[FBUF_X_SIZE * FBUF_Y_SIZE] __attribute__((aligned(64)));
-unsigned char buf1[FBUF_X_SIZE * FBUF_Y_SIZE] __attribute__((aligned(64)));
-unsigned int  sts0[16]  __attribute__((aligned(64)));
-unsigned int  sts1[16]  __attribute__((aligned(64)));
-unsigned int  cur_buf;
+static unsigned char buf0[FBUF_X_SIZE * FBUF_Y_SIZE] __attribute__((aligned(64)));
+static unsigned char buf1[FBUF_X_SIZE * FBUF_Y_SIZE] __attribute__((aligned(64)));
+static unsigned int  sts0[16]  __attribute__((aligned(64)));
+static unsigned int  sts1[16]  __attribute__((aligned(64)));
+static unsigned int  cur_buf;
 
 // Textures indexed by block number
@@ -32 +32 @@
 // Local functions
 
-static void dispDrawColumn(int x, int y0, int y1, unsigned char color)
-{
-        unsigned char* buf = (cur_buf == 0 ? buf0 : buf1);
-
-        if (x < 0 || x > FBUF_X_SIZE)
-                return;
-
-        if (y0 < 0)
-                y0 = 0;
-
-        for (; y0 < y1 && y0 < FBUF_Y_SIZE; y0++) {
-                buf[y0 * FBUF_X_SIZE + x] = color;
-        }
-}
-
-static void dispDrawScrColumn(Game *game, int x, int height, int type, float tx)
+static void dispDrawColumnTex(int x, int y0, int y1, unsigned char *tex, int tx)
+{
+    unsigned char* buf = (cur_buf == 0 ? buf0 : buf1);
+    int y;
+
+    if (x < 0 || x >= FBUF_X_SIZE)
+        return;
+
+    for (y = y0; y < y1 && y < FBUF_Y_SIZE; y++) {
+        if (y < 0)
+            y = 0;
+
+        int ty = (y - y0) * TEX_SIZE / (y1 - y0);
+
+        buf[y * FBUF_X_SIZE + x] = tex[ty * TEX_SIZE + tx];
+    }
+}
+
+static void dispDrawColumnSolid(int x, int y0, int y1, unsigned char color)
+{
+    unsigned char* buf = (cur_buf == 0 ? buf0 : buf1);
+    int y;
+
+    if (x < 0 || x >= FBUF_X_SIZE)
+        return;
+
+    for (y = y0; y < y1 && y < FBUF_Y_SIZE; y++) {
+        if (y < 0)
+            y = 0;
+
+        buf[y * FBUF_X_SIZE + x] = color;
+    }
+}
+
+static void dispDrawSlice(Game *game, int x, int height, int type, float tx)
 {
     // Ceiling
-    dispDrawColumn(x,
-                   0,
-                   (FBUF_Y_SIZE - height) / 2,
-                   CEILING_COLOR);
+    dispDrawColumnSolid(x,
+                        0,
+                        (FBUF_Y_SIZE - height) / 2,
+                        CEILING_COLOR);
 
     // Wall
@@ -60 +79 @@
     if (tex) {
         // Draw a texture slice
-        dispDrawColumn(x,
-               (FBUF_Y_SIZE - height) / 2,
-               (FBUF_Y_SIZE + height) / 2,
-               (x % 2 ? 0xAF : 0x7F));
-        /*Kentec320x240x16_SSD2119TexDrawV(
-            NULL, x,
-            (FBUF_Y_SIZE - height) / 2, (FBUF_Y_SIZE + height) / 2,
-            &tex[(int)(tx * TEX_SIZE) * TEX_SIZE], TEX_SIZE
-        );*/
+        dispDrawColumnTex(x,
+                          (FBUF_Y_SIZE - height) / 2,
+                          (FBUF_Y_SIZE + height) / 2,
+                          tex,
+                          (int)(tx * TEX_SIZE));
     }
     else {
         // Draw a solid color slice
-        dispDrawColumn(x,
-                       (FBUF_Y_SIZE - height) / 2,
-                       (FBUF_Y_SIZE + height) / 2,
-                       0xFF);
+        dispDrawColumnSolid(x,
+                            (FBUF_Y_SIZE - height) / 2,
+                            (FBUF_Y_SIZE + height) / 2,
+                            0xFF);
     }
 
     // Floor
-    dispDrawColumn(x,
-                   (FBUF_Y_SIZE + height) / 2,
-                   FBUF_Y_SIZE,
-                   FLOOR_COLOR);
+    dispDrawColumnSolid(x,
+                        (FBUF_Y_SIZE + height) / 2,
+                        FBUF_Y_SIZE,
+                        FLOOR_COLOR);
 }
 
@@ -157 +172 @@
 }
 
-unsigned char *loadTexture(char *path)
+static unsigned char *loadTexture(char *path)
 {
     int fd;
@@ -169 +184 @@
     }
 
-    giet_fat_read(fd, g_tex[1], TEX_SIZE * TEX_SIZE);
+    giet_fat_read(fd, tex, TEX_SIZE * TEX_SIZE);
     giet_fat_close(fd);
     giet_tty_printf("[RAYCAST] loaded tex %s\n", path);
@@ -191 +206 @@
     g_tex[4] = loadTexture("misc/wood_32.raw");
 
-        cur_buf = 0;
+    cur_buf = 0;
 }
 
 void dispRender(Game *game)
 {
-        int start = giet_proctime();
+    int start = giet_proctime();
     float angle = game->player.dir - FIELD_OF_VIEW / 2.f;
 
@@ -213 +228 @@
 
         // Draw ceiling, wall and floor
-        dispDrawScrColumn(game, i, FBUF_Y_SIZE / dist, type, tx);
+        dispDrawSlice(game, i, FBUF_Y_SIZE / dist, type, tx);
 
         angle += FIELD_OF_VIEW / FBUF_X_SIZE;
     }
 
-        giet_fbf_cma_display(cur_buf);
-        cur_buf = !cur_buf;
-        giet_tty_printf("[RAYCAST] flip (took %d cycles)\n", giet_proctime() - start);
-}
+    giet_fbf_cma_display(cur_buf);
+    cur_buf = !cur_buf;
+    giet_tty_printf("[RAYCAST] flip (took %d cycles)\n", giet_proctime() - start);
+}