allows to put non-square blocks next to yourself

This commit is contained in:
Sergwest 2024-03-19 20:32:58 +03:00
parent 3d4bfeb442
commit 9b0cc01e68
3 changed files with 23 additions and 1 deletions

View File

@ -415,7 +415,7 @@ void PlayerController::updateInteraction(){
vox = chunks->get(x, y, z);
blockid_t chosenBlock = def->rt.id;
if (vox && (target = indices->getBlockDef(vox->id))->replaceable) {
if (!level->physics->isBlockInside(x,y,z, player->hitbox.get())
if (!level->physics->isBlockInside(x,y,z,def,states, player->hitbox.get())
|| !def->obstacle){
if (def->grounded && !chunks->isSolidBlock(x, y-1, z)) {
chosenBlock = 0;

View File

@ -4,6 +4,7 @@
#include "../maths/aabb.h"
#include "../voxels/Block.h"
#include "../voxels/Chunks.h"
#include "../voxels/voxel.h"
const double E = 0.03;
const double MAX_FIX = 0.1;
@ -218,3 +219,22 @@ bool PhysicsSolver::isBlockInside(int x, int y, int z, Hitbox* hitbox) {
y >= floor(pos.y-half.y) && y <= floor(pos.y+half.y);
}
bool PhysicsSolver::isBlockInside(int x, int y, int z, Block* def, blockstate_t states, Hitbox* hitbox) {
vec3& pos = hitbox->position;
vec3& half = hitbox->halfsize;
voxel v;
v.states = states;
const auto& boxes = def->rotatable
? def->rt.hitboxes[v.rotation()]
: def->hitboxes;
for (const auto& block_hitbox : boxes) {
vec3 min = block_hitbox.min();
vec3 max = block_hitbox.max();
// 0.00001 - inaccuracy
if (min.x < pos.x+half.x-x-0.00001 && max.x > pos.x-half.x-x+0.00001 &&
min.z < pos.z+half.z-z-0.00001 && max.z > pos.z-half.z-z+0.00001 &&
min.y < pos.y+half.y-y-0.00001 && max.y > pos.y-half.y-y+0.00001)
return true;
}
return false;
}

View File

@ -3,6 +3,7 @@
#include <glm/glm.hpp>
#include "../typedefs.h"
#include "../voxels/Block.h"
class Hitbox;
class Chunks;
@ -26,6 +27,7 @@ public:
const glm::vec3 half,
float stepHeight);
bool isBlockInside(int x, int y, int z, Hitbox* hitbox);
bool isBlockInside(int x, int y, int z, Block* def, blockstate_t states, Hitbox* hitbox);
};
#endif /* PHYSICS_PHYSICSSOLVER_H_ */