X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FWorld.cpp;h=73a870dc28b7e1d9002d7efce6058a2f3894b71f;hb=7bb75960dbf9bfdee9ac865384aca81791b3da5c;hp=d51520ef5b2828c1d22902e1e00902bccb504884;hpb=955fbb45dedb570520fc45d2ce69f420bed2ad08;p=blank.git diff --git a/src/world/World.cpp b/src/world/World.cpp index d51520e..73a870d 100644 --- a/src/world/World.cpp +++ b/src/world/World.cpp @@ -1,8 +1,9 @@ #include "World.hpp" #include "WorldCollision.hpp" -#include "../graphics/BlockLighting.hpp" -#include "../graphics/DirectionalLighting.hpp" +#include "../app/Assets.hpp" +#include "../graphics/Format.hpp" +#include "../graphics/Viewport.hpp" #include #include @@ -12,11 +13,12 @@ namespace blank { -World::World(const Config &config) +World::World(const Assets &assets, const Config &config) : blockType() , blockShape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f }}) , stairShape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f }}, { 0.0f, 0.0f }) , slabShape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.0f, 0.5f }}) +, block_tex() , generate(config.gen) , chunks(config.load, blockType, generate) , player() @@ -27,8 +29,18 @@ World::World(const Config &config) BlockType::Faces slab_fill = { false, true, false, false, false, false }; BlockType::Faces stair_fill = { false, true, false, false, false, true }; + block_tex.Bind(); + block_tex.Reserve(16, 16, 4, Format()); + assets.LoadTexture("debug", block_tex, 0); + assets.LoadTexture("rock-1", block_tex, 1); + assets.LoadTexture("rock-2", block_tex, 2); + assets.LoadTexture("rock-3", block_tex, 3); + block_tex.FilterNearest(); + { // white block BlockType type(true, { 1.0f, 1.0f, 1.0f }, &blockShape); + type.texture = 1; + type.label = "White Block"; type.block_light = true; type.collision = true; type.collide_block = true; @@ -37,6 +49,8 @@ World::World(const Config &config) } { // white slab BlockType type(true, { 1.0f, 1.0f, 1.0f }, &slabShape); + type.texture = 1; + type.label = "White Slab"; type.block_light = true; type.collision = true; type.collide_block = true; @@ -45,6 +59,8 @@ World::World(const Config &config) } { // white stair BlockType type(true, { 1.0f, 1.0f, 1.0f }, &stairShape); + type.texture = 1; + type.label = "White Stair"; type.block_light = true; type.collision = true; type.collide_block = true; @@ -54,6 +70,8 @@ World::World(const Config &config) { // red block BlockType type(true, { 1.0f, 0.0f, 0.0f }, &blockShape); + type.texture = 3; + type.label = "Red Block"; type.block_light = true; type.collision = true; type.collide_block = true; @@ -62,6 +80,8 @@ World::World(const Config &config) } { // red slab BlockType type(true, { 1.0f, 0.0f, 0.0f }, &slabShape); + type.texture = 3; + type.label = "Red Slab"; type.block_light = true; type.collision = true; type.collide_block = true; @@ -70,6 +90,8 @@ World::World(const Config &config) } { // red stair BlockType type(true, { 1.0f, 0.0f, 0.0f }, &stairShape); + type.texture = 3; + type.label = "Red Stair"; type.block_light = true; type.collision = true; type.collide_block = true; @@ -79,6 +101,8 @@ World::World(const Config &config) { // green block BlockType type(true, { 0.0f, 1.0f, 0.0f }, &blockShape); + type.texture = 1; + type.label = "Green Block"; type.block_light = true; type.collision = true; type.collide_block = true; @@ -87,6 +111,8 @@ World::World(const Config &config) } { // green slab BlockType type(true, { 0.0f, 1.0f, 0.0f }, &slabShape); + type.texture = 1; + type.label = "Green Slab"; type.block_light = true; type.collision = true; type.collide_block = true; @@ -95,6 +121,8 @@ World::World(const Config &config) } { // green stair BlockType type(true, { 0.0f, 1.0f, 0.0f }, &stairShape); + type.texture = 1; + type.label = "Green Stair"; type.block_light = true; type.collision = true; type.collide_block = true; @@ -104,6 +132,8 @@ World::World(const Config &config) { // blue block BlockType type(true, { 0.0f, 0.0f, 1.0f }, &blockShape); + type.texture = 3; + type.label = "Blue Block"; type.block_light = true; type.collision = true; type.collide_block = true; @@ -112,6 +142,8 @@ World::World(const Config &config) } { // blue slab BlockType type(true, { 0.0f, 0.0f, 1.0f }, &slabShape); + type.texture = 3; + type.label = "Blue Slab"; type.block_light = true; type.collision = true; type.collide_block = true; @@ -120,6 +152,8 @@ World::World(const Config &config) } { // blue stair BlockType type(true, { 0.0f, 0.0f, 1.0f }, &stairShape); + type.texture = 3; + type.label = "Blue Stair"; type.block_light = true; type.collision = true; type.collide_block = true; @@ -129,6 +163,8 @@ World::World(const Config &config) { // glowing yellow block BlockType type(true, { 1.0f, 1.0f, 0.0f }, &blockShape); + type.texture = 2; + type.label = "Light"; type.luminosity = 15; type.block_light = true; type.collision = true; @@ -137,6 +173,18 @@ World::World(const Config &config) blockType.Add(type); } + { // the mysterious debug cube + BlockType type(true, { 1.0f, 1.0f, 1.0f }, &blockShape); + type.texture = 0; + type.label = "Debug Cube"; + type.luminosity = 0; + type.block_light = true; + type.collision = true; + type.collide_block = true; + type.fill = block_fill; + blockType.Add(type); + } + generate.Space(0); generate.Light(13); generate.Solids({ 1, 4, 7, 10 }); @@ -222,7 +270,7 @@ Chunk &World::PlayerChunk() { return chunks.ForceLoad(player->ChunkCoords()); } -Chunk &World::Next(const Chunk &to, const glm::tvec3 &dir) { +Chunk &World::Next(const Chunk &to, const glm::ivec3 &dir) { const Chunk::Pos tgt_pos = to.Position() + dir; return chunks.ForceLoad(tgt_pos); } @@ -245,6 +293,13 @@ void World::Update(int dt) { Resolve(entity, col); } } + for (auto iter = entities.begin(), end = entities.end(); iter != end;) { + if (iter->CanRemove()) { + iter = entities.erase(iter); + } else { + ++iter; + } + } chunks.Rebase(player->ChunkCoords()); chunks.Update(dt); } @@ -282,10 +337,12 @@ void World::Resolve(Entity &e, std::vector &col) { } -void World::Render(BlockLighting &chunk_prog, DirectionalLighting &entity_prog) { - chunk_prog.Activate(); +void World::Render(Viewport &viewport) { + viewport.WorldPosition(player->Transform(player->ChunkCoords())); + + BlockLighting &chunk_prog = viewport.ChunkProgram(); + chunk_prog.SetTexture(block_tex); chunk_prog.SetFogDensity(fog_density); - chunk_prog.SetView(glm::inverse(player->Transform(player->ChunkCoords()))); for (Chunk &chunk : chunks.Loaded()) { glm::mat4 m(chunk.Transform(player->ChunkCoords())); @@ -296,10 +353,9 @@ void World::Render(BlockLighting &chunk_prog, DirectionalLighting &entity_prog) } } - entity_prog.Activate(); + DirectionalLighting &entity_prog = viewport.EntityProgram(); entity_prog.SetLightDirection(light_direction); entity_prog.SetFogDensity(fog_density); - entity_prog.SetView(glm::inverse(player->Transform(player->ChunkCoords()))); for (Entity &entity : entities) { if (entity.HasShape()) {