add world list editor

change default tree ti tree_standard_tile_angle.png

assets/maps/worlds.h

@@ -0,0 +1,16 @@
+#ifndef WORLDS_H
+#define WORLDS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+static const char *world_names[] = {
+    "map",
+};
+
+#ifdef __cplusplus
+}
+#endif // __cplusplus
+
+#endif // WORLDS_H

src/main.cpp

@@ -20,6 +20,8 @@
 #include "stb_image.h"
 #include "change_directory.h"
 
+#include "../assets/maps/worlds.h"
+
 #pragma clang diagnostic ignored "-Waddress-of-temporary"
 
 using namespace glm;
@@ -68,7 +70,7 @@ static float volume_sfx    = 50.0f;
 static bool Running = true;
 
 static float camera_fovy_degrees = 31.0f;
-static float camera_tilt         = 25.5f;
+static float camera_tilt         = 10.0f;
 static float camera_distance     = 13.5f;
 
 static mat4x4 view_matrix;
@@ -95,6 +97,7 @@ static float editor_camera_distance = 30.0f;
 static bool show_demo_window;
 static bool show_tile_picker;
 static bool show_tree_editor;
+static bool show_world_editor;
 static bool show_settings;
 
 static float character_speed = 4.0f;
@@ -201,7 +204,9 @@ struct Map {
     R_Buffer  trees_buffer;
 };
 
-static Map current_map;
+static Uint32 num_loaded_maps;
+static Map *loaded_maps;
+static Map *current_map;
 
 struct alignas(16) PerFrame {
     i32vec2 drag_start;
@@ -416,7 +421,7 @@ struct TreeInfo {
 };
 
 static TreeInfo tree_infos[] = {
-    { 0, "decorations/tree_standard_tile.png" },
+    { 0, "decorations/tree_standard_tile_angle.png" },
 };
 
 static vec4 tree_uvs[SDL_arraysize(tree_infos)];
@@ -455,11 +460,37 @@ static R_Texture create_texture(const char *path) {
     return result;
 }
 
+static bool save_worlds_list() {
+    const char *path = ASSETS_PATH "maps/worlds.h";
+
+    SDL_IOStream *file = SDL_IOFromFile(path, "wb");
+    if (!file) {
+        log_error("Failed to open world list file for writing.");
+        return false;
+    }
+    defer(SDL_CloseIO(file));
+
+    SDL_IOprintf(file, "#ifndef WORLDS_H\n#define WORLDS_H\n\n#ifdef __cplusplus\nextern \"C\" {\n#endif // __cplusplus\n\nstatic const char *world_names[] = {\n");
+
+    for (int i = 0; i < num_loaded_maps; i++) {
+        SDL_IOprintf(file, "    \"%.*s\",\n", (int)SDL_arraysize(loaded_maps[i].name), loaded_maps[i].name);
+    }
+
+    SDL_IOprintf(file, "};\n\n#ifdef __cplusplus\n}\n#endif // __cplusplus\n\n#endif // WORLDS_H\n");
+
+    if(!SDL_FlushIO(file)) {
+        log_error("Failed to flush data to world list file.");
+        return false;   
+    };
+
+    return true;
+}
+
 #define MAP_FILE_VERSION (3u)
 
-static bool save_map(Map map) {
+static bool save_map(Map *map) {
     char path[256] = ASSETS_PATH "maps/";
-    SDL_strlcat(path, map.name, SDL_arraysize(path));
+    SDL_strlcat(path, map->name, SDL_arraysize(path));
     SDL_strlcat(path, ".sv", SDL_arraysize(path));
 
     SDL_IOStream *file = SDL_IOFromFile(path, "wb");
@@ -474,18 +505,18 @@ static bool save_map(Map map) {
         return false;
     }
 
-    if (!SDL_WriteS32LE(file, map.size.x)) {
+    if (!SDL_WriteS32LE(file, map->size.x)) {
         log_error("Failed to write width to map file.");
         return false;
     }
 
-    if (!SDL_WriteS32LE(file, map.size.y)) {
+    if (!SDL_WriteS32LE(file, map->size.y)) {
         log_error("Failed to write height to map file.");
         return false;
     }
 
-    for (int i = 0; i < map.size.x * map.size.y; i++) {
+    for (int i = 0; i < map->size.x * map->size.y; i++) {
-        Uint16 id = tile_infos[map.tiles[i]].serialization_id;
+        Uint16 id = tile_infos[map->tiles[i]].serialization_id;
 
         if (!SDL_WriteU16LE(file, id)) {
             log_error("Failed to write tile to map file.");
@@ -493,25 +524,25 @@ static bool save_map(Map map) {
         }
     }
 
-    if (!SDL_WriteU32LE(file, map.num_trees)) {
+    if (!SDL_WriteU32LE(file, map->num_trees)) {
         log_error("Failed to write num_trees to map file.");
         return false;
     }
 
-    for (int i = 0; i < map.num_trees; i++) {
+    for (int i = 0; i < map->num_trees; i++) {
-        Uint16 id = tree_infos[map.trees[i].kind].serialization_id;
+        Uint16 id = tree_infos[map->trees[i].kind].serialization_id;
 
         if (!SDL_WriteU16LE(file, id)) {
             log_error("Failed to write tree kind to map file.");
             return false;
         }
 
-        if (!SDL_WriteU32LE(file, map.trees[i].pos.x)) {
+        if (!SDL_WriteU32LE(file, map->trees[i].pos.x)) {
             log_error("Failed to write tree pos.x to map file.");
             return false;
         }
 
-        if (!SDL_WriteU32LE(file, map.trees[i].pos.y)) {
+        if (!SDL_WriteU32LE(file, map->trees[i].pos.y)) {
             log_error("Failed to write tree pos.y to map file.");
             return false;
         }
@@ -978,10 +1009,10 @@ static bool imgui_time_picker(const char *label, int time[3]) {
 }
 
 static Uint32 get_corner_info(Sint32 tile_pos_x, Sint32 tile_pos_y) {
-    if (tile_pos_x < 0 || tile_pos_x >= current_map.size.x || tile_pos_y < 0 || tile_pos_y >= current_map.size.y)
+    if (tile_pos_x < 0 || tile_pos_x >= current_map->size.x || tile_pos_y < 0 || tile_pos_y >= current_map->size.y)
         return 0;
 
-    return tile_infos[current_map.tiles[tile_pos_y * current_map.size.x + tile_pos_x]].corner_info;
+    return tile_infos[current_map->tiles[tile_pos_y * current_map->size.x + tile_pos_x]].corner_info;
 }
 
 static Uint32 find_matching_tile(Uint32 corner_info) {
@@ -1008,19 +1039,19 @@ static void change_map_tile(Sint32 pos_x, Sint32 pos_y, TileKind kind) {
         corner_infos[i] = corner_infos[i] ^ ((corner_infos[i] ^ ((kind << 24) | (kind << 16) | (kind << 8) | kind)) & replace_mask);
     }
     
-    if (0 <= pos_x + 0 && pos_x + 0 < current_map.size.x && 0 <= pos_y + 1 && pos_y + 1 < current_map.size.y)
+    if (0 <= pos_x + 0 && pos_x + 0 < current_map->size.x && 0 <= pos_y + 1 && pos_y + 1 < current_map->size.y)
-        current_map.tiles[(pos_y + 1) * current_map.size.x + pos_x + 0] = find_matching_tile(corner_infos[0]);
+        current_map->tiles[(pos_y + 1) * current_map->size.x + pos_x + 0] = find_matching_tile(corner_infos[0]);
 
-    if (0 <= pos_x + 1 && pos_x + 1 < current_map.size.x && 0 <= pos_y + 1 && pos_y + 1 < current_map.size.y)
+    if (0 <= pos_x + 1 && pos_x + 1 < current_map->size.x && 0 <= pos_y + 1 && pos_y + 1 < current_map->size.y)
-        current_map.tiles[(pos_y + 1) * current_map.size.x + pos_x + 1] = find_matching_tile(corner_infos[1]);
+        current_map->tiles[(pos_y + 1) * current_map->size.x + pos_x + 1] = find_matching_tile(corner_infos[1]);
     
-    if (0 <= pos_x + 1 && pos_x + 1 < current_map.size.x && 0 <= pos_y + 0 && pos_y + 0 < current_map.size.y)
+    if (0 <= pos_x + 1 && pos_x + 1 < current_map->size.x && 0 <= pos_y + 0 && pos_y + 0 < current_map->size.y)
-        current_map.tiles[(pos_y + 0) * current_map.size.x + pos_x + 1] = find_matching_tile(corner_infos[2]);
+        current_map->tiles[(pos_y + 0) * current_map->size.x + pos_x + 1] = find_matching_tile(corner_infos[2]);
     
-    if (0 <= pos_x + 0 && pos_x + 0 < current_map.size.x && 0 <= pos_y + 0 && pos_y + 0 < current_map.size.y)
+    if (0 <= pos_x + 0 && pos_x + 0 < current_map->size.x && 0 <= pos_y + 0 && pos_y + 0 < current_map->size.y)
-        current_map.tiles[(pos_y + 0) * current_map.size.x + pos_x + 0] = find_matching_tile(corner_infos[3]);
+        current_map->tiles[(pos_y + 0) * current_map->size.x + pos_x + 0] = find_matching_tile(corner_infos[3]);
 
-    renderer_texture_update(current_map.texture, 0, 0, current_map.size.x, current_map.size.y, current_map.tiles, current_map.size.x * sizeof(Uint16));
+    renderer_texture_update(current_map->texture, 0, 0, current_map->size.x, current_map->size.y, current_map->tiles, current_map->size.x * sizeof(Uint16));
 }
 
 static void SameLineOrWrap(const ImVec2& size) {
@@ -1158,87 +1189,87 @@ static void process_event_editor(SDL_Event event) {
             }
 
             if (event.button.button == SDL_BUTTON_LEFT) {
-                if (selected_tree != -1 && 0 <= tile_pos.x && tile_pos.x < current_map.size.x -1 && 0 <= tile_pos.y && tile_pos.y < current_map.size.y - 1) {
+                if (selected_tree != -1 && 0 <= tile_pos.x && tile_pos.x < current_map->size.x -1 && 0 <= tile_pos.y && tile_pos.y < current_map->size.y - 1) {
                     Sint32 found_tree = -1;
-                    for (Sint32 i = 0; i < current_map.num_trees; i++) {
+                    for (Sint32 i = 0; i < current_map->num_trees; i++) {
-                        if ((current_map.trees[i].pos.x == entity_pos.x) && (current_map.trees[i].pos.y == entity_pos.y)) {
+                        if ((current_map->trees[i].pos.x == entity_pos.x) && (current_map->trees[i].pos.y == entity_pos.y)) {
                             found_tree = i;
                             break;
                         }
                     }
                     
                     if (found_tree != -1) {
-                        Tree tmp = current_map.trees[found_tree];
+                        Tree tmp = current_map->trees[found_tree];
-                        SDL_memmove(&current_map.trees[found_tree], &current_map.trees[found_tree + 1], (current_map.num_trees - (found_tree + 1)) * sizeof(*current_map.trees));
+                        SDL_memmove(&current_map->trees[found_tree], &current_map->trees[found_tree + 1], (current_map->num_trees - (found_tree + 1)) * sizeof(*current_map->trees));
-                        current_map.trees[current_map.num_trees - 1] = tmp;
+                        current_map->trees[current_map->num_trees - 1] = tmp;
                     } else {
-                        current_map.trees = (Tree *)SDL_realloc(current_map.trees, (current_map.num_trees + 1) * sizeof(*current_map.trees));
+                        current_map->trees = (Tree *)SDL_realloc(current_map->trees, (current_map->num_trees + 1) * sizeof(*current_map->trees));
-                        current_map.trees[current_map.num_trees] = {
+                        current_map->trees[current_map->num_trees] = {
                             .pos = entity_pos,
                             .kind = (Uint32)selected_tree,
                         };
 
-                        current_map.num_trees++;
+                        current_map->num_trees++;
                     }
 
-                    std::stable_sort(&current_map.trees[0], &current_map.trees[current_map.num_trees], [](const Tree &a, const Tree &b){ return a.pos.y > b.pos.y; });
+                    std::stable_sort(&current_map->trees[0], &current_map->trees[current_map->num_trees], [](const Tree &a, const Tree &b){ return a.pos.y > b.pos.y; });
 
-                    if (current_map.trees_buffer) renderer_buffer_destroy(current_map.trees_buffer);
+                    if (current_map->trees_buffer) renderer_buffer_destroy(current_map->trees_buffer);
-                    current_map.trees_buffer = renderer_buffer_create(R_BUFFER_USAGE_VERTEX, current_map.num_trees * sizeof(*current_map.trees), current_map.trees, "trees_buffer");
+                    current_map->trees_buffer = renderer_buffer_create(R_BUFFER_USAGE_VERTEX, current_map->num_trees * sizeof(*current_map->trees), current_map->trees, "trees_buffer");
                 }
 
                 if (show_tree_editor && selected_tree == -1) {
-                    for (Sint32 i = 0; i < current_map.num_trees; i++) {
+                    for (Sint32 i = 0; i < current_map->num_trees; i++) {
-                        if ((current_map.trees[i].pos.x == entity_pos.x) && (current_map.trees[i].pos.y == entity_pos.y)) {
+                        if ((current_map->trees[i].pos.x == entity_pos.x) && (current_map->trees[i].pos.y == entity_pos.y)) {
-                            SDL_memmove(&current_map.trees[i], &current_map.trees[i + 1], (current_map.num_trees - (i + 1)) * sizeof(*current_map.trees));
+                            SDL_memmove(&current_map->trees[i], &current_map->trees[i + 1], (current_map->num_trees - (i + 1)) * sizeof(*current_map->trees));
-                            current_map.num_trees--;
+                            current_map->num_trees--;
                             break;
                         }
                     }
 
-                    if (current_map.trees_buffer) renderer_buffer_destroy(current_map.trees_buffer);
+                    if (current_map->trees_buffer) renderer_buffer_destroy(current_map->trees_buffer);
-                    if (current_map.num_trees)    current_map.trees_buffer = renderer_buffer_create(R_BUFFER_USAGE_VERTEX, current_map.num_trees * sizeof(*current_map.trees), current_map.trees, "trees_buffer");
+                    if (current_map->num_trees)    current_map->trees_buffer = renderer_buffer_create(R_BUFFER_USAGE_VERTEX, current_map->num_trees * sizeof(*current_map->trees), current_map->trees, "trees_buffer");
                 }
 
                 if (selected_tile_kind != -1) {
                     change_map_tile(tile_pos.x, tile_pos.y, (TileKind)selected_tile_kind);
 
-                    if (-1 <= tile_pos.x && tile_pos.x < current_map.size.x && -1 <= tile_pos.y && tile_pos.y < current_map.size.y) {
+                    if (-1 <= tile_pos.x && tile_pos.x < current_map->size.x && -1 <= tile_pos.y && tile_pos.y < current_map->size.y) {
                         dragging_tile_change = true;
                     }
                 }
 
-                if (0 <= tile_pos.x && tile_pos.x < current_map.size.x && 0 <= tile_pos.y && tile_pos.y < current_map.size.y) {
+                if (0 <= tile_pos.x && tile_pos.x < current_map->size.x && 0 <= tile_pos.y && tile_pos.y < current_map->size.y) {
                     dragging_tile_change = true;
                 }
                 
                 SDL_Keymod modifiers = SDL_GetModState();
                 if (modifiers & SDL_KMOD_SHIFT && tile_pos.x <= -1) {
                     if(modifiers & SDL_KMOD_CTRL)
-                        change_map_size(&current_map, 'W', -1);
+                        change_map_size(current_map, 'W', -1);
                     else
-                        change_map_size(&current_map, 'W', 1);
+                        change_map_size(current_map, 'W', 1);
                 }
 
-                if (modifiers & SDL_KMOD_SHIFT && tile_pos.x == current_map.size.x) {
+                if (modifiers & SDL_KMOD_SHIFT && tile_pos.x == current_map->size.x) {
                     if (modifiers & SDL_KMOD_CTRL)
-                        change_map_size(&current_map, 'E', -1);
+                        change_map_size(current_map, 'E', -1);
                     else
-                        change_map_size(&current_map, 'E', 1);
+                        change_map_size(current_map, 'E', 1);
                 }
 
                 if (modifiers & SDL_KMOD_SHIFT && tile_pos.y <= -1) {
                     if (modifiers & SDL_KMOD_CTRL)
-                        change_map_size(&current_map, 'N', -1);
+                        change_map_size(current_map, 'N', -1);
                     else
-                        change_map_size(&current_map, 'N', 1);
+                        change_map_size(current_map, 'N', 1);
                 }
 
-                if (modifiers & SDL_KMOD_SHIFT && tile_pos.y == current_map.size.y) {
+                if (modifiers & SDL_KMOD_SHIFT && tile_pos.y == current_map->size.y) {
                     if (modifiers & SDL_KMOD_CTRL)
-                        change_map_size(&current_map, 'S', -1);
+                        change_map_size(current_map, 'S', -1);
                     else
-                        change_map_size(&current_map, 'S', 1);
+                        change_map_size(current_map, 'S', 1);
                 }
             }
         } break;
@@ -1256,8 +1287,8 @@ static void process_event_editor(SDL_Event event) {
                     vec2 floor_intersection = get_floor_intersection_of_mouse(vec2(event.button.x, event.button.y));
                     i32vec2 tile_pos = grid_tile_pos_from_floor_intersection(floor_intersection);
 
-                    Sint32 tile_x = clamp(0, tile_pos.x, current_map.size.x - 1);
+                    Sint32 tile_x = clamp(0, tile_pos.x, current_map->size.x - 1);
-                    Sint32 tile_y = clamp(0, tile_pos.y, current_map.size.y - 1);
+                    Sint32 tile_y = clamp(0, tile_pos.y, current_map->size.y - 1);
 
                     i32vec2 drag_start = grid_tile_pos_from_floor_intersection(drag_start_pos);
 
@@ -1269,11 +1300,11 @@ static void process_event_editor(SDL_Event event) {
 
                     for (Sint32 y = start_y; y <= end_y; y++) {
                         for (Sint32 x = start_x; x <= end_x; x++) {
-                            current_map.tiles[x + current_map.size.x * y] = selected_tile;
+                            current_map->tiles[x + current_map->size.x * y] = selected_tile;
                         }
                     }
 
-                    renderer_texture_update(current_map.texture, 0, 0, current_map.size.x, current_map.size.y, current_map.tiles, current_map.size.x * sizeof(Uint16));
+                    renderer_texture_update(current_map->texture, 0, 0, current_map->size.x, current_map->size.y, current_map->tiles, current_map->size.x * sizeof(Uint16));
                 }
 
                 dragging_tile_change = false;
@@ -1308,6 +1339,7 @@ static void update_state_editor() {
     ImGui::NewFrame();
 
     const ImGuiViewport *viewport = ImGui::GetMainViewport();
+    ImGuiStyle &style = ImGui::GetStyle();
 
     if (ImGui::BeginMainMenuBar()) {
         if (ImGui::BeginMenu("File")) {
@@ -1335,6 +1367,7 @@ static void update_state_editor() {
         if (ImGui::BeginMenu("Edit")) {
             ImGui::MenuItem("Tile Picker", NULL, &show_tile_picker);
             ImGui::MenuItem("Trees",       NULL, &show_tree_editor);
+            ImGui::MenuItem("Worlds",      NULL, &show_world_editor);
             ImGui::EndMenu();
         }
 
@@ -1350,6 +1383,7 @@ static void update_state_editor() {
         ImGuiID left_dock = ImGui::DockBuilderSplitNode(main_viewport_dock, ImGuiDir_Left, 0.2f, NULL, NULL);
         ImGui::DockBuilderDockWindow("Tile Picker", left_dock);
         ImGui::DockBuilderDockWindow("Trees", left_dock);
+        ImGui::DockBuilderDockWindow("Worlds", left_dock);
         ImGui::DockBuilderFinish(main_viewport_dock);
     }
     ImGui::DockSpaceOverViewport(main_viewport_dock, ImGui::GetMainViewport(), ImGuiDockNodeFlags_AutoHideTabBar | ImGuiDockNodeFlags_PassthruCentralNode | ImGuiDockNodeFlags_NoDockingOverCentralNode);
@@ -1470,7 +1504,6 @@ static void update_state_editor() {
 
     if (show_tree_editor) {
         if (ImGui::Begin("Trees", &show_tree_editor, ImGuiWindowFlags_NoFocusOnAppearing)) {
-            ImGuiStyle &style = ImGui::GetStyle();
             if (SelectableImage("##tree", tree_textures_atlas_imgui, ImVec2(64, 64), vec2(0, 0), vec2(0, 0), selected_tree == -1))
                 selected_tree = -1;
 
@@ -1491,6 +1524,58 @@ static void update_state_editor() {
         selected_tree = -1;
     }
 
+    auto add_world_modal = ImGui::GetID("Add World");
+    ImGui::SetNextWindowSize(ImVec2(200, 0), ImGuiCond_Appearing);
+    if (ImGui::BeginPopupModal("Add World")) {
+        static Map new_map = {};
+        ImGui::SetNextItemWidth(-1);
+        ImGui::InputTextWithHint("##Name", "Name", new_map.name, SDL_arraysize(new_map.name));
+
+        float button_width = (ImGui::GetContentRegionAvail().x - style.ItemSpacing.x) * 0.5f;
+
+        if (ImGui::Button("Cancel", ImVec2(button_width, 0))) ImGui::CloseCurrentPopup();
+        ImGui::SameLine();
+        if (ImGui::Button("Add", ImVec2(button_width, 0))) {
+            new_map.size  = vec2(2, 2);
+            new_map.tiles = (Uint16 *)SDL_calloc(new_map.size.x * new_map.size.y, sizeof(*new_map.tiles));
+
+            new_map.texture = renderer_texture_create(R_TEXTURE_FORMAT_R16_UINT, R_TEXTURE_USAGE_STORAGE, false, new_map.size.x, new_map.size.y, new_map.tiles, "map_texture");
+
+            size_t current_map_index = current_map - loaded_maps;
+
+            loaded_maps = (Map *)SDL_realloc(loaded_maps, (num_loaded_maps + 1) * sizeof(new_map));
+            loaded_maps[num_loaded_maps++] = new_map;
+
+            current_map = &loaded_maps[current_map_index];
+            
+            save_map(&new_map);
+            save_worlds_list();
+            new_map = {};
+
+            ImGui::CloseCurrentPopup();
+        }
+        
+        ImGui::EndPopup();
+    }
+
+    if (show_world_editor) {
+        if (ImGui::Begin("Worlds", &show_world_editor, ImGuiWindowFlags_NoFocusOnAppearing)) {
+            if(ImGui::BeginListBox("##Worlds", ImVec2(-1, 0))) {
+                for (int i = 0; i < num_loaded_maps; i++) {
+                    if (ImGui::Selectable(loaded_maps[i].name, current_map == &loaded_maps[i])) {
+                        current_map = &loaded_maps[i];
+                    }
+                }
+                ImGui::EndListBox();
+
+                if (ImGui::Button("Add World", ImVec2(-1, 0))) {
+                    ImGui::OpenPopup(add_world_modal);
+                }
+            }
+        }
+        ImGui::End();
+    }
+
     ImGui::SetNextWindowPos({ viewport->WorkPos.x + viewport->WorkSize.x - 10.0f, viewport->WorkPos.y + 10.0f }, ImGuiCond_Always, { 1.0f, 0.0f });
     if (ImGui::Begin("Overlay", NULL, ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoDocking | ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoNav)) {
         ImGui::Checkbox("Grid", &show_grid);
@@ -1530,9 +1615,9 @@ static void render_editor() {
             vec2 floor_intersection = get_floor_intersection_of_mouse(mouse_pos);
             i32vec2 tile_pos = grid_tile_pos_from_floor_intersection(floor_intersection);
 
-            per_frame.map_width   = current_map.size.x;
+            per_frame.map_width   = current_map->size.x;
-            per_frame.grid_width  = selected_tile != -1 ? current_map.size.x : current_map.size.x + 1;
+            per_frame.grid_width  = selected_tile != -1 ? current_map->size.x : current_map->size.x + 1;
-            per_frame.grid_height = selected_tile != -1 ? current_map.size.y : current_map.size.y + 1;
+            per_frame.grid_height = selected_tile != -1 ? current_map->size.y : current_map->size.y + 1;
             per_frame.grid_offset = selected_tile != -1 ? vec2(-0.5f, -0.5f) : vec2(-1.0f, -1.0f);
             per_frame.mouse       = tile_pos;
 
@@ -1578,8 +1663,8 @@ static void render_editor() {
     {
         ZoneScopedN("Draw Map");
         renderer_frame_set_shader(R_SHADER_WORLD);
-        renderer_frame_draw(NULL, NULL, NULL, 6, current_map.size.y * current_map.size.x, &(R_Draw_Resources){
+        renderer_frame_draw(NULL, NULL, NULL, 6, current_map->size.y * current_map->size.x, &(R_Draw_Resources){
-            .vertex_storage_textures = (R_Texture[]){ current_map.texture },
+            .vertex_storage_textures = (R_Texture[]){ current_map->texture },
             .vertex_uniform_buffers  = (R_Buffer[]){ view_projection_matrix_buffer, per_frame_buffer },
 
             .num_vertex_storage_textures = 1,
@@ -1595,10 +1680,10 @@ static void render_editor() {
         });
     }
 
-    if (current_map.num_trees) {
+    if (current_map->num_trees) {
         ZoneScopedN("Draw Trees");
         renderer_frame_set_shader(R_SHADER_TREE);
-        renderer_frame_draw(NULL, NULL, current_map.trees_buffer, 6, current_map.num_trees, &(R_Draw_Resources){
+        renderer_frame_draw(NULL, NULL, current_map->trees_buffer, 6, current_map->num_trees, &(R_Draw_Resources){
             .vertex_uniform_buffers  = (R_Buffer[]){ view_projection_matrix_buffer, per_frame_buffer },
 
             .num_vertex_uniform_buffers  = 2,
@@ -1711,10 +1796,10 @@ static void update_state_game() {
     bool is_movement_key_pressed = keyboard_state[SDL_SCANCODE_W] || keyboard_state[SDL_SCANCODE_A] || keyboard_state[SDL_SCANCODE_S] || keyboard_state[SDL_SCANCODE_D] || keyboard_state[SDL_SCANCODE_UP] || keyboard_state[SDL_SCANCODE_LEFT] || keyboard_state[SDL_SCANCODE_DOWN] || keyboard_state[SDL_SCANCODE_RIGHT];
     if (!player.is_moving && (queued_movement || is_movement_key_pressed)) {
         switch (queued_movement_direction) {
-            case DIR_UP:    { player.direction = queued_movement_direction; player.target_position = clamp(ivec2(0, 0), player.position + ivec2( 0,  1), current_map.size - ivec2(2, 2)); if (player.target_position != player.position) player.is_moving = true; } break;
+            case DIR_UP:    { player.direction = queued_movement_direction; player.target_position = clamp(ivec2(0, 0), player.position + ivec2( 0,  1), current_map->size - ivec2(2, 2)); if (player.target_position != player.position) player.is_moving = true; } break;
-            case DIR_LEFT:  { player.direction = queued_movement_direction; player.target_position = clamp(ivec2(0, 0), player.position + ivec2(-1,  0), current_map.size - ivec2(2, 2)); if (player.target_position != player.position) player.is_moving = true; } break;
+            case DIR_LEFT:  { player.direction = queued_movement_direction; player.target_position = clamp(ivec2(0, 0), player.position + ivec2(-1,  0), current_map->size - ivec2(2, 2)); if (player.target_position != player.position) player.is_moving = true; } break;
-            case DIR_DOWN:  { player.direction = queued_movement_direction; player.target_position = clamp(ivec2(0, 0), player.position + ivec2( 0, -1), current_map.size - ivec2(2, 2)); if (player.target_position != player.position) player.is_moving = true; } break;
+            case DIR_DOWN:  { player.direction = queued_movement_direction; player.target_position = clamp(ivec2(0, 0), player.position + ivec2( 0, -1), current_map->size - ivec2(2, 2)); if (player.target_position != player.position) player.is_moving = true; } break;
-            case DIR_RIGHT: { player.direction = queued_movement_direction; player.target_position = clamp(ivec2(0, 0), player.position + ivec2( 1,  0), current_map.size - ivec2(2, 2)); if (player.target_position != player.position) player.is_moving = true; } break;
+            case DIR_RIGHT: { player.direction = queued_movement_direction; player.target_position = clamp(ivec2(0, 0), player.position + ivec2( 1,  0), current_map->size - ivec2(2, 2)); if (player.target_position != player.position) player.is_moving = true; } break;
         }
     }
     queued_movement = false;
@@ -1759,7 +1844,7 @@ static void render_game() {
             mat4x4 view_projection_matrix = view_matrix * projection_matrix;
             renderer_buffer_update(view_projection_matrix_buffer, 0, sizeof(view_projection_matrix), &view_projection_matrix);
 
-            per_frame.map_width = current_map.size.x;
+            per_frame.map_width = current_map->size.x;
             renderer_buffer_update(per_frame_buffer, 0, sizeof(per_frame), &per_frame);
         }
 
@@ -1795,8 +1880,8 @@ static void render_game() {
     {
         ZoneScopedN("Draw Map");
         renderer_frame_set_shader(R_SHADER_WORLD);
-        renderer_frame_draw(NULL, NULL, NULL, 6, current_map.size.y * current_map.size.x, &(R_Draw_Resources){
+        renderer_frame_draw(NULL, NULL, NULL, 6, current_map->size.y * current_map->size.x, &(R_Draw_Resources){
-            .vertex_storage_textures = (R_Texture[]){ current_map.texture },
+            .vertex_storage_textures = (R_Texture[]){ current_map->texture },
             .vertex_uniform_buffers  = (R_Buffer[]){ view_projection_matrix_buffer, per_frame_buffer },
 
             .num_vertex_storage_textures = 1,
@@ -1812,10 +1897,10 @@ static void render_game() {
         });
     }
 
-    if (current_map.num_trees) {
+    if (current_map->num_trees) {
         ZoneScopedN("Draw Trees");
         renderer_frame_set_shader(R_SHADER_TREE);
-        renderer_frame_draw(NULL, NULL, current_map.trees_buffer, 6, current_map.num_trees, &(R_Draw_Resources){
+        renderer_frame_draw(NULL, NULL, current_map->trees_buffer, 6, current_map->num_trees, &(R_Draw_Resources){
             .vertex_uniform_buffers  = (R_Buffer[]){ view_projection_matrix_buffer, per_frame_buffer },
 
             .num_vertex_uniform_buffers  = 2,
@@ -2048,10 +2133,15 @@ int main(int argc, char **argv) {
         return 1;
     }
 
-    if (!load_map("map", &current_map)) {
+    loaded_maps = (Map *)SDL_calloc(SDL_arraysize(world_names), sizeof(*loaded_maps));
-        log_error("Failed to load initial map. Exiting.");
+    for (int i = 0; i < SDL_arraysize(world_names); i++) {
-        return 1;
+        if (!load_map(world_names[i], &loaded_maps[i])) {
+            log_error("Failed to load map '%s'. Exiting.", world_names[i]);
+            return 1;
+        }
     }
+    num_loaded_maps = SDL_arraysize(world_names);
+    current_map = &loaded_maps[0];
 
     mixer = MIX_CreateMixerDevice(SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK, NULL);
     if (!mixer) {

src/shaders/src/character.slang

@@ -37,7 +37,7 @@ VertexShaderOutput main_vertex(VertexShaderInput input) {
         default: {}
     }
 
-    output.pos = mul(float4(input.world_pos + vertex_pos, 0, 1), view_projection_matrix);
+    output.pos = mul(float4(input.world_pos + vertex_pos + float2(0, 0.35), 0, 1), view_projection_matrix);
 
     uint sprite_x = bitfieldExtract(input.sprite_selection, 16, 16);
     uint sprite_y = bitfieldExtract(input.sprite_selection,  0, 16);

src/shaders/src/character_shadow.slang

@@ -38,7 +38,7 @@ VertexShaderOutput main_vertex(VertexShaderInput input) {
 
     vertex_pos *= 0.5;
 
-    output.pos = mul(float4(input.world_pos + vertex_pos + float2(0, -0.35), 0, 1), view_projection_matrix);
+    output.pos = mul(float4(input.world_pos + vertex_pos, 0, 1), view_projection_matrix);
     output.uv = vertex_uv;
 
     return output;

src/shaders/src/tree.slang

@@ -23,7 +23,7 @@ struct FragmentShaderOutput {
     float4 color : SV_Target;
 };
 
-static const float2 offset = float2(0, 0.5); 
+static const float2 offset = float2(0, 0.25); 
 
 [shader("vertex")]
 VertexShaderOutput main_vertex(VertexShaderInput input) {

src/shaders/wgsl/character.wgsl

@@ -70,7 +70,7 @@ fn main_vertex( _S1 : vertexInput_0, @builtin(vertex_index) vertex_index_0 : u32
             vertex_uv_0 = _S2;
         }
     }
-    output_0.pos_0 = (((mat4x4<f32>(view_projection_matrix_0.data_0[i32(0)][i32(0)], view_projection_matrix_0.data_0[i32(1)][i32(0)], view_projection_matrix_0.data_0[i32(2)][i32(0)], view_projection_matrix_0.data_0[i32(3)][i32(0)], view_projection_matrix_0.data_0[i32(0)][i32(1)], view_projection_matrix_0.data_0[i32(1)][i32(1)], view_projection_matrix_0.data_0[i32(2)][i32(1)], view_projection_matrix_0.data_0[i32(3)][i32(1)], view_projection_matrix_0.data_0[i32(0)][i32(2)], view_projection_matrix_0.data_0[i32(1)][i32(2)], view_projection_matrix_0.data_0[i32(2)][i32(2)], view_projection_matrix_0.data_0[i32(3)][i32(2)], view_projection_matrix_0.data_0[i32(0)][i32(3)], view_projection_matrix_0.data_0[i32(1)][i32(3)], view_projection_matrix_0.data_0[i32(2)][i32(3)], view_projection_matrix_0.data_0[i32(3)][i32(3)])) * (vec4<f32>(_S1.world_pos_0 + vertex_pos_0, 0.0f, 1.0f))));
+    output_0.pos_0 = (((mat4x4<f32>(view_projection_matrix_0.data_0[i32(0)][i32(0)], view_projection_matrix_0.data_0[i32(1)][i32(0)], view_projection_matrix_0.data_0[i32(2)][i32(0)], view_projection_matrix_0.data_0[i32(3)][i32(0)], view_projection_matrix_0.data_0[i32(0)][i32(1)], view_projection_matrix_0.data_0[i32(1)][i32(1)], view_projection_matrix_0.data_0[i32(2)][i32(1)], view_projection_matrix_0.data_0[i32(3)][i32(1)], view_projection_matrix_0.data_0[i32(0)][i32(2)], view_projection_matrix_0.data_0[i32(1)][i32(2)], view_projection_matrix_0.data_0[i32(2)][i32(2)], view_projection_matrix_0.data_0[i32(3)][i32(2)], view_projection_matrix_0.data_0[i32(0)][i32(3)], view_projection_matrix_0.data_0[i32(1)][i32(3)], view_projection_matrix_0.data_0[i32(2)][i32(3)], view_projection_matrix_0.data_0[i32(3)][i32(3)])) * (vec4<f32>(_S1.world_pos_0 + vertex_pos_0 + vec2<f32>(0.0f, 0.34999999403953552f), 0.0f, 1.0f))));
     output_0.uv_0 = (vec2<f32>(f32((u32(_S1.sprite_selection_0>>(u32(16)))&((((u32(1)<<u32(16))-u32(1)))))), f32((u32(_S1.sprite_selection_0>>(u32(0)))&((((u32(1)<<u32(16))-u32(1))))))) + vertex_uv_0) * vec2<f32>(0.25f);
     return output_0;
 }

src/shaders/wgsl/character_shadow.wgsl

@@ -71,7 +71,7 @@ fn main_vertex( _S1 : vertexInput_0, @builtin(vertex_index) vertex_index_0 : u32
             vertex_pos_0 = _S2;
         }
     }
-    output_0.pos_0 = (((mat4x4<f32>(view_projection_matrix_0.data_0[i32(0)][i32(0)], view_projection_matrix_0.data_0[i32(1)][i32(0)], view_projection_matrix_0.data_0[i32(2)][i32(0)], view_projection_matrix_0.data_0[i32(3)][i32(0)], view_projection_matrix_0.data_0[i32(0)][i32(1)], view_projection_matrix_0.data_0[i32(1)][i32(1)], view_projection_matrix_0.data_0[i32(2)][i32(1)], view_projection_matrix_0.data_0[i32(3)][i32(1)], view_projection_matrix_0.data_0[i32(0)][i32(2)], view_projection_matrix_0.data_0[i32(1)][i32(2)], view_projection_matrix_0.data_0[i32(2)][i32(2)], view_projection_matrix_0.data_0[i32(3)][i32(2)], view_projection_matrix_0.data_0[i32(0)][i32(3)], view_projection_matrix_0.data_0[i32(1)][i32(3)], view_projection_matrix_0.data_0[i32(2)][i32(3)], view_projection_matrix_0.data_0[i32(3)][i32(3)])) * (vec4<f32>(_S1.world_pos_0 + vertex_pos_0 * vec2<f32>(0.5f) + vec2<f32>(0.0f, -0.34999999403953552f), 0.0f, 1.0f))));
+    output_0.pos_0 = (((mat4x4<f32>(view_projection_matrix_0.data_0[i32(0)][i32(0)], view_projection_matrix_0.data_0[i32(1)][i32(0)], view_projection_matrix_0.data_0[i32(2)][i32(0)], view_projection_matrix_0.data_0[i32(3)][i32(0)], view_projection_matrix_0.data_0[i32(0)][i32(1)], view_projection_matrix_0.data_0[i32(1)][i32(1)], view_projection_matrix_0.data_0[i32(2)][i32(1)], view_projection_matrix_0.data_0[i32(3)][i32(1)], view_projection_matrix_0.data_0[i32(0)][i32(2)], view_projection_matrix_0.data_0[i32(1)][i32(2)], view_projection_matrix_0.data_0[i32(2)][i32(2)], view_projection_matrix_0.data_0[i32(3)][i32(2)], view_projection_matrix_0.data_0[i32(0)][i32(3)], view_projection_matrix_0.data_0[i32(1)][i32(3)], view_projection_matrix_0.data_0[i32(2)][i32(3)], view_projection_matrix_0.data_0[i32(3)][i32(3)])) * (vec4<f32>(_S1.world_pos_0 + vertex_pos_0 * vec2<f32>(0.5f), 0.0f, 1.0f))));
     output_0.uv_0 = vertex_uv_0;
     return output_0;
 }

src/shaders/wgsl/tree.wgsl

@@ -75,7 +75,7 @@ fn main_vertex( _S1 : vertexInput_0, @builtin(vertex_index) vertex_index_0 : u32
             vertex_pos_0 = _S2;
         }
     }
-    output_0.pos_0 = (((mat4x4<f32>(view_projection_matrix_0.data_0[i32(0)][i32(0)], view_projection_matrix_0.data_0[i32(1)][i32(0)], view_projection_matrix_0.data_0[i32(2)][i32(0)], view_projection_matrix_0.data_0[i32(3)][i32(0)], view_projection_matrix_0.data_0[i32(0)][i32(1)], view_projection_matrix_0.data_0[i32(1)][i32(1)], view_projection_matrix_0.data_0[i32(2)][i32(1)], view_projection_matrix_0.data_0[i32(3)][i32(1)], view_projection_matrix_0.data_0[i32(0)][i32(2)], view_projection_matrix_0.data_0[i32(1)][i32(2)], view_projection_matrix_0.data_0[i32(2)][i32(2)], view_projection_matrix_0.data_0[i32(3)][i32(2)], view_projection_matrix_0.data_0[i32(0)][i32(3)], view_projection_matrix_0.data_0[i32(1)][i32(3)], view_projection_matrix_0.data_0[i32(2)][i32(3)], view_projection_matrix_0.data_0[i32(3)][i32(3)])) * (vec4<f32>(vec2<f32>(_S1.pos_1) + (vertex_pos_0 + vec2<f32>(0.0f, 0.5f)), 0.0f, 1.0f))));
+    output_0.pos_0 = (((mat4x4<f32>(view_projection_matrix_0.data_0[i32(0)][i32(0)], view_projection_matrix_0.data_0[i32(1)][i32(0)], view_projection_matrix_0.data_0[i32(2)][i32(0)], view_projection_matrix_0.data_0[i32(3)][i32(0)], view_projection_matrix_0.data_0[i32(0)][i32(1)], view_projection_matrix_0.data_0[i32(1)][i32(1)], view_projection_matrix_0.data_0[i32(2)][i32(1)], view_projection_matrix_0.data_0[i32(3)][i32(1)], view_projection_matrix_0.data_0[i32(0)][i32(2)], view_projection_matrix_0.data_0[i32(1)][i32(2)], view_projection_matrix_0.data_0[i32(2)][i32(2)], view_projection_matrix_0.data_0[i32(3)][i32(2)], view_projection_matrix_0.data_0[i32(0)][i32(3)], view_projection_matrix_0.data_0[i32(1)][i32(3)], view_projection_matrix_0.data_0[i32(2)][i32(3)], view_projection_matrix_0.data_0[i32(3)][i32(3)])) * (vec4<f32>(vec2<f32>(_S1.pos_1) + (vertex_pos_0 + vec2<f32>(0.0f, 0.25f)), 0.0f, 1.0f))));
     output_0.uv_0 = vertex_uv_0;
     output_0.kind_0 = _S1.kind_1;
     return output_0;