PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

remove extra functions

Browse Source
This commit is contained in:
MihailRis
2024-08-10 05:48:05 +03:00
parent 93fac9960c
commit a7d6c96a5c
4 changed files with 56 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/voxels/ChunksStorage.cpp
+20 -19
View File
@@ -115,12 +115,12 @@ void ChunksStorage::getVoxels(VoxelsVolume* volume, bool backlight) const {
if (found == chunksMap.end()) {
// no chunk loaded -> filling with BLOCK_VOID
for (int ly = y; ly < y + h; ly++) {
for (int lz = max(z, cz * CHUNK_D);
lz < min(z + d, (cz + 1) * CHUNK_D);
lz++) {
for (int lx = max(x, cx * CHUNK_W);
lx < min(x + w, (cx + 1) * CHUNK_W);
lx++) {
for (int lz = std::max(z, cz * CHUNK_D);
lz < std::min(z + d, (cz + 1) * CHUNK_D);
lz++) {
for (int lx = std::max(x, cx * CHUNK_W);
lx < std::min(x + w, (cx + 1) * CHUNK_W);
lx++) {
uint idx = vox_index(lx - x, ly - y, lz - z, w, d);
voxels[idx].id = BLOCK_VOID;
lights[idx] = 0;
@@ -132,12 +132,12 @@ void ChunksStorage::getVoxels(VoxelsVolume* volume, bool backlight) const {
const voxel* cvoxels = chunk->voxels;
const light_t* clights = chunk->lightmap.getLights();
for (int ly = y; ly < y + h; ly++) {
for (int lz = max(z, cz * CHUNK_D);
lz < min(z + d, (cz + 1) * CHUNK_D);
lz++) {
for (int lx = max(x, cx * CHUNK_W);
lx < min(x + w, (cx + 1) * CHUNK_W);
lx++) {
for (int lz = std::max(z, cz * CHUNK_D);
lz < std::min(z + d, (cz + 1) * CHUNK_D);
lz++) {
for (int lx = std::max(x, cx * CHUNK_W);
lx < std::min(x + w, (cx + 1) * CHUNK_W);
lx++) {
uint vidx = vox_index(lx - x, ly - y, lz - z, w, d);
uint cidx = vox_index(
lx - cx * CHUNK_W,
@@ -149,17 +149,18 @@ void ChunksStorage::getVoxels(VoxelsVolume* volume, bool backlight) const {
voxels[vidx] = cvoxels[cidx];
light_t light = clights[cidx];
if (backlight) {
const auto& block =
indices->blocks.require(voxels[vidx].id);
if (block.lightPassing) { //-V522
const auto block =
indices->blocks.get(voxels[vidx].id);
if (block && block->lightPassing) {
light = Lightmap::combine(
min(15,
std::min(15,
Lightmap::extract(light, 0) + 1),
min(15,
std::min(15,
Lightmap::extract(light, 1) + 1),
min(15,
std::min(15,
Lightmap::extract(light, 2) + 1),
min(15, Lightmap::extract(light, 3))
std::min(15,
static_cast<int>(Lightmap::extract(light, 3)))
);
}
}