Update README.md

.gitignore

@@ -8,3 +8,4 @@ raylib-build
 *.data
 *.ods
 *.dSYM
+*.out

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "wapp"]
 	path = wapp
-	url = git@git.thewizardapprentice.com:abdelrahman/wizapp-stdlib
+	url = https://git.thewizardapprentice.com/abdelrahman/wizapp-stdlib
 [submodule "raylib-src"]
 	path = raylib-src
-	url = git@github.com:raysan5/raylib
+	url = https://github.com/raysan5/raylib

Makefile

@@ -1,6 +1,6 @@
 CC            = clang
-CFLAGS        = -g -O3 -Iraylib/include -Iwapp/src
+CFLAGS        = -g -O3 -Iwapp/src
-LDFLAGS       = '-Wl,-rpath,$$ORIGIN/raylib/lib' -Lraylib/lib -lraylib -lm
+LDFLAGS       = -lm
 BASEDIR       = $(shell realpath ./)
 RL_SRCDIR     = ${BASEDIR}/raylib-src/src
 RL_BUILDDIR   = ${BASEDIR}/raylib-build
@@ -13,26 +13,13 @@ PLATFORM      = $(shell uname)
 
 all: no_dod dod
 
-raylib:
-ifeq ($(PLATFORM), Linux)
-	cmake -S raylib-src -B raylib-build -DCMAKE_INSTALL_PREFIX=raylib -DCMAKE_CONFIGURATION_TYPES=Release -DBUILD_SHARED_LIBS=ON -G "Ninja Multi-Config"
-	cmake --build raylib-build --config=Release
-	cmake --install raylib-build --config=Release
-else
-	mkdir -p ${RL_BUILDDIR} ${RL_LIBDIR} ${RL_INCLUDEDIR}
-	cd ${RL_SRCDIR} && \
-		make PLATFORM=PLATFORM_DESKTOP RAYLIB_RELEASE_PATH=${RL_BUILDDIR} RAYLIB_LIBTYPE=SHARED && \
-		cp ${RL_BUILDDIR}/* ${RL_LIBDIR} && \
-		cp ${RL_SRCDIR}/*.h ${RL_INCLUDEDIR}
-endif
-
 wapp:
 	cd wapp && python3 -m codegen
 
-no_dod: raylib wapp
+no_dod: wapp
 	$(CC) $(CFLAGS) $(LDFLAGS) no_dod.c wapp/src/wapp.c -o no_dod
 
-dod: raylib wapp
+dod: wapp
 	$(CC) $(CFLAGS) $(LDFLAGS) dod.c wapp/src/wapp.c -o dod
 
 clean:

README.md

@@ -0,0 +1,3 @@
+# Data-Oriented Design Test
+
+Playing around with [DOD](https://en.wikipedia.org/wiki/Data-oriented_design) concepts and comparing performance of resulting applications.

common.h

@@ -17,6 +17,8 @@
 #define WANDERER_SLOWDOWN_FACTOR 0.5f
 #define WANDERER_SPEEDUP_FACTOR 2.0f
 #define MSG_BUF_LEN 4096
+#define LINE_BUF_LEN 1024
+#define LOOPS 100
 
 #define abs(A) (A < 0 ? A * -1 : A)
 #define min(A, B) (A < B ? A : B)

dod.c

@@ -1,6 +1,5 @@
 #include "wapp.h"
 #include "common.h"
-#include "raylib.h"
 #include <math.h>
 #include <stdint.h>
 #include <stdbool.h>
@@ -59,7 +58,6 @@ struct Manager {
 
 typedef void (*ScaleInitialiser)(Scale *scale, XOR256State *state);
 typedef void (*VelocityInitialiser)(Velocity *velocity, XOR256State *state);
-typedef void (*RaylibDrawRectFunc)(int posX, int posY, int width, int height, Color color);
 
 void init_manager(const Allocator *allocator, Manager *manager);
 void init_position(Position *position, XOR256State *state);
@@ -67,18 +65,14 @@ void init_scale_wanderer(Scale *scale, XOR256State *state);
 void init_scale_zone(Scale *scale, XOR256State *state);
 void init_velocity(Velocity *velocity, XOR256State *state);
 void zero_velocity(Velocity *velocity, XOR256State *state);
-void update_positions(u8 *tags, Rect *rects, Velocity *velocities, u64 count, f32 delta);
+u64 update_positions(u8 *tags, Rect *rects, Velocity *velocities, u64 count, f32 delta);
 void render_entities(const u8 *tags, const Rect *rects, u64 count);
 u8 collides(const Rect *rect, const Rect *collider);
 i16 get_random_velocity(XOR256State *state);
 
+u64 log_data(const Rect *rects, u64 count, FILE *fp, char *line);
+
 int main(void) {
-  i32 target_fps = 120;
-
-  SetTraceLogLevel(LOG_NONE);
-  InitWindow(WIDTH, HEIGHT, "DOD test");
-  // SetTargetFPS(target_fps);
-
   Allocator arena = wapp_mem_arena_allocator_init(MB(20));
   assert(!wapp_mem_allocator_invalid(&arena));
 
@@ -101,34 +95,24 @@ int main(void) {
     velocity_initialisers[is_zone](&(manager.velocities[i]), &state);
   }
 
-  f32 last_time = GetFrameTime();
+  FILE *fp = fopen("dod.out", "w");
-  f32 delta, cur_time;
+  assert(fp != NULL);
 
-  while (!WindowShouldClose()) {
+  u64 update_counter = 0;
-    f64 time = GetTime();
+  u64 render_counter = 0;
-    if (time >= 20.0) {
+  f32 delta = 0.016666666f;
-      break;
+  for (u64 i = 0; i < LOOPS; ++i) {
-    }
+    update_counter += update_positions(manager.tags, manager.rects, manager.velocities, manager.count, delta);
 
-    cur_time = GetFrameTime();
+    char line[LINE_BUF_LEN] = {0};
-    delta    = cur_time - last_time;
 
-    update_positions(manager.tags, manager.rects, manager.velocities, manager.count, delta);
+    render_counter += log_data(manager.rects, manager.count, fp, line);
-
-    BeginDrawing();
-
-    ClearBackground(BG_COLOR);
-
-    // render_entities(manager.tags, manager.rects, manager.count);
-
-    DrawFPS(10, 10);
-
-    EndDrawing();
   }
 
+  fclose(fp);
   wapp_mem_arena_allocator_destroy(&arena);
 
-  CloseWindow();
+  printf("UPDATE: %lu, RENDER: %lu\n", update_counter, render_counter);
 
   return 0;
 }
@@ -183,7 +167,7 @@ void zero_velocity(Velocity *velocity, XOR256State *state) {
   velocity->y = 0.0f;
 }
 
-void update_positions(u8 *tags, Rect *rects, Velocity *velocities, u64 count, f32 delta) {
+u64 update_positions(u8 *tags, Rect *rects, Velocity *velocities, u64 count, f32 delta) {
   persistent f32 multipliers[2] = {1.0f, 0.5f};
   persistent u64 inside_zone_mask = 0x7;
 
@@ -191,6 +175,7 @@ void update_positions(u8 *tags, Rect *rects, Velocity *velocities, u64 count, f3
   f32 pos_x, pos_y;
   f32 max_x, max_y;
 
+  u64 total = 0;
   for (u64 i = ZONE_COUNT; i < count; ++i) {
     tags[i] &= inside_zone_mask;
     for (u64 j = 0; j < ZONE_COUNT; ++j) {
@@ -217,25 +202,11 @@ void update_positions(u8 *tags, Rect *rects, Velocity *velocities, u64 count, f3
 
     rects[i].position.x = roundf(pos_x);
     rects[i].position.y = roundf(pos_y);
+
+    ++total;
   }
-}
 
-void render_entities(const u8 *tags, const Rect *rects, u64 count) {
+  return total;
-  persistent RaylibDrawRectFunc renderers[2] = {DrawRectangle, DrawRectangleLines};
-  persistent Color colors[2]                 = {FG_COLOR, ZONE_COLOR};
-
-  for (u64 i = 0; i < count; ++i) {
-    u8 func_index  = (tags[i] & ENTITY_TAG_COLLIDER) >> COLLIDER_TAG_SHIFT;
-    u8 color_index = func_index | ((tags[i] & ENTITY_TAG_INSIDE_ZONE) >> INSIDE_ZONE_TAG_SHIFT);
-
-    renderers[func_index](
-      rects[i].position.x,
-      rects[i].position.y,
-      rects[i].scale.width,
-      rects[i].scale.height,
-      colors[color_index]
-    );
-  }
 }
 
 u8 collides(const Rect *rect, const Rect *collider) {
@@ -256,3 +227,24 @@ u8 collides(const Rect *rect, const Rect *collider) {
 i16 get_random_velocity(XOR256State *state) {
   return (wapp_prng_xorshift_256(state) % (MAX_ABS_VELOCITY + 1 - MIN_ABS_VELOCITY)) + MIN_ABS_VELOCITY;
 }
+
+u64 log_data(const Rect *rects, u64 count, FILE *fp, char *line) {
+  u64 total = 0;
+  for (u64 i = 0; i < count; ++i) {
+    snprintf(
+      line, LINE_BUF_LEN,
+      "x: %d, y: %d, width: %d, height: %d\n",
+      rects[i].position.x,
+      rects[i].position.y,
+      rects[i].scale.width,
+      rects[i].scale.height
+    );
+    u64 size = strlen(line);
+    fwrite(line, sizeof(char), size, fp);
+    memset(line, 0, size);
+
+    ++total;
+  }
+
+  return total;
+}

no_dod.c

@@ -1,9 +1,10 @@
 #include "wapp.h"
 #include "common.h"
-#include "raylib.h"
 #include <stdint.h>
 #include <stdbool.h>
 #include <assert.h>
+#include <time.h>
+#include <stdio.h>
 
 #define OBJECT_COMMON struct {Position position; Scale scale;}
 
@@ -39,19 +40,11 @@ struct SlowZone {
 
 void init_wanderer(Wanderer *wanderer, XOR256State *state);
 void move_wanderer(Wanderer *wanderer, const SlowZone *zones);
-void render_wanderer(const Wanderer *wanderer);
 void init_slow_zone(SlowZone *zone,  XOR256State *state);
-
-void render_slow_zone(const SlowZone *zone);
-
 bool inside_zone(const Wanderer *wanderer, const SlowZone *zone);
 f32 get_random_float(XOR256State *state);
 
 int main(void) {
-  SetTraceLogLevel(LOG_NONE);
-  InitWindow(WIDTH, HEIGHT, "No-DOD test");
-  // SetTargetFPS(120);
-
   Allocator arena       = wapp_mem_arena_allocator_init(MB(20));
   XOR256State state     = wapp_prng_xorshift_init_state();
   u64 wanderers_size    = sizeof(Wanderer) * WANDERER_COUNT;
@@ -70,36 +63,39 @@ int main(void) {
     init_slow_zone(&(zones[i]),&state);
   }
 
-  while (!WindowShouldClose()) {
+  FILE *fp = fopen("no_dod.out", "w");
-    f64 time = GetTime();
+  assert(fp != NULL);
-    if (time >= 20.0) {
-      break;
-    }
 
+  u64 update_counter = 0;
+  u64 render_counter = 0;
+  for (u64 i = 0; i < LOOPS; ++i) {
     for (u64 i = 0; i < WANDERER_COUNT; ++i) {
       move_wanderer(&(wanderers[i]), zones);
+      ++update_counter;
     }
 
-    BeginDrawing();
+    char line[LINE_BUF_LEN] = {0};
 
-    ClearBackground(BG_COLOR);
+    for (u64 i = 0; i < WANDERER_COUNT; ++i) {
-
+      snprintf(
-    // for (u64 i = 0; i < ZONE_COUNT; ++i) {
+        line, LINE_BUF_LEN,
-    //   render_slow_zone(&(zones[i]));
+        "x: %f, y: %f, width: %f, height: %f\n",
-    // }
+        wanderers[i].position.x,
-    //
+        wanderers[i].position.y,
-    // for (u64 i = 0; i < WANDERER_COUNT; ++i) {
+        wanderers[i].scale.width,
-    //   render_wanderer(&(wanderers[i]));
+        wanderers[i].scale.height
-    // }
+      );
-
+      u64 size = strlen(line);
-    DrawFPS(10, 10);
+      fwrite(line, sizeof(char), size, fp);
-
+      memset(line, 0, size);
-    EndDrawing();
+      ++render_counter;
+    }
   }
 
+  fclose(fp);
   wapp_mem_arena_allocator_destroy(&arena);
 
-  CloseWindow();
+  printf("UPDATE: %lu, RENDER: %lu\n", update_counter, render_counter);
 
   return 0;
 }
@@ -157,17 +153,6 @@ void move_wanderer(Wanderer *wanderer, const SlowZone *zones) {
   }
 }
 
-void render_wanderer(const Wanderer *wanderer) {
-  Color color = wanderer->slow ? ZONE_COLOR : FG_COLOR;
-  DrawRectangle(
-    (i32)wanderer->position.x,
-    (i32)wanderer->position.y,
-    (i32)wanderer->scale.width,
-    (i32)wanderer->scale.height,
-    color
-  );
-}
-
 void init_slow_zone(SlowZone *zone,  XOR256State *state) {
   zone->position = (Position){
     .x = wapp_prng_xorshift_256(state) % WIDTH,
@@ -180,16 +165,6 @@ void init_slow_zone(SlowZone *zone,  XOR256State *state) {
   };
 }
 
-void render_slow_zone(const SlowZone *zone) {
-  DrawRectangleLines(
-    zone->position.x,
-    zone->position.y,
-    zone->scale.width,
-    zone->scale.height,
-    ZONE_COLOR
-  );
-}
-
 bool inside_zone(const Wanderer *wanderer, const SlowZone *zone) {
   f32 wanderer_min_x = wanderer->position.x + wanderer->scale.width;
   f32 wanderer_min_y = wanderer->position.y + wanderer->scale.height;