Changeset 676

Timestamp:

Jul 28, 2015, 6:02:28 PM (9 years ago)

Author:

guerin

Message:

raycast: load textures from misc/

Location:

soft/giet_vm/applications/raycast

Files:

• disp.c (modified) (6 diffs)
• main.c (modified) (2 diffs)
• raycast.py (modified) (1 diff)

soft/giet_vm/applications/raycast/disp.c

@@ -3 +3 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <malloc.h>
 #include <math.h>
 #include <hard_config.h>
-
-#ifdef USE_TEXTURES
-#include "res/rock_tex.h"
-#include "res/door_tex.h"
-#include "res/handle_tex.h"
-#include "res/wood_tex.h"
-#endif
 
 #define FIELD_OF_VIEW   (70.f * M_PI / 180.f)   // Camera field of view
@@ -26 +20 @@
 unsigned int  cur_buf;
 
-#ifdef USE_TEXTURES
 // Textures indexed by block number
-static uint16_t *g_tex[] =
+static unsigned char *g_tex[] =
 {
     NULL, // 0
-    (uint16_t*)&rock_tex_data,
-    (uint16_t*)&door_tex_data,
-    (uint16_t*)&handle_tex_data,
-    (uint16_t*)&wood_tex_data
+    NULL, // rock
+    NULL, // door
+    NULL, // handle
+    NULL, // wood
 };
-#endif
 
 // Local functions
@@ -64 +56 @@
 
     // Wall
-#ifdef USE_TEXTURES
-    uint16_t *tex = g_tex[type];
+    unsigned char *tex = g_tex[type];
 
     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,
@@ -76 +71 @@
     }
     else {
-#endif
         // Draw a solid color slice
         dispDrawColumn(x,
@@ -82 +76 @@
                        (FBUF_Y_SIZE + height) / 2,
                        0xFF);
-#ifdef USE_TEXTURES
-    }
-#endif
+    }
 
     // Floor
@@ -165 +157 @@
 }
 
+unsigned char *loadTexture(char *path)
+{
+    int fd;
+    unsigned char *tex;
+
+    tex = malloc(TEX_SIZE * TEX_SIZE);
+    fd = giet_fat_open(path, O_RDONLY);
+    if (fd < 0) {
+        free(tex);
+        return NULL;
+    }
+
+    giet_fat_read(fd, g_tex[1], TEX_SIZE * TEX_SIZE);
+    giet_fat_close(fd);
+    giet_tty_printf("[RAYCAST] loaded tex %s\n", path);
+
+    return tex;
+}
+
 // Exported functions
 
 void dispInit()
 {
+    // initialize framebuffer
     giet_fbf_cma_alloc();
     giet_fbf_cma_init_buf(buf0, buf1, sts0, sts1);
     giet_fbf_cma_start(FBUF_X_SIZE * FBUF_Y_SIZE);
 
+    // load textures
+    g_tex[1] = loadTexture("misc/rock_32.raw");
+    g_tex[2] = loadTexture("misc/door_32.raw");
+    g_tex[3] = loadTexture("misc/handle_32.raw");
+    g_tex[4] = loadTexture("misc/wood_32.raw");
+
         cur_buf = 0;
 }

soft/giet_vm/applications/raycast/main.c

@@ -2 +2 @@
 #include "disp.h"
 #include <stdio.h>
+#include <malloc.h>
 
 // Exported functions
@@ -10 +11 @@
         giet_tty_printf("[RAYCAST] entering main()\n");
 
+        heap_init(0, 0);
         dispInit();
 

soft/giet_vm/applications/raycast/raycast.py

@@ -30 +30 @@
 
     heap_base  = 0x60000000 
-    heap_size  = 0x00001000     # 4 Kbytes 
+    heap_size  = 0x00008000     # 32 Kbytes
 
     # create vspace