Merge branch 'main' of https://github.com/MihailRis/VoxelEngine-Cpp

src/coders/syntax_parser.cpp

@@ -151,6 +151,12 @@ public:
         return std::wstring(source.substr(start, pos - start));
     }
 
+    void emitLineComment(devtools::Location start) {
+        auto string = readUntilEOL();
+        emitToken(TokenTag::COMMENT, std::wstring(string), start);
+        skipLine();
+    }
+
     std::vector<Token> tokenize() {
         skipWhitespace();
         while (hasNext()) {
@@ -229,16 +235,18 @@ public:
             }
             if (is_lua_operator_start(c)) {
                 auto text = parseOperator();
-                if (text == L"--") {
-                    auto string = readUntilEOL();
-                    emitToken(TokenTag::COMMENT, std::wstring(string), start);
-                    skipLine();
+                if (text == syntax.lineComment) {
+                    emitLineComment(start);
                     continue;
                 }
                 emitToken(TokenTag::OPERATOR, std::move(text), start);
                 continue;
             }
             auto text = readUntilWhitespace();
+            if (text.find(syntax.lineComment) == 0) {
+                emitLineComment(start);
+                continue;
+            }
             emitToken(TokenTag::UNEXPECTED, std::wstring(text), start);
         }
         return std::move(tokens);

src/frontend/ContentGfxCache.cpp

@@ -67,7 +67,7 @@ void ContentGfxCache::refresh(const Block& def, const Atlas& atlas) {
     if (def.variants) {
         const auto& variants = def.variants->variants;
         for (int i = 1; i < variants.size() - 1; i++) {
-            refresh_variant(assets, def, variants[i], i + 1, sideregions, atlas, settings, models);
+            refresh_variant(assets, def, variants[i], i, sideregions, atlas, settings, models);
         }
         def.variants->variants.at(0) = def.defaults;
     }

src/graphics/render/WorldRenderer.cpp

@@ -164,14 +164,14 @@ void WorldRenderer::setupWorldShader(
         auto inventory = player.getInventory();
         ItemStack& stack = inventory->getSlot(player.getChosenSlot());
         auto& item = indices->items.require(stack.getItemId());
-        float multiplier = 0.5f;
+        float multiplier = 0.75f;
         shader.uniform3f(
             "u_torchlightColor",
             item.emission[0] / 15.0f * multiplier,
             item.emission[1] / 15.0f * multiplier,
             item.emission[2] / 15.0f * multiplier
         );
-        shader.uniform1f("u_torchlightDistance", 6.0f);
+        shader.uniform1f("u_torchlightDistance", 8.0f);
     }
 }
 

src/io/engine_paths.cpp

@@ -220,6 +220,7 @@ void EnginePaths::cleanup() {
         io::remove_device(entryPoint);
     }
     entryPoints.clear();
+    writeables.clear();
 }
 
 void EnginePaths::setEntryPoints(std::vector<PathsRoot> entryPoints) {