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 animation

Browse source
This commit is contained in:
MihailRis 2026-08-14 19:46:37 +03:00
commit 49e7f2c631
89 changed files with 1050 additions and 687 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/objects/Entities.cpp
View file

@ -492,10 +492,11 @@ void Entities::render(
}
bool Entities::hasBlockingInside(AABB aabb) {
constexpr float eps = 0.05f;
auto view = registry->view<EntityId, Rigidbody>();
for (auto [entity, eid, body] : view.each()) {
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)) {
return true;
}

4
src/objects/Players.cpp
View file

@ -67,7 +67,7 @@ Player* Players::getNearest(const glm::vec3& position) const {
}
Player* Players::create(int64_t id) {
int64_t& nextPlayerID = level.getWorld()->getInfo().nextPlayerId;
int64_t& nextPlayerID = level.getWorld().getInfo().nextPlayerId;
if (id == NONE) {
id = nextPlayerID++;
} else {
@ -146,7 +146,7 @@ void Players::deserialize(const dv::value& src) {
auto& inventory = player->getInventory();
// invalid inventory id pre 0.25
if (inventory->getId() == 0) {
inventory->setId(level.getWorld()->getNextInventoryId());
inventory->setId(level.getWorld().getNextInventoryId());
}
level.inventories->store(inventory);
}