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

fix potential null dereferences on incorrect block.* functions use & refactor

Browse source
This commit is contained in:
MihailRis 2024-11-06 02:55:37 +03:00
parent 8ef7d43603
commit 961773c9f9
3 changed files with 43 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/voxels/Chunks.hpp
View file

@ -32,7 +32,10 @@ class Chunks {
const Block& def, blockstate state, int x, int y, int z
);
void setRotationExtended(
const Block& def, blockstate state, glm::ivec3 origin, uint8_t rotation
const Block& def,
blockstate state,
const glm::ivec3& origin,
uint8_t rotation
);
util::AreaMap2D<std::shared_ptr<Chunk>, int32_t> areaMap;
@ -55,12 +58,13 @@ public:
Chunk* getChunk(int32_t x, int32_t z);
Chunk* getChunkByVoxel(int32_t x, int32_t y, int32_t z);
voxel* get(int32_t x, int32_t y, int32_t z) const;
voxel& require(int32_t x, int32_t y, int32_t z) const;
inline voxel* get(glm::ivec3 pos) {
inline voxel* get(const glm::ivec3& pos) {
return get(pos.x, pos.y, pos.z);
}
inline const voxel* get(glm::ivec3 pos) const {
inline const voxel* get(const glm::ivec3& pos) const {
return get(pos.x, pos.y, pos.z);
}
@ -85,15 +89,15 @@ public:
bool checkReplaceability(
const Block& def,
blockstate state,
glm::ivec3 coord,
const glm::ivec3& coord,
blockid_t ignore = 0
);
void setRotation(int32_t x, int32_t y, int32_t z, uint8_t rotation);
voxel* rayCast(
glm::vec3 start,
glm::vec3 dir,
const glm::vec3& start,
const glm::vec3& dir,
float maxLength,
glm::vec3& end,
glm::ivec3& norm,
@ -101,7 +105,9 @@ public:
std::set<blockid_t> filter = {}
);
glm::vec3 rayCastToObstacle(glm::vec3 start, glm::vec3 dir, float maxDist);
glm::vec3 rayCastToObstacle(
const glm::vec3& start, const glm::vec3& dir, float maxDist
);
const AABB* isObstacleAt(float x, float y, float z) const;