diff options
Diffstat (limited to 'game/shared/world/voxel_registry.cc')
| -rw-r--r-- | game/shared/world/voxel_registry.cc | 194 |
1 files changed, 31 insertions, 163 deletions
diff --git a/game/shared/world/voxel_registry.cc b/game/shared/world/voxel_registry.cc index b44845e..573a606 100644 --- a/game/shared/world/voxel_registry.cc +++ b/game/shared/world/voxel_registry.cc @@ -2,195 +2,63 @@ #include "shared/world/voxel_registry.hh"
-#include "core/math/crc64.hh"
+static std::uint64_t registry_checksum = 0U;
+emhash8::HashMap<std::string, voxel_id> world::voxel_registry::names;
+std::vector<std::unique_ptr<world::Voxel>> world::voxel_registry::voxels;
-std::unordered_map<std::string, world::VoxelInfoBuilder> world::voxel_registry::builders = {};
-std::unordered_map<std::string, voxel_id> world::voxel_registry::names = {};
-std::vector<std::shared_ptr<world::VoxelInfo>> world::voxel_registry::voxels = {};
-
-world::VoxelInfoBuilder::VoxelInfoBuilder(std::string_view name, voxel_type type, bool animated, bool blending)
-{
- prototype.name = name;
- prototype.type = type;
- prototype.animated = animated;
- prototype.blending = blending;
-
- switch(type) {
- case voxel_type::CUBE:
- prototype.textures.resize(static_cast<std::size_t>(voxel_face::CUBE__NR));
- break;
- case voxel_type::CROSS:
- prototype.textures.resize(static_cast<std::size_t>(voxel_face::CROSS__NR));
- break;
- case voxel_type::MODEL:
- // Custom models should use a different texture
- // resource management that is not a voxel atlas
- // TODO: actually implement custom models lol
- prototype.textures.resize(0);
- break;
- default:
- // Something really bad should happen if we end up here.
- // The outside code would static_cast an int to VoxelType
- // and possibly fuck a lot of things up to cause this
- spdlog::critical("voxel_registry: {}: unknown voxel type {}", name, static_cast<int>(type));
- std::terminate();
- }
-
- // Physics properties
- prototype.touch_type = voxel_touch::SOLID;
- prototype.touch_values = glm::fvec3(0.0f, 0.0f, 0.0f);
- prototype.surface = voxel_surface::DEFAULT;
-
- // Things set in future by item_def
- prototype.item_pick = NULL_ITEM_ID;
-}
-
-world::VoxelInfoBuilder& world::VoxelInfoBuilder::add_texture_default(std::string_view texture)
+static void recalculate_checksum(void)
{
- default_texture.paths.push_back(std::string(texture));
- return *this;
-}
+ registry_checksum = 0U;
-world::VoxelInfoBuilder& world::VoxelInfoBuilder::add_texture(voxel_face face, std::string_view texture)
-{
- const auto index = static_cast<std::size_t>(face);
- prototype.textures[index].paths.push_back(std::string(texture));
- return *this;
-}
-
-world::VoxelInfoBuilder& world::VoxelInfoBuilder::set_touch(voxel_touch type, const glm::fvec3& values)
-{
- prototype.touch_type = type;
- prototype.touch_values = values;
- return *this;
-}
-
-world::VoxelInfoBuilder& world::VoxelInfoBuilder::set_surface(voxel_surface surface)
-{
- prototype.surface = surface;
- return *this;
+ for(const auto& voxel : world::voxel_registry::voxels) {
+ registry_checksum = voxel->get_checksum(registry_checksum);
+ }
}
-voxel_id world::VoxelInfoBuilder::build(void) const
+world::Voxel* world::voxel_registry::register_voxel(const VoxelBuilder& builder)
{
- const auto it = world::voxel_registry::names.find(prototype.name);
-
- if(it != world::voxel_registry::names.cend()) {
- spdlog::warn("voxel_registry: cannot build {}: name already present", prototype.name);
- return it->second;
- }
-
- std::size_t state_count;
-
- switch(prototype.type) {
- case voxel_type::CUBE:
- case voxel_type::CROSS:
- case voxel_type::MODEL:
- state_count = 1;
- break;
- default:
- // Something really bad should happen if we end up here.
- // The outside code would static_cast an int to VoxelType
- // and possibly fuck a lot of things up to cause this
- spdlog::critical("voxel_registry: {}: unknown voxel type {}", prototype.name, static_cast<int>(prototype.type));
- std::terminate();
- }
-
- if((world::voxel_registry::voxels.size() + state_count) >= MAX_VOXEL_ID) {
- spdlog::critical("voxel_registry: voxel registry overflow");
- std::terminate();
- }
-
- auto new_info = std::make_shared<VoxelInfo>();
- new_info->name = prototype.name;
- new_info->type = prototype.type;
- new_info->animated = prototype.animated;
- new_info->blending = prototype.blending;
-
- new_info->textures.resize(prototype.textures.size());
-
- for(std::size_t i = 0; i < prototype.textures.size(); ++i) {
- if(prototype.textures[i].paths.empty()) {
- new_info->textures[i].paths = default_texture.paths;
- new_info->textures[i].cached_offset = SIZE_MAX;
- new_info->textures[i].cached_plane = SIZE_MAX;
- }
- else {
- new_info->textures[i].paths = prototype.textures[i].paths;
- new_info->textures[i].cached_offset = SIZE_MAX;
- new_info->textures[i].cached_plane = SIZE_MAX;
- }
- }
+ assert(builder.get_name().size());
+ assert(nullptr == find(builder.get_name()));
- // Physics properties
- new_info->touch_type = prototype.touch_type;
- new_info->touch_values = prototype.touch_values;
- new_info->surface = prototype.surface;
+ const auto id = static_cast<voxel_id>(1 + voxels.size());
- // Things set in future by item_def
- new_info->item_pick = prototype.item_pick;
+ std::unique_ptr<Voxel> voxel(builder.build(id));
+ names.emplace(std::string(builder.get_name()), id);
+ voxels.push_back(std::move(voxel));
- // Base voxel identifier offset
- new_info->base_voxel = world::voxel_registry::voxels.size() + 1;
+ recalculate_checksum();
- for(std::size_t i = 0; i < state_count; ++i)
- world::voxel_registry::voxels.push_back(new_info);
- world::voxel_registry::names.insert_or_assign(new_info->name, new_info->base_voxel);
-
- return new_info->base_voxel;
+ return voxels.back().get();
}
-world::VoxelInfoBuilder& world::voxel_registry::construct(std::string_view name, voxel_type type, bool animated, bool blending)
+world::Voxel* world::voxel_registry::find(std::string_view name)
{
- const auto it = world::voxel_registry::builders.find(std::string(name));
-
- if(it != world::voxel_registry::builders.cend()) {
- return it->second;
- }
- else {
- return world::voxel_registry::builders.emplace(std::string(name), VoxelInfoBuilder(name, type, animated, blending)).first->second;
- }
-}
+ const auto it = names.find(std::string(name));
-world::VoxelInfo* world::voxel_registry::find(std::string_view name)
-{
- const auto it = world::voxel_registry::names.find(std::string(name));
-
- if(it != world::voxel_registry::names.cend()) {
- return world::voxel_registry::find(it->second);
- }
- else {
+ if(it == names.end()) {
return nullptr;
}
+
+ return voxels[it->second - 1].get();
}
-world::VoxelInfo* world::voxel_registry::find(const voxel_id voxel)
+world::Voxel* world::voxel_registry::find(voxel_id id)
{
- if((voxel != NULL_VOXEL_ID) && (voxel <= world::voxel_registry::voxels.size())) {
- return world::voxel_registry::voxels[voxel - 1].get();
- }
- else {
+ if(id == NULL_VOXEL_ID || id > voxels.size()) {
return nullptr;
}
+
+ return voxels[id - 1].get();
}
void world::voxel_registry::purge(void)
{
- world::voxel_registry::builders.clear();
- world::voxel_registry::names.clear();
- world::voxel_registry::voxels.clear();
+ registry_checksum = 0U;
+ voxels.clear();
+ names.clear();
}
-std::uint64_t world::voxel_registry::calculate_checksum(void)
+std::uint64_t world::voxel_registry::get_checksum(void)
{
- std::uint64_t result = 0;
-
- for(const std::shared_ptr<VoxelInfo>& info : world::voxel_registry::voxels) {
- result = math::crc64(info->name, result);
- result += static_cast<std::uint64_t>(info->type);
- result += static_cast<std::uint64_t>(info->base_voxel);
- result += info->blending ? 256 : 1;
- }
-
- return result;
+ return registry_checksum;
}
|