X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=src%2Fworld%2FWorld.cpp;h=8b43657d3b58b1520e40c25019762883e6f7e5fb;hb=13e676a6e49128ebc6c63b8dd08bef51d360e8e9;hp=997a5f0b83346238890a8c952e589613b84c2930;hpb=d2fa8ca97d291508ce3812fb052a8255d3190d00;p=blank.git diff --git a/src/world/World.cpp b/src/world/World.cpp index 997a5f0..8b43657 100644 --- a/src/world/World.cpp +++ b/src/world/World.cpp @@ -1,12 +1,13 @@ #include "World.hpp" +#include "ChunkIndex.hpp" #include "EntityCollision.hpp" #include "WorldCollision.hpp" #include "../app/Assets.hpp" -#include "../app/TextureIndex.hpp" #include "../graphics/Format.hpp" #include "../graphics/Viewport.hpp" +#include #include #include #include @@ -14,33 +15,103 @@ namespace blank { -World::World(const Assets &assets, const Config &config, const WorldSave &save) -: block_type() -, block_tex() -, generate(config.gen) -, chunks(config.load, block_type, generate, save) -, player() +World::World(const BlockTypeRegistry &types, const Config &config) +: config(config) +, block_type(types) +, chunks(types) +// TODO: set spawn base and extent from config +, spawn_index(chunks.MakeIndex(Chunk::Pos(0, 0, 0), 3)) +, players() , entities() , light_direction(config.light_direction) , fog_density(config.fog_density) { - TextureIndex tex_index; - assets.LoadBlockTypes("default", block_type, tex_index); - block_tex.Bind(); - assets.LoadTextures(tex_index, block_tex); - block_tex.FilterNearest(); +} + +World::~World() { + chunks.UnregisterIndex(spawn_index); +} - generate.Space(0); - generate.Light(13); - generate.Solids({ 1, 4, 7, 10 }); - player = &AddEntity(); - player->Name("player"); - player->Bounds({ { -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f } }); - player->WorldCollidable(true); - player->Position(config.spawn); +Player World::AddPlayer(const std::string &name) { + for (Player &p : players) { + if (p.entity->Name() == name) { + return { nullptr, nullptr }; + } + } + Entity &entity = AddEntity(); + entity.Name(name); + // TODO: load from save file here + entity.Bounds({ { -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f } }); + entity.WorldCollidable(true); + entity.Position(config.spawn); + ChunkIndex *index = &chunks.MakeIndex(entity.ChunkCoords(), 6); + players.emplace_back(&entity, index); + return players.back(); +} + +Player World::AddPlayer(const std::string &name, std::uint32_t id) { + for (Player &p : players) { + if (p.entity->Name() == name) { + return { nullptr, nullptr }; + } + } + Entity *entity = AddEntity(id); + if (!entity) { + return { nullptr, nullptr }; + } + entity->Name(name); + // TODO: load from save file here + entity->Bounds({ { -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f } }); + entity->WorldCollidable(true); + entity->Position(config.spawn); + ChunkIndex *index = &chunks.MakeIndex(entity->ChunkCoords(), 6); + players.emplace_back(entity, index); + return players.back(); +} - chunks.QueueSurrounding(player->ChunkCoords()); +Entity &World::AddEntity() { + if (entities.empty()) { + entities.emplace_back(); + entities.back().ID(1); + return entities.back(); + } + if (entities.back().ID() < std::numeric_limits::max()) { + std::uint32_t id = entities.back().ID() + 1; + entities.emplace_back(); + entities.back().ID(id); + return entities.back(); + } + std::uint32_t id = 1; + auto position = entities.begin(); + auto end = entities.end(); + while (position != end && position->ID() == id) { + ++id; + ++position; + } + auto entity = entities.emplace(position); + entity->ID(id); + return *entity; +} + +Entity *World::AddEntity(std::uint32_t id) { + if (entities.empty() || entities.back().ID() < id) { + entities.emplace_back(); + entities.back().ID(id); + return &entities.back(); + } + + auto position = entities.begin(); + auto end = entities.end(); + while (position != end && position->ID() < id) { + ++position; + } + if (position != end && position->ID() == id) { + return nullptr; + } + auto entity = entities.emplace(position); + entity->ID(id); + return &*entity; } @@ -51,6 +122,10 @@ struct Candidate { float dist; }; +bool CandidateLess(const Candidate &a, const Candidate &b) { + return a.dist < b.dist; +} + std::vector candidates; } @@ -58,19 +133,22 @@ std::vector candidates; bool World::Intersection( const Ray &ray, const glm::mat4 &M, + const Chunk::Pos &reference, WorldCollision &coll ) { candidates.clear(); - for (Chunk &cur_chunk : chunks.Loaded()) { + for (Chunk &cur_chunk : chunks) { float cur_dist; - if (cur_chunk.Intersection(ray, M * cur_chunk.Transform(player->ChunkCoords()), cur_dist)) { + if (cur_chunk.Intersection(ray, M * cur_chunk.Transform(reference), cur_dist)) { candidates.push_back({ &cur_chunk, cur_dist }); } } if (candidates.empty()) return false; + std::sort(candidates.begin(), candidates.end(), CandidateLess); + coll.chunk = nullptr; coll.block = -1; coll.depth = std::numeric_limits::infinity(); @@ -78,7 +156,7 @@ bool World::Intersection( for (Candidate &cand : candidates) { if (cand.dist > coll.depth) continue; WorldCollision cur_coll; - if (cand.chunk->Intersection(ray, M * cand.chunk->Transform(player->ChunkCoords()), cur_coll)) { + if (cand.chunk->Intersection(ray, M * cand.chunk->Transform(reference), cur_coll)) { if (cur_coll.depth < coll.depth) { coll = cur_coll; } @@ -91,18 +169,18 @@ bool World::Intersection( bool World::Intersection( const Ray &ray, const glm::mat4 &M, + const Entity &reference, EntityCollision &coll ) { coll.entity = nullptr; coll.depth = std::numeric_limits::infinity(); for (Entity &cur_entity : entities) { - // TODO: better check for skipping self (because the check might not be for the player) - if (&cur_entity == player) { + if (&cur_entity == &reference) { continue; } float cur_dist; glm::vec3 cur_normal; - if (blank::Intersection(ray, cur_entity.Bounds(), M * cur_entity.Transform(player->ChunkCoords()), &cur_dist, &cur_normal)) { + if (blank::Intersection(ray, cur_entity.Bounds(), M * cur_entity.Transform(reference.ChunkCoords()), &cur_dist, &cur_normal)) { // TODO: fine grained check goes here? maybe? if (cur_dist < coll.depth) { coll.entity = &cur_entity; @@ -117,15 +195,16 @@ bool World::Intersection( bool World::Intersection(const Entity &e, std::vector &col) { AABB box = e.Bounds(); - glm::mat4 M = e.Transform(player->ChunkCoords()); + Chunk::Pos reference = e.ChunkCoords(); + glm::mat4 M = e.Transform(reference); bool any = false; - for (Chunk &cur_chunk : chunks.Loaded()) { + for (Chunk &cur_chunk : chunks) { if (manhattan_radius(cur_chunk.Position() - e.ChunkCoords()) > 1) { // chunk is not one of the 3x3x3 surrounding the entity // since there's no entity which can extent over 16 blocks, they can be skipped continue; } - if (cur_chunk.Intersection(box, M, cur_chunk.Transform(player->ChunkCoords()), col)) { + if (cur_chunk.Intersection(box, M, cur_chunk.Transform(reference), col)) { any = true; } } @@ -133,16 +212,6 @@ bool World::Intersection(const Entity &e, std::vector &col) { } -Chunk &World::PlayerChunk() { - return chunks.ForceLoad(player->ChunkCoords()); -} - -Chunk &World::Next(const Chunk &to, const glm::ivec3 &dir) { - const Chunk::Pos tgt_pos = to.Position() + dir; - return chunks.ForceLoad(tgt_pos); -} - - namespace { std::vector col; @@ -160,15 +229,16 @@ void World::Update(int dt) { Resolve(entity, col); } } + for (Player &player : players) { + player.chunks->Rebase(player.entity->ChunkCoords()); + } for (auto iter = entities.begin(), end = entities.end(); iter != end;) { if (iter->CanRemove()) { - iter = entities.erase(iter); + iter = RemoveEntity(iter); } else { ++iter; } } - chunks.Rebase(player->ChunkCoords()); - chunks.Update(dt); } void World::Resolve(Entity &e, std::vector &col) { @@ -203,29 +273,27 @@ void World::Resolve(Entity &e, std::vector &col) { e.Move(final_disp); } - -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); - - for (Chunk &chunk : chunks.Loaded()) { - glm::mat4 m(chunk.Transform(player->ChunkCoords())); - chunk_prog.SetM(m); - glm::mat4 mvp(chunk_prog.GetVP() * m); - if (!CullTest(Chunk::Bounds(), mvp)) { - chunk.Draw(); +World::EntityHandle World::RemoveEntity(EntityHandle &eh) { + // check for player + for (auto player = players.begin(), end = players.end(); player != end;) { + if (player->entity == &*eh) { + chunks.UnregisterIndex(*player->chunks); + player = players.erase(player); + } else { + ++player; } } + return entities.erase(eh); +} + +void World::Render(Viewport &viewport) { DirectionalLighting &entity_prog = viewport.EntityProgram(); entity_prog.SetLightDirection(light_direction); entity_prog.SetFogDensity(fog_density); for (Entity &entity : entities) { - entity.Render(entity.ChunkTransform(player->ChunkCoords()), entity_prog); + entity.Render(entity.ChunkTransform(players[0].entity->ChunkCoords()), entity_prog); } }