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

Merge branch 'main' into particles-first

Browse Source
This commit is contained in:
MihailRis 2024-11-04 23:36:58 +03:00
commit eba214f15e
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/content/ContentLoader.cpp
View File

@ -286,9 +286,9 @@ void ContentLoader::loadBlock(
// block light emission [r, g, b] where r,g,b in range [0..15]
if (auto found = root.at("emission")) {
const auto& emissionarr = *found;
def.emission[0] = emissionarr[0].asInteger();
def.emission[1] = emissionarr[1].asInteger();
def.emission[2] = emissionarr[2].asInteger();
for (size_t i = 0; i < 3; i++) {
def.emission[i] = std::clamp(emissionarr[i].asInteger(), static_cast<integer_t>(0), static_cast<integer_t>(15));
}
}
// block size

20
src/lighting/LightSolver.cpp
View File

@ -10,7 +10,7 @@
#include "voxels/Block.hpp"
LightSolver::LightSolver(const ContentIndices* contentIds, Chunks* chunks, int channel)
: contentIds(contentIds),
: blockDefs(contentIds->blocks.getDefs()),
chunks(chunks),
channel(channel) {
}
@ -18,10 +18,14 @@ LightSolver::LightSolver(const ContentIndices* contentIds, Chunks* chunks, int c
void LightSolver::add(int x, int y, int z, int emission) {
if (emission <= 1)
return;
Chunk* chunk = chunks->getChunkByVoxel(x, y, z);
if (chunk == nullptr)
return;
ubyte light = chunk->lightmap.get(x-chunk->x*CHUNK_W, y, z-chunk->z*CHUNK_D, channel);
if (emission < light) return;
addqueue.push(lightentry {x, y, z, ubyte(emission)});
Chunk* chunk = chunks->getChunkByVoxel(x, y, z);
chunk->flags.modified = true;
chunk->lightmap.set(x-chunk->x*CHUNK_W, y, z-chunk->z*CHUNK_D, channel, emission);
}
@ -72,8 +76,17 @@ void LightSolver::solve(){
ubyte light = chunk->lightmap.get(lx,y,lz, channel);
if (light != 0 && light == entry.light-1){
voxel* vox = chunks->get(x, y, z);
if (vox && vox->id != 0) {
const Block* block = blockDefs[vox->id];
if (uint8_t emission = block->emission[channel]) {
addqueue.push(lightentry {x, y, z, emission});
chunk->lightmap.set(lx, y, lz, channel, emission);
}
else chunk->lightmap.set(lx, y, lz, channel, 0);
}
else chunk->lightmap.set(lx, y, lz, channel, 0);
remqueue.push(lightentry {x, y, z, light});
chunk->lightmap.set(lx, y, lz, channel, 0);
}
else if (light >= entry.light){
addqueue.push(lightentry {x, y, z, light});
@ -82,7 +95,6 @@ void LightSolver::solve(){
}
}
const Block* const* blockDefs = contentIds->blocks.getDefs();
while (!addqueue.empty()){
const lightentry entry = addqueue.front();
addqueue.pop();

3
src/lighting/LightSolver.hpp
View File

@ -4,6 +4,7 @@
class Chunks;
class ContentIndices;
class Block;
struct lightentry {
int x;
@ -15,7 +16,7 @@ struct lightentry {
class LightSolver {
std::queue<lightentry> addqueue;
std::queue<lightentry> remqueue;
const ContentIndices* const contentIds;
const Block* const* blockDefs;
Chunks* chunks;
int channel;
public: