voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-05 11:01:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MihailRis:main' into main

Browse source
This commit is contained in:
Astazium 2026-08-29 14:40:20 +03:00 • committed by GitHub
commit 533a27c04b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/graphics/render/BlocksRenderer.hpp
View file

@ -145,6 +145,9 @@ private:
// Does block allow to see other blocks sides (is it transparent)
bool isOpen(const glm::ivec3& pos, const Block& def, const Variant& variant) const {
if (pos.y >= CHUNK_H) {
return true;
}
const auto& vox = voxelsBuffer->pickBlock(
chunk->x * CHUNK_W + pos.x, pos.y, chunk->z * CHUNK_D + pos.z
);

2
src/logic/scripting/lua/libs/libxml.cpp
View file

@ -51,7 +51,7 @@ static std::unique_ptr<xml::xmlelement> toxml(lua::State* L) {
break;
}
auto key = lua::require_lstring(L, -1);
if (key == "@") {
if (key == TAG_ATTR) {
break;
}
auto value = lua::require_lstring(L, -2);

3
src/logic/scripting/lua/usertypes/lua_type_heightmap.cpp
View file

@ -128,11 +128,10 @@ static int l_noise(lua::State* L) {
}
float noiseValue = fnlGetNoise2D(noise, u, v);
float t = 1.0f / static_cast<float>(1 << c) * multiplier;
if (normalizedNoise) {
float t = 1.0f / (static_cast<float>(1 << c) * multiplier);
value = value * (1.0f - t) + noiseValue * t;
} else {
float t = 1.0f / static_cast<float>(1 << c) * multiplier;
value += noiseValue * t;
}
heights[i] = value;