Add experimental render commands (prepare for parallelism)

Author: azinum

build.sh

@@ -1,10 +1,40 @@
-#!/bin/sh
+#!/bin/bash
 
 set -xe
 
-OPT=-O3
-clang --target=wasm32 -flto -ffast-math -nostdlib -Wl,--no-entry -Wl,--export-all -Wl,--allow-undefined ${OPT} -Iinclude -Ideps/common.h src/main.c -o raster.wasm -DNO_STDLIB -DNO_STDIO -DTARGET_WASM -DNO_MATH -fvectorize
+OPT=-O2
+clang \
+	${OPT} \
+	--target=wasm32 \
+	-fvectorize \
+	-flto \
+	-ffast-math \
+	-nostdlib \
+	-Wl,--no-entry \
+	-Wl,--export-all \
+	-Wl,--allow-undefined \
+	-Iinclude \
+	-Ideps/common.h \
+	src/main.c \
+	-o raster.wasm \
+	-DNO_STDLIB \
+	-DNO_STDIO \
+	-DTARGET_WASM \
+	-DNO_MATH \
+	-DNO_OMP
 
-clang ${OPT} -Iinclude -Ideps/common.h src/main.c -o raster `pkg-config --libs --cflags sdl2` -lm -fvectorize -march=native -DNO_TEXTURES
+clang \
+	${OPT} \
+	-fvectorize \
+	-flto \
+	-ffast-math \
+	-Iinclude \
+	-Ideps/common.h \
+	src/main.c \
+	-o raster \
+	`pkg-config --libs --cflags sdl2` \
+	-lm \
+	-DNO_OMP && \
+	strip raster
 
 # wasm2wat raster.wasm -o raster.wat

include/config.h

@@ -5,10 +5,10 @@
 
 #define DEBUG_OUT_OF_BOUNDS
 
-const u32 RASTER_WIDTH    = 320;
-const u32 RASTER_HEIGHT   = 240;
-const u32 WINDOW_WIDTH    = RASTER_WIDTH  * 3;
-const u32 WINDOW_HEIGHT   = RASTER_HEIGHT * 3;
+#define RASTER_WIDTH      320
+#define RASTER_HEIGHT     240
+#define WINDOW_WIDTH      RASTER_WIDTH  * 3
+#define WINDOW_HEIGHT     RASTER_HEIGHT * 3
 const v3 WORLD_UP         = V3(0, 1, 0);
 f32 LIGHT_AMBIENCE        = 1.0f / (f32)UINT8_MAX;
 f32 CAMERA_ZFAR           = 35.0f;
@@ -22,9 +22,9 @@ Color FOG_COLOR           = COLOR_RGB(0, 0, 0);
 Color EDGE_DETECTION_COLOR = COLOR_RGB(0, 0, 0);
 v3 VOXELGI_POS            = V3(7, 0, 12);
 bool VOXELGI_RENDER_VOXELS = false; // for debugging
-const i32 VOXELGI_X       = 16;
-const i32 VOXELGI_Y       = 4;
-const i32 VOXELGI_Z       = 12;
+#define VOXELGI_X         16
+#define VOXELGI_Y         4
+#define VOXELGI_Z         12
 #define VOXELGI_VOXEL_COUNT (VOXELGI_X * VOXELGI_Y * VOXELGI_Z)
 const f32 DT_MIN          = 1.0f / 1000.0f;
 const f32 DT_MAX          = 1.0f / 10.0f;

include/renderer.h

@@ -77,9 +77,9 @@ typedef struct Vertex {
 } Vertex;
 
 typedef struct Triangle {
-  v3 a;
-  v3 b;
-  v3 c;
+  Vertex a;
+  Vertex b;
+  Vertex c;
 } Triangle;
 
 #define RECT(X, Y, W, H) (Rect) { .x = X, .y = Y, .w = W, .h = H, }
@@ -107,6 +107,7 @@ void render_mesh(Mesh* mesh, Texture* texture, v3 position, v3 size, v3 rotation
 void render_text(const char* text, size_t length, i32 x, i32 y, f32 size, Color tint);
 void renderer_set_clear_color(Color color);
 void renderer_begin_frame(f32 dt);
+void renderer_draw(void);
 void renderer_post_process(void);
 void renderer_end_frame(void);
 void renderer_clear(void);
@@ -118,5 +119,6 @@ void renderer_toggle_edge_detection(void);
 void renderer_toggle_render_zbuffer(void);
 void renderer_toggle_render_normal_buffer(void);
 void renderer_toggle_render_voxels(void);
+void renderer_toggle_texture_mapping(void);
 
 #endif // _RENDERER_H

raster.wasm

@@ -1,5 +1,9 @@
 // raster.c
 
+#ifndef NO_OMP
+  #include <omp.h>
+#endif
+
 #define STB_SPRINTF_IMPLEMENTATION
 #include "stb_sprintf.h"
 
@@ -141,6 +145,9 @@ void update_and_render(f32 dt) {
   if (input.key_pressed[KEY_F]) {
     window_toggle_fullscreen();
   }
+  if (input.key_pressed[KEY_T]) {
+    renderer_toggle_texture_mapping();
+  }
   if (input.key_down[KEY_W]) {
     camera.pos = V3_OP(
       camera.pos,
@@ -253,12 +260,13 @@ void update_and_render(f32 dt) {
     render_mesh(&cube, &t_brick_6, V3(2, sinf(game.timer * 0.8f) - 1.2f, -6), V3(size, size, size), V3(0, 0, 0), game.light);
   }
 
+  renderer_draw();
   renderer_post_process();
   {
     static char text[256] = {0};
     static size_t length = 0;
     if ((game.tick % 4) == 0) {
-      length = snprintf(text, sizeof(text), "%.3g ms\nlight (%.2g, %.2g, %.2g)\ncamera (%.2g, %.2g, %.2g)", 1000 * dt, EXPAND_V3(game.light.pos), EXPAND_V3(camera.pos));
+      length = snprintf(text, sizeof(text), "%.3g ms\nlight (%.2g, %.2g, %.2g)\ncamera (%.2g, %.2g, %.2g)\nprimitives: %d", 1000 * dt, EXPAND_V3(game.light.pos), EXPAND_V3(camera.pos), renderer_get_num_primitives());
     }
     render_text(text, length, 2, 2, 1, COLOR_RGB(130, 100, 255));
   }