[client] move assets to C code

Author: rexim

build.js

@@ -37,15 +37,20 @@ function buildJs() {
 }
 
 async function buildClient() {
+    await cmdAsync("clang", [
+        "-Wall", "-Wextra", "-ggdb",
+        "-I"+SRC_FOLDER,
+        "-I"+SRC_FOLDER+"cws/",
+        "-o", BUILD_FOLDER+"packer",
+        SRC_FOLDER+"packer.c",
+        "-lm",
+    ]);
+
+    await cmdAsync(BUILD_FOLDER+"packer", [
+        BUILD_FOLDER+"pack.h",
+    ]);
+
     await Promise.all([
-        cmdAsync("clang", [
-            "-Wall", "-Wextra", "-ggdb",
-            "-I"+SRC_FOLDER,
-            "-I"+SRC_FOLDER+"cws/",
-            "-o", BUILD_FOLDER+"packer",
-            SRC_FOLDER+"packer.c",
-            "-lm",
-        ]),
         cmdAsync("clang", [
             "-Wall", "-Wextra",
             "--target=wasm32",
@@ -57,6 +62,7 @@ async function buildClient() {
             "-Wall", "-Wextra",
             "--target=wasm32",
             "-I", SRC_FOLDER+"cws/",
+            "-I", BUILD_FOLDER,
             "-c", SRC_FOLDER+"client.c",
             "-o", BUILD_FOLDER+"client.wasm.o",
         ]),
@@ -69,6 +75,7 @@ async function buildClient() {
         ]),
     ])
 
+
     return cmdAsync("c3c", [
         "compile",
         "-D", "PLATFORM_WEB",

client.wasm

@@ -1,6 +1,7 @@
 #include <stdint.h>
 #include "common.h"
 #include "sort.h"
+#include "pack.h"
 
 // TODO: It would be cool if we could use nob.h here.
 // Unfortunately nob depends on stdlib. We should make it so it's optional.
@@ -600,6 +601,26 @@ void key_up(uint32_t key_code) {
     }
 }
 
+static bool streq(const char *s1, const char *s2) {
+    while (*s1 && *s2) {
+        if (*s1++ != *s2++) return false;
+    }
+    return !(*s1 || *s2);
+}
+
+Asset *asset_by_filename(const char *filename) {
+    for (size_t i = 0; i < assets_count; ++i) {
+        if (streq(assets[i].filename, filename)) {
+            return &assets[i];
+        }
+    }
+    return NULL;
+}
+
+void *pack_ptr_by_offset(size_t offset) {
+    return &pack[offset];
+}
+
 // TODO: "magnet" items into the player
 // TODO: Blast particles should fade out as they age
 // TODO: Bomb collision should take into account the bomb's size

src/client.c

@@ -38,8 +38,6 @@ fn void* allocate_temporary_buffer(usz size) @extern("allocate_temporary_buffer"
     return mem::tcalloc(size);
 }
 
-$exec("build/packer");
-
 struct Color {
     char r;
     char g;
@@ -305,37 +303,32 @@ fn void render_other_players(SpritePool *sprite_pool, Image *player_image) {
     };
 }
 
-fn Asset *asset_by_filename(String filename) {
-    foreach (&asset: assets) {
-        if (asset.filename == filename) {
-            return asset;
-        }
-    }
-    return null;
-}
+
+extern fn void* pack_ptr_by_offset(usz offset) @extern("pack_ptr_by_offset");
+extern fn Asset *asset_by_filename(ZString filename) @extern("asset_by_filename");
 
 fn void render_game(float delta_time, float time) @extern("render_game") @wasm {
     Asset *asset = null;
 
     asset = asset_by_filename("assets/images/custom/key.png");
     assert(asset);
-    Image key_image = {asset.width, asset.height, (Color*)&pack[asset.offset]};
+    Image key_image = {asset.width, asset.height, (Color*)pack_ptr_by_offset(asset.offset)};
 
     asset = asset_by_filename("assets/images/custom/bomb.png");
     assert(asset);
-    Image bomb_image = {asset.width, asset.height, (Color*)&pack[asset.offset]};
+    Image bomb_image = {asset.width, asset.height, (Color*)pack_ptr_by_offset(asset.offset)};
 
     asset = asset_by_filename("assets/images/custom/particle.png");
     assert(asset);
-    Image particle_image = {asset.width, asset.height, (Color*)&pack[asset.offset]};
+    Image particle_image = {asset.width, asset.height, (Color*)pack_ptr_by_offset(asset.offset)};
 
     asset = asset_by_filename("assets/images/custom/wall.png");
     assert(asset);
-    Image wall_image = {asset.width, asset.height, (Color*)&pack[asset.offset]};
+    Image wall_image = {asset.width, asset.height, (Color*)pack_ptr_by_offset(asset.offset)};
 
     asset = asset_by_filename("assets/images/custom/player.png");
     assert(asset);
-    Image player_image = {asset.width, asset.height, (Color*)&pack[asset.offset]};
+    Image player_image = {asset.width, asset.height, (Color*)pack_ptr_by_offset(asset.offset)};
 
     update_all_players(delta_time);
     update_items(&sprite_pool, time, common::items_ptr(), common::items_len(), &key_image, &bomb_image);

src/client.c3

@@ -9,7 +9,7 @@ import std::hash::fnv32a;
 
 // WARNING! struct Asset definition must be in sync with the one in common.h
 struct Asset {
-    String filename;
+    ZString filename;
     usz offset;
     usz width;
     usz height;

src/common.c3

@@ -17,11 +17,21 @@ const char *IMAGE_FILES[] = {
     "assets/images/custom/wall.png",
 };
 
-String_Builder pack;
-Assets assets;
+String_Builder pack = {0};
+Assets assets = {0};
+String_Builder out = {0};
 
-int main()
+int main(int argc, char **argv)
 {
+    const char *program_name = shift(argv, argc);
+
+    if (argc <= 0) {
+        fprintf(stderr, "Usage: %s <output>\n", program_name);
+        fprintf(stderr, "ERROR: no output file path is provided\n");
+        return 1;
+    }
+    const char *output_path = shift(argv, argc);
+
     for (size_t i = 0; i < ARRAY_LEN(IMAGE_FILES); ++i) {
         const char *filename = IMAGE_FILES[i];
         int x, y;
@@ -37,19 +47,27 @@ int main()
         sb_append_buf(&pack, pixels, size);
     }
 
-    printf("Asset[] assets = {\n");
+    sb_appendf(&out, "Asset assets[] = {\n");
     for (size_t i = 0; i < assets.count; ++i) {
         Asset asset = assets.items[i];
-        printf("    {\"%s\", %zu, %zu, %zu},\n", asset.filename, asset.offset, asset.width, asset.height);
+        sb_appendf(&out, "    {\"%s\", %zu, %zu, %zu},\n", asset.filename, asset.offset, asset.width, asset.height);
     }
-    printf("};\n");
+    sb_appendf(&out, "};\n");
+    sb_appendf(&out, "#define assets_count %zu\n", assets.count);
 
-    printf("char[*] pack = {");
+    sb_appendf(&out, "unsigned char pack[] = {\n");
     String_View pack_view = sb_to_sv(pack);
-    for (size_t i = 0; i < pack_view.count; ++i) {
-        printf("%u,", (unsigned char)pack_view.data[i]);
+    size_t width = 15;
+    for (size_t i = 0; i < pack_view.count;) {
+        sb_appendf(&out, "    ");
+        for (size_t j = 0; j < width && i < pack_view.count; ++j, ++i) {
+            sb_appendf(&out, "0x%02X,", (unsigned char)pack_view.data[i]);
+        }
+        sb_appendf(&out, "\n");
     }
-    printf("};\n");
+    sb_appendf(&out, "};\n");
+    sb_appendf(&out, "#define pack_count %zu\n", pack_view.count);
 
+    if (!write_entire_file(output_path, out.items, out.count)) return 1;
     return 0;
 }