From e9076f22fe2a49d1cd8933e54b7b00c5dd943269 Mon Sep 17 00:00:00 2001
From: untodesu <kirill@untode.su>
Date: Fri, 12 Sep 2025 13:33:52 +0500
Subject: It compiles

---
 game/client/game.cc | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

(limited to 'game/client/game.cc')

diff --git a/game/client/game.cc b/game/client/game.cc
index a59aec3..257bd2d 100644
--- a/game/client/game.cc
+++ b/game/client/game.cc
@@ -372,24 +372,40 @@ void client_game::init_late(void)
     // NOTE: this is very debug, early and a quite
     // conservative limit choice; there must be a better
     // way to make this limit way smaller than it currently is
-    for(const std::shared_ptr<world::VoxelInfo>& info : world::voxel_registry::voxels) {
-        for(const world::VoxelTexture& vtex : info->textures) {
-            max_texture_count += vtex.paths.size();
-        }
+    for(const auto& voxel : world::voxel_registry::voxels) {
+        max_texture_count += voxel->get_default_textures().size();
+        max_texture_count += voxel->get_face_textures(world::VFACE_NORTH).size();
+        max_texture_count += voxel->get_face_textures(world::VFACE_SOUTH).size();
+        max_texture_count += voxel->get_face_textures(world::VFACE_EAST).size();
+        max_texture_count += voxel->get_face_textures(world::VFACE_WEST).size();
+        max_texture_count += voxel->get_face_textures(world::VFACE_TOP).size();
+        max_texture_count += voxel->get_face_textures(world::VFACE_BOTTOM).size();
+        max_texture_count += voxel->get_face_textures(world::VFACE_CROSS_NWSE).size();
+        max_texture_count += voxel->get_face_textures(world::VFACE_CROSS_NESW).size();
     }
 
     // UNDONE: asset packs for non-16x16 stuff
     world::voxel_atlas::create(16, 16, max_texture_count);
 
-    for(std::shared_ptr<world::VoxelInfo>& info : world::voxel_registry::voxels) {
-        for(world::VoxelTexture& vtex : info->textures) {
-            if(auto strip = world::voxel_atlas::find_or_load(vtex.paths)) {
-                vtex.cached_offset = strip->offset;
-                vtex.cached_plane = strip->plane;
+    for(auto& voxel : world::voxel_registry::voxels) {
+        constexpr std::array faces = {
+            world::VFACE_NORTH,
+            world::VFACE_SOUTH,
+            world::VFACE_EAST,
+            world::VFACE_WEST,
+            world::VFACE_TOP,
+            world::VFACE_BOTTOM,
+            world::VFACE_CROSS_NWSE,
+            world::VFACE_CROSS_NESW,
+        };
+
+        for(auto face : faces) {
+            if(auto strip = world::voxel_atlas::find_or_load(voxel->get_face_textures(face))) {
+                voxel->set_face_cache(face, strip->offset, strip->plane);
                 continue;
             }
 
-            spdlog::critical("client_gl: {}: failed to load atlas strips", info->name);
+            spdlog::critical("client_gl: {}: failed to load atlas strips", voxel->get_name());
             std::terminate();
         }
     }
-- 
cgit 


From 73cbcdd6e8c849e32abbf9757e603e6a6654e870 Mon Sep 17 00:00:00 2001
From: untodesu <kirill@untode.su>
Date: Fri, 12 Sep 2025 14:09:34 +0500
Subject: Metaitems

---
 game/client/game.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'game/client/game.cc')

diff --git a/game/client/game.cc b/game/client/game.cc
index 257bd2d..d61ce84 100644
--- a/game/client/game.cc
+++ b/game/client/game.cc
@@ -412,8 +412,8 @@ void client_game::init_late(void)
 
     world::voxel_atlas::generate_mipmaps();
 
-    for(std::shared_ptr<world::ItemInfo>& info : world::item_registry::items) {
-        info->cached_texture = resource::load<TextureGUI>(info->texture.c_str(), TEXTURE_GUI_LOAD_CLAMP_S | TEXTURE_GUI_LOAD_CLAMP_T);
+    for(auto& item : world::item_registry::items) {
+        item->set_cached_texture(resource::load<TextureGUI>(item->get_texture(), TEXTURE_GUI_LOAD_CLAMP_S | TEXTURE_GUI_LOAD_CLAMP_T));
     }
 
     experiments::init_late();
-- 
cgit