add some light blocks to generated surfaces

[blank.git] / src / world.cpp

diff --git a/src/world.cpp b/src/world.cpp
index 27daecd3f27c78ffad686f5a4b0c2b494930b1c7..e4e382642be47a7b225d1abc33ad90a0d1889501 100644 (file)
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -20,69 +20,90 @@ World::World()
 
        { // white block
                BlockType type(true, { 1.0f, 1.0f, 1.0f }, &blockShape);
+               type.block_light = true;
                type.fill = block_fill;
                blockType.Add(type);
        }
        { // white slab
                BlockType type(true, { 1.0f, 1.0f, 1.0f }, &slabShape);
+               type.block_light = true;
                type.fill = slab_fill;
                blockType.Add(type);
        }
        { // white stair
                BlockType type(true, { 1.0f, 1.0f, 1.0f }, &stairShape);
+               type.block_light = true;
                type.fill = stair_fill;
                blockType.Add(type);
        }
 
        { // red block
                BlockType type(true, { 1.0f, 0.0f, 0.0f }, &blockShape);
+               type.block_light = true;
                type.fill = block_fill;
                blockType.Add(type);
        }
        { // red slab
                BlockType type(true, { 1.0f, 0.0f, 0.0f }, &slabShape);
+               type.block_light = true;
                type.fill = slab_fill;
                blockType.Add(type);
        }
        { // red stair
                BlockType type(true, { 1.0f, 0.0f, 0.0f }, &stairShape);
+               type.block_light = true;
                type.fill = stair_fill;
                blockType.Add(type);
        }
 
        { // green block
                BlockType type(true, { 0.0f, 1.0f, 0.0f }, &blockShape);
+               type.block_light = true;
                type.fill = block_fill;
                blockType.Add(type);
        }
        { // green slab
                BlockType type(true, { 0.0f, 1.0f, 0.0f }, &slabShape);
+               type.block_light = true;
                type.fill = slab_fill;
                blockType.Add(type);
        }
        { // green stair
                BlockType type(true, { 0.0f, 1.0f, 0.0f }, &stairShape);
+               type.block_light = true;
                type.fill = stair_fill;
                blockType.Add(type);
        }
 
        { // blue block
                BlockType type(true, { 0.0f, 0.0f, 1.0f }, &blockShape);
+               type.block_light = true;
                type.fill = block_fill;
                blockType.Add(type);
        }
        { // blue slab
                BlockType type(true, { 0.0f, 0.0f, 1.0f }, &slabShape);
+               type.block_light = true;
                type.fill = slab_fill;
                blockType.Add(type);
        }
        { // blue stair
                BlockType type(true, { 0.0f, 0.0f, 1.0f }, &stairShape);
+               type.block_light = true;
                type.fill = stair_fill;
                blockType.Add(type);
        }
 
+       { // glowing yellow block
+               BlockType type(true, { 1.0f, 1.0f, 0.0f }, &blockShape);
+               type.luminosity = 10;
+               type.block_light = true;
+               type.fill = block_fill;
+               blockType.Add(type);
+       }
+
        generate.Space(0);
+       generate.Light(13);
        generate.Solids({ 1, 4, 7, 10 });
 
        player = &AddEntity();
@@ -157,6 +178,10 @@ bool World::Intersection(
 }
 
 
+Chunk &World::PlayerChunk() {
+       return chunks.ForceLoad(player->ChunkCoords());
+}
+
 Chunk &World::Next(const Chunk &to, const glm::tvec3<int> &dir) {
        const Chunk::Pos tgt_pos = to.Position() + dir;
        return chunks.ForceLoad(tgt_pos);
@@ -174,6 +199,11 @@ void World::Update(int dt) {
 
 void World::Render(DirectionalLighting &program) {
        program.SetLightDirection({ -1.0f, -3.0f, -2.0f });
+       // fade out reaches 1/e (0.3679) at 1/fog_density,
+       // gets less than 0.01 at e/(2 * fog_density)
+       // I chose 0.011 because it yields 91 and 124 for those, so
+       // slightly less than 6 and 8 chunks
+       program.SetFogDensity(0.011f);
        program.SetView(glm::inverse(player->Transform(player->ChunkCoords())));
 
        for (Chunk &chunk : chunks.Loaded()) {