Aurailus
/
Zepha
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix blocklight propogation issue non-issue

master
Nicole Collings 2020-06-16 15:53:37 -07:00
parent f5b29e0219
commit 9dfa361833
8 changed files with 75 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
assets/shader/world/world.vs
View File

@ -30,7 +30,6 @@ out VS_OUT {
vec3 unpackFloat(float src) { return vec3(fract(src) * 2.0f - 1.0f, fract(src * 256.f) * 2.0f - 1.0f, fract(src * 65536.f) * 2.0f - 1.0f); }
void main() {
float sunlightIntensity = 1;
vec3 blockLightColor = (aLight.xyz / MAX_BLOCKLIGHT) * vec3(1 + sunlightIntensity / 4);
vec3 sunlightColor = clamp(sunlightIntensity * 1.25 * vec3(1, 1, 1) * (aLight.w / 15.0), 0, 1);

119
src/world/Dimension.cpp
View File

@ -10,73 +10,68 @@ bool Dimension::setBlock(glm::ivec3 pos, unsigned int block) {
auto chunk = getChunk(Space::Chunk::world::fromBlock(pos));
auto &def = defs.blockFromId(block);
// Remove light when placing solid blocks.
glm::ivec4 oldLight = chunk->getLight(Space::Block::index(pos));
if (!def.lightPropagates && oldLight.x + oldLight.y + oldLight.z != 0) removeBlockLight(pos);
// Add light when placing light emitting blocks.
glm::ivec3 newLight = def.lightSource;
if (newLight.x > oldLight.x || newLight.y > oldLight.y || newLight.z > oldLight.z) addBlockLight(pos, newLight);
// Reflow light when a transparent block is placed.
if (def.lightPropagates) reflowLightAroundTransparent(pos);
if (oldLight.x + oldLight.y + oldLight.z != 0) removeBlockLight(pos);
if (newLight.x + newLight.y + newLight.z != 0) addBlockLight(pos, newLight);
// Block sunlight when a solid block is placed.
if (def.lightPropagates) reflowLightThroughTransparent(pos);
if (!def.lightPropagates && getLight(pos, chunk.get()).w != 0) reflowSunlightAroundSolid(pos);
return true;
}
void Dimension::calculateEdgeLight(glm::ivec3 mbPos) {
for (auto i = 0; i < 64; i++) {
glm::ivec3 l = Space::Chunk::fromIndex(i);
glm::ivec3 chunkPos = mbPos * 4 + l;
auto edges = std::array<bool, 6> { l.x == 0, l.y == 0, l.z == 0,
l.x == Space::MAPBLOCK_SIZE - 1, l.y == Space::MAPBLOCK_SIZE - 1, l.z == Space::MAPBLOCK_SIZE - 1};
// Pull light from above
if (edges[4]) {
if (!getChunk(chunkPos + glm::ivec3 {0, 1, 0})) continue;
auto chunk = getChunk(chunkPos).get();
for (unsigned int j = 0; j < 16; j++) {
for (unsigned int k = 0; k < 16; k++) {
glm::ivec3 belowPos = chunkPos * 16 + glm::ivec3 {j, 15, k};
glm::ivec3 abovePos = belowPos + glm::ivec3 {0, 1, 0};
unsigned int lightAbove = getLight(abovePos).w;
unsigned int lightBelow = getLight(belowPos).w;
if (lightBelow > lightAbove) {
unsigned int ind = Space::Block::index(belowPos);
lightRemoveQueue[SUNLIGHT_CHANNEL].emplace(ind, lightBelow, chunk);
chunk->setSunlight(ind, 0);
}
}
}
}
// Push light below
if (edges[1]) {
auto belowChunk = getChunk(chunkPos + glm::ivec3 {0, -1, 0}).get();
if (!belowChunk) continue;
for (unsigned int j = 0; j < 16; j++) {
for (unsigned int k = 0; k < 16; k++) {
glm::ivec3 abovePos = chunkPos * 16 + glm::ivec3 {j, 0, k};
glm::ivec3 belowPos = abovePos + glm::ivec3 {0, -1, 0};
unsigned int lightAbove = getLight(abovePos).w;
unsigned int lightBelow = getLight(belowPos).w;
if (lightBelow > lightAbove) {
unsigned int ind = Space::Block::index(belowPos);
lightRemoveQueue[SUNLIGHT_CHANNEL].emplace(ind, lightBelow, belowChunk);
belowChunk->setSunlight(ind, 0);
}
}
}
}
}
// for (auto i = 0; i < 64; i++) {
// glm::ivec3 l = Space::Chunk::fromIndex(i);
// glm::ivec3 chunkPos = mbPos * 4 + l;
//
// auto edges = std::array<bool, 6> { l.x == 0, l.y == 0, l.z == 0,
// l.x == Space::MAPBLOCK_SIZE - 1, l.y == Space::MAPBLOCK_SIZE - 1, l.z == Space::MAPBLOCK_SIZE - 1};
//
// // Pull light from above
// if (edges[4]) {
// if (!getChunk(chunkPos + glm::ivec3 {0, 1, 0})) continue;
// auto chunk = getChunk(chunkPos).get();
//
// for (unsigned int j = 0; j < 16; j++) {
// for (unsigned int k = 0; k < 16; k++) {
// glm::ivec3 belowPos = chunkPos * 16 + glm::ivec3 {j, 15, k};
// glm::ivec3 abovePos = belowPos + glm::ivec3 {0, 1, 0};
//
// unsigned int lightAbove = getLight(abovePos).w;
// unsigned int lightBelow = getLight(belowPos).w;
// if (lightBelow > lightAbove) {
// unsigned int ind = Space::Block::index(belowPos);
// lightRemoveQueue[SUNLIGHT_CHANNEL].emplace(ind, lightBelow, chunk);
// chunk->setSunlight(ind, 0);
// }
// }
// }
// }
//
// // Push light below
// if (edges[1]) {
// auto belowChunk = getChunk(chunkPos + glm::ivec3 {0, -1, 0}).get();
// if (!belowChunk) continue;
//
// for (unsigned int j = 0; j < 16; j++) {
// for (unsigned int k = 0; k < 16; k++) {
// glm::ivec3 abovePos = chunkPos * 16 + glm::ivec3 {j, 0, k};
// glm::ivec3 belowPos = abovePos + glm::ivec3 {0, -1, 0};
//
// unsigned int lightAbove = getLight(abovePos).w;
// unsigned int lightBelow = getLight(belowPos).w;
// if (lightBelow > lightAbove) {
// unsigned int ind = Space::Block::index(belowPos);
// lightRemoveQueue[SUNLIGHT_CHANNEL].emplace(ind, lightBelow, belowChunk);
// belowChunk->setSunlight(ind, 0);
// }
// }
// }
// }
// }
propogateRemoveNodes();
}
@ -102,7 +97,7 @@ std::unordered_set<glm::ivec3, Vec::ivec3> Dimension::propogateAddNodes() {
chunk->dirty = true;
}
bool sunDown = channel == SUNLIGHT_CHANNEL && lightLevel == 15 && i.y == -1;
bool sunDown = (channel == SUNLIGHT_CHANNEL && lightLevel == 15 && i.y == -1);
if (defs.blockFromId(chunk->getBlock(ind)).lightPropagates && (sunDown || chunk->getLight(ind, channel) + 2 <= lightLevel)) {
int subtract = sunDown ? 0 : 1;
chunk->setLight(ind, channel, lightLevel - subtract);
@ -138,9 +133,9 @@ std::unordered_set<glm::ivec3, Vec::ivec3> Dimension::propogateRemoveNodes() {
}
unsigned char checkLight = chunk->getLight(ind, channel);
if (checkLight != 0 && (checkLight < node.value || (i.y == -1 && node.value == 15))) {
unsigned int replaceLight = channel == SUNLIGHT_CHANNEL ? 0 :
defs.blockFromId(chunk->getBlock(Space::Block::index(check))).lightSource[channel];
if (checkLight != 0 && (checkLight < node.value || (channel == SUNLIGHT_CHANNEL && i.y == -1 && node.value == 15))) {
unsigned int replaceLight = (channel == SUNLIGHT_CHANNEL ? 0 :
defs.blockFromId(chunk->getBlock(Space::Block::index(check))).lightSource[channel]);
chunk->setLight(ind, channel, replaceLight);
if (replaceLight) lightAddQueue[channel].emplace(ind, chunk);
@ -195,7 +190,7 @@ void Dimension::removeBlockLight(glm::ivec3 pos) {
propogateRemoveNodes();
}
void Dimension::reflowLightAroundTransparent(glm::ivec3 pos) {
void Dimension::reflowLightThroughTransparent(glm::ivec3 pos) {
glm::ivec4 placeLight {};
const static std::array<glm::ivec3, 6> checks = { glm::ivec3 {-1, 0, 0}, {1, 0, 0}, {0, -1, 0}, {0, 1, 0}, {0, 0, -1}, {0, 0, 1} };

2
src/world/Dimension.h
View File

@ -37,7 +37,7 @@ private:
inline void removeBlockLight(glm::ivec3 pos);
// Special methods to recalculate lights after world manipulation.
inline void reflowLightAroundTransparent(glm::ivec3 pos);
inline void reflowLightThroughTransparent(glm::ivec3 pos);
inline void reflowSunlightAroundSolid(glm::ivec3 pos);
struct LightAddNode {

3
subgames/zeus/mods/zeus_default/script/blocks/_index.venus
View File

@ -8,4 +8,5 @@ runfile(_PATH .. "sandstone")
runfile(_PATH .. "stone")
runfile(_PATH .. "tallgrass")
runfile(_PATH .. "water")
runfile(_PATH .. "wood")
runfile(_PATH .. "wood")
runfile(_PATH .. "light")

4
subgames/zeus/mods/zeus_default/script/blocks/cobblestone.venus
View File

@ -6,7 +6,5 @@ zepha.register_block("zeus:default:cobblestone", {
hand = 14,
pick = 3
},
yields = "zeus:default:cobblestone",
light_source = { 5, 20, 20 },
light_propagates = true,
yields = "zeus:default:cobblestone"
})

2
subgames/zeus/mods/zeus_default/script/blocks/dirt.venus
View File

@ -8,6 +8,4 @@ zepha.register_block("zeus:default:dirt", {
pick = 2
},
yields = "zeus:default:dirt",
light_source = { 30, 5, 5 },
light_propagates = true,
})

12
subgames/zeus/mods/zeus_default/script/blocks/light.lua Normal file
View File

@ -0,0 +1,12 @@
zepha.register_block("zeus:default:light", {
name = "Lightbulb Lol",
model = "base:block",
textures = {"zeus:default:light"},
toughness = {
hand = 3,
shovel = 1,
pick = 2
},
yields = "zeus:default:light",
light_source = {0, 31, 31}
})

2
subgames/zeus/mods/zeus_inventory/script/register.venus
View File

@ -19,6 +19,8 @@ zepha.register_on("new_player", (p) => {
inv:get_list("hot_wheel_6")
}
invs[1]:add_stack({"zeus:default:light", 1})
foreach inv in invs {
inv.allow_take = fn() {
return 0