refactor Content

src/graphics/render/BlocksPreview.cpp

@@ -123,7 +123,7 @@ std::unique_ptr<Atlas> BlocksPreview::build(
     const Content* content
 ) {
     auto indices = content->getIndices();
-    size_t count = indices->countBlockDefs();
+    size_t count = indices->blocks.count();
     size_t iconSize = ITEM_ICON_SIZE;
 
     auto shader = assets->get<Shader>("ui3d");
@@ -153,7 +153,7 @@ std::unique_ptr<Atlas> BlocksPreview::build(
     
     fbo.bind();
     for (size_t i = 0; i < count; i++) {
-        auto def = indices->getBlockDef(i);
+        auto def = indices->blocks.get(i);
         atlas->getTexture()->bind();
         builder.add(def->name, draw(cache, shader, &fbo, &batch, def, iconSize));
     }

src/graphics/render/BlocksRenderer.cpp

@@ -40,7 +40,7 @@ BlocksRenderer::BlocksRenderer(
         CHUNK_W + voxelBufferPadding*2, 
         CHUNK_H, 
         CHUNK_D + voxelBufferPadding*2);
-    blockDefsCache = content->getIndices()->getBlockDefs();
+    blockDefsCache = content->getIndices()->blocks.getDefs();
 }
 
 BlocksRenderer::~BlocksRenderer() {

src/graphics/render/WorldRenderer.cpp

@@ -179,7 +179,7 @@ void WorldRenderer::renderLevel(
     {
         auto inventory = player->getInventory();
         ItemStack& stack = inventory->getSlot(player->getChosenSlot());
-        auto item = indices->getItemDef(stack.getItemId());
+        auto item = indices->items.get(stack.getItemId());
         float multiplier = 0.5f;
         shader->uniform3f("u_torchlightColor",  
             item->emission[0] / 15.0f * multiplier,
@@ -202,11 +202,11 @@ void WorldRenderer::renderLevel(
     skybox->unbind();
 }
 
-void WorldRenderer::renderBlockSelection(Camera* camera, Shader* linesShader) {
+void WorldRenderer::renderBlockSelection() {
     const auto& selection = player->selection;
     auto indices = level->content->getIndices();
     blockid_t id = selection.vox.id;
-    auto block = indices->getBlockDef(id);
+    auto block = indices->blocks.get(id);
     const glm::ivec3 pos = player->selection.position;
     const glm::vec3 point = selection.hitPosition;
     const glm::vec3 norm = selection.normal;
@@ -230,7 +230,7 @@ void WorldRenderer::renderLines(Camera* camera, Shader* linesShader) {
     linesShader->use();
     linesShader->uniformMatrix("u_projview", camera->getProjView());
     if (player->selection.vox.id != BLOCK_VOID) {
-        renderBlockSelection(camera, linesShader);
+        renderBlockSelection();
     }
     if (player->debug) {
         level->entities->renderDebug(*lineBatch);

src/graphics/render/WorldRenderer.hpp

@@ -45,10 +45,11 @@ class WorldRenderer {
     void drawChunks(Chunks* chunks, Camera* camera, Shader* shader);
 
     /// @brief Render block selection lines
+    void renderBlockSelection();
+    
+    /// @brief Render lines (selection and debug)
     /// @param camera active camera
     /// @param linesShader shader used
-    void renderBlockSelection(Camera* camera, Shader* linesShader);
-    
     void renderLines(Camera* camera, Shader* linesShader);
 
     /// @brief Render all debug lines (chunks borders, coord system guides)

src/graphics/ui/elements/InventoryView.cpp

@@ -121,7 +121,7 @@ void SlotView::draw(const DrawContext* pctx, Assets* assets) {
     itemid_t itemid = bound->getItemId();
     if (itemid != prevItem) {
         if (itemid) {
-            auto def = content->getIndices()->getItemDef(itemid);
+            auto def = content->getIndices()->items.get(itemid);
             tooltip = util::pascal_case(
                 langs::get(util::str2wstr_utf8(def->caption))
             );
@@ -159,12 +159,12 @@ void SlotView::draw(const DrawContext* pctx, Assets* assets) {
     auto previews = assets->get<Atlas>("block-previews");
     auto indices = content->getIndices();
 
-    ItemDef* item = indices->getItemDef(stack.getItemId());
+    ItemDef* item = indices->items.get(stack.getItemId());
     switch (item->iconType) {
         case item_icon_type::none:
             break;
         case item_icon_type::block: {
-            const Block& cblock = content->requireBlock(item->icon);
+            const Block& cblock = content->blocks.require(item->icon);
             batch->texture(previews->getTexture());
 
             UVRegion region = previews->get(cblock.name);
@@ -268,7 +268,7 @@ void SlotView::clicked(gui::GUI* gui, mousecode button) {
                 stack.setCount(halfremain);
             }
         } else {
-            auto stackDef = content->getIndices()->getItemDef(stack.getItemId());
+            auto stackDef = content->getIndices()->items.get(stack.getItemId());
             if (stack.isEmpty()) {
                 stack.set(grabbed);
                 stack.setCount(1);