voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-13 06:51:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #929 from MihailRis/fixes

Browse source 
fixes
This commit is contained in:
MihailRis 2026-08-12 00:41:19 +03:00 • committed by GitHub
commit 0cbb740e70
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/graphics/render/WorldRenderer.cpp
View file

@ -492,8 +492,10 @@ void WorldRenderer::renderOpaquePass(
ctx.useTexture(advanced_pipeline::TARGET_SKYBOX, skybox->getCubemap()); ctx.useTexture(advanced_pipeline::TARGET_SKYBOX, skybox->getCubemap());
ctx.useTexture(advanced_pipeline::TARGET_COLOR, nullptr); ctx.useTexture(advanced_pipeline::TARGET_COLOR, nullptr);
renderOpaque(ctx, camera, settings, hudVisible); renderOpaque(ctx, camera, settings, hudVisible);
ctx.setDepthMask(false);
texts->render(wctx, camera, settings, hudVisible, true);
} }
texts->render(wctx, camera, settings, hudVisible, true);
} }
void WorldRenderer::renderWeatherEffects(Camera& camera) { void WorldRenderer::renderWeatherEffects(Camera& camera) {

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

@ -42,7 +42,7 @@ static int l_get_model(lua::State* L) {
auto& rigConfig = *skeleton->config; auto& rigConfig = *skeleton->config;
auto index = index_range_check(*skeleton, lua::tointeger(L, 2)); auto index = index_range_check(*skeleton, lua::tointeger(L, 2));
const auto& modelOverride = skeleton->modelOverrides[index]; const auto& modelOverride = skeleton->modelOverrides[index];
if (!modelOverride.model) { if (modelOverride.model) {
return lua::pushstring(L, modelOverride.name); return lua::pushstring(L, modelOverride.name);
} }
return lua::pushstring(L, rigConfig.getBones()[index]->model.name); return lua::pushstring(L, rigConfig.getBones()[index]->model.name);

3
src/objects/Entities.cpp
View file

@ -492,10 +492,11 @@ void Entities::render(
} }
bool Entities::hasBlockingInside(AABB aabb) { bool Entities::hasBlockingInside(AABB aabb) {
constexpr float eps = 0.05f;
auto view = registry->view<EntityId, Rigidbody>(); auto view = registry->view<EntityId, Rigidbody>();
for (auto [entity, eid, body] : view.each()) { for (auto [entity, eid, body] : view.each()) {
AABB bodyAABB(body.hitbox.getAABB()); AABB bodyAABB(body.hitbox.getAABB());
bodyAABB.scale({1, 0.95f, 1}); bodyAABB.scale(glm::vec3(1.0f - eps));
if (eid.def.blocking && aabb.intersects(bodyAABB)) { if (eid.def.blocking && aabb.intersects(bodyAABB)) {
return true; return true;
} }