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

add "include_non_selectable" parameter to blocks raycast

Browse source
This commit is contained in:
clasher113 2026-01-05 23:05:47 +02:00
parent ce769143f8
commit 8f1739c85b
10 changed files with 57 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/voxels/Chunks.cpp
View file

@ -215,10 +215,11 @@ voxel* Chunks::rayCast(
glm::vec3& end,
glm::ivec3& norm,
glm::ivec3& iend,
std::set<blockid_t> filter
std::set<blockid_t> filter,
bool includeNonSelectable
) const {
return blocks_agent::raycast(
*this, start, dir, maxDist, end, norm, iend, std::move(filter)
*this, start, dir, maxDist, end, norm, iend, std::move(filter), includeNonSelectable
);
}

3
src/voxels/Chunks.hpp
View file

@ -111,7 +111,8 @@ public:
glm::vec3& end,
glm::ivec3& norm,
glm::ivec3& iend,
std::set<blockid_t> filter = {}
std::set<blockid_t> filter = {},
bool includeNonSelectable = false
) const;
glm::vec3 rayCastToObstacle(

16
src/voxels/blocks_agent.cpp
View file

@ -221,7 +221,8 @@ static inline voxel* raycast_blocks(
glm::vec3& end,
glm::ivec3& norm,
glm::ivec3& iend,
std::set<blockid_t> filter
std::set<blockid_t> filter,
bool includeNonSelectable
) {
const auto& blocks = chunks.getContentIndices().blocks;
float px = start.x;
@ -264,7 +265,8 @@ static inline voxel* raycast_blocks(
}
const auto& def = blocks.require(voxel->id);
if (def.selectable && (filter.empty() || filter.find(def.rt.id) == filter.end())) {
if (voxel->id != BLOCK_AIR && (def.selectable || includeNonSelectable) &&
(filter.empty() || filter.find(def.rt.id) == filter.end())) {
end.x = px + t * dx;
end.y = py + t * dy;
end.z = pz + t * dz;
@ -361,9 +363,10 @@ voxel* blocks_agent::raycast(
glm::vec3& end,
glm::ivec3& norm,
glm::ivec3& iend,
std::set<blockid_t> filter
std::set<blockid_t> filter,
bool includeNonSelectable
) {
return raycast_blocks(chunks, start, dir, maxDist, end, norm, iend, filter);
return raycast_blocks(chunks, start, dir, maxDist, end, norm, iend, filter, includeNonSelectable);
}
voxel* blocks_agent::raycast(
@ -374,9 +377,10 @@ voxel* blocks_agent::raycast(
glm::vec3& end,
glm::ivec3& norm,
glm::ivec3& iend,
std::set<blockid_t> filter
std::set<blockid_t> filter,
bool includeNonSelectable
) {
return raycast_blocks(chunks, start, dir, maxDist, end, norm, iend, filter);
return raycast_blocks(chunks, start, dir, maxDist, end, norm, iend, filter, includeNonSelectable);
}
// reduce nesting on next modification

8
src/voxels/blocks_agent.hpp
View file

@ -419,6 +419,7 @@ inline void set_rotation(
/// @param norm [out] surface normal vector
/// @param iend [out] ray end integer position (voxel position + normal)
/// @param filter filtered ids
/// @param includeNonSelectable will non-selectable blocks be included
/// @return voxel pointer or nullptr
voxel* raycast(
const Chunks& chunks,
@ -428,7 +429,8 @@ voxel* raycast(
glm::vec3& end,
glm::ivec3& norm,
glm::ivec3& iend,
std::set<blockid_t> filter
std::set<blockid_t> filter,
bool includeNonSelectable
);
/// @brief Cast ray to a selectable block with filter based on id.
@ -440,6 +442,7 @@ voxel* raycast(
/// @param norm [out] surface normal vector
/// @param iend [out] ray end integer position (voxel position + normal)
/// @param filter filtered ids
/// @param includeNonSelectable will non-selectable blocks be included
/// @return voxel pointer or nullptr
voxel* raycast(
const GlobalChunks& chunks,
@ -449,7 +452,8 @@ voxel* raycast(
glm::vec3& end,
glm::ivec3& norm,
glm::ivec3& iend,
std::set<blockid_t> filter
std::set<blockid_t> filter,
bool includeNonSelectable
);
void get_voxels(const Chunks& chunks, VoxelsVolume* volume, bool backlight=false);