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

Merge branch 'main' into update-file-subsystem

Browse source
This commit is contained in:
MihailRis 2025-01-31 08:55:39 +03:00
commit c3066eebd3
3 changed files with 63 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/engine/ServerMainloop.cpp
View file

@ -67,8 +67,11 @@ void ServerMainloop::run() {
if (!coreParams.testMode) {
auto end = system_clock::now();
platform::sleep(targetDelta * 1000 -
duration_cast<microseconds>(end - begin).count() / 1000);
int64_t millis = targetDelta * 1000 -
duration_cast<microseconds>(end - begin).count() / 1000;
if (millis > 0) {
platform::sleep(millis);
}
begin = system_clock::now();
}
}

5
src/graphics/render/BlockWrapsRenderer.cpp
View file

@ -56,7 +56,10 @@ void BlockWrapsRenderer::draw(const BlockWrapper& wrapper) {
);
break;
case BlockModel::aabb: {
const auto& aabb = def.rt.hitboxes[vox->state.rotation].at(0);
const auto& aabb =
(def.rotatable ? def.rt.hitboxes[vox->state.rotation]
: def.hitboxes)
.at(0);
const auto& size = aabb.size();
regions[0].scale(size.z, size.y);
regions[1].scale(size.z, size.y);