add 'player-entity' to defaults.toml

res/config/defaults.toml

@@ -1 +1,2 @@
 generator = "core:default"
+player-entity = ""

res/content/base/config/defaults.toml

@@ -1 +1,2 @@
 generator = "base:demo"
+player-entity = "base:player"

src/content/Content.cpp

@@ -34,12 +34,14 @@ Content::Content(
     UptrsMap<std::string, ContentPackRuntime> packs,
     UptrsMap<std::string, BlockMaterial> blockMaterials,
     UptrsMap<std::string, rigging::SkeletonConfig> skeletons,
-    ResourceIndicesSet resourceIndices
+    ResourceIndicesSet resourceIndices,
+    dv::value defaults
 )
     : indices(std::move(indices)),
       packs(std::move(packs)),
       blockMaterials(std::move(blockMaterials)),
       skeletons(std::move(skeletons)),
+      defaults(std::move(defaults)),
       blocks(std::move(blocks)),
       items(std::move(items)),
       entities(std::move(entities)),

src/content/Content.hpp

@@ -201,6 +201,7 @@ class Content {
     UptrsMap<std::string, ContentPackRuntime> packs;
     UptrsMap<std::string, BlockMaterial> blockMaterials;
     UptrsMap<std::string, rigging::SkeletonConfig> skeletons;
+    dv::value defaults = nullptr;
 public:
     ContentUnitDefs<Block> blocks;
     ContentUnitDefs<ItemDef> items;
@@ -219,7 +220,8 @@ public:
         UptrsMap<std::string, ContentPackRuntime> packs,
         UptrsMap<std::string, BlockMaterial> blockMaterials,
         UptrsMap<std::string, rigging::SkeletonConfig> skeletons,
-        ResourceIndicesSet resourceIndices
+        ResourceIndicesSet resourceIndices,
+        dv::value defaults
     );
     ~Content();
 
@@ -231,6 +233,10 @@ public:
         return resourceIndices[static_cast<size_t>(type)];
     }
 
+    inline const dv::value& getDefaults() const {
+        return defaults;
+    }
+
     const rigging::SkeletonConfig* getSkeleton(const std::string& id) const;
     const BlockMaterial* findBlockMaterial(const std::string& id) const;
     const ContentPackRuntime* getPackRuntime(const std::string& id) const;

src/content/ContentBuilder.cpp

@@ -84,7 +84,8 @@ std::unique_ptr<Content> ContentBuilder::build() {
         std::move(packs),
         std::move(blockMaterials),
         std::move(skeletons),
-        std::move(resourceIndices)
+        std::move(resourceIndices),
+        std::move(defaults)
     );
 
     // Now, it's time to resolve foreign keys

src/content/ContentBuilder.hpp

@@ -73,6 +73,7 @@ public:
     ContentUnitBuilder<EntityDef> entities {allNames, ContentType::ENTITY};
     ContentUnitBuilder<GeneratorDef> generators {allNames, ContentType::GENERATOR};
     ResourceIndicesSet resourceIndices {};
+    dv::value defaults = nullptr;
 
     ~ContentBuilder();
 

src/content/ContentLoader.cpp

@@ -23,6 +23,7 @@
 #include "data/dv_util.hpp"
 #include "data/StructLayout.hpp"
 #include "presets/ParticlesPreset.hpp"
+#include "io/engine_paths.hpp"
 
 namespace fs = std::filesystem;
 using namespace data;
@@ -760,6 +761,10 @@ void ContentLoader::load() {
 
     auto folder = pack->folder;
 
+    builder.defaults = paths.readCombinedObject(
+        EnginePaths::CONFIG_DEFAULTS.string()
+    );
+
     // Load world generators
     io::path generatorsDir = folder / "generators";
     foreach_file(generatorsDir, [this](const io::path& file) {

src/io/engine_paths.hpp

@@ -39,8 +39,7 @@ public:
 
     static std::tuple<std::string, std::string> parsePath(std::string_view view);
 
-    static inline auto CONFIG_DEFAULTS =
+    static inline io::path CONFIG_DEFAULTS = "config/defaults.toml";
-        std::filesystem::u8path("config/defaults.toml");
 private:
     std::filesystem::path userFilesFolder {"."};
     std::filesystem::path resourcesFolder {"res"};

src/logic/scripting/lua/libs/libgeneration.cpp

@@ -6,6 +6,7 @@
 #include "world/Level.hpp"
 #include "world/generator/VoxelFragment.hpp"
 #include "content/ContentLoader.hpp"
+#include "content/Content.hpp"
 #include "engine/Engine.hpp"
 #include "../lua_custom_types.hpp"
 
@@ -69,8 +70,9 @@ static int l_get_generators(lua::State* L) {
 /// @brief Get the default world generator
 /// @return The ID of the default world generator
 static int l_get_default_generator(lua::State* L) {
+    // content is not initialized yet
     auto combined = engine->getResPaths()->readCombinedObject(
-        EnginePaths::CONFIG_DEFAULTS.u8string()
+        EnginePaths::CONFIG_DEFAULTS.string()
     );
     return lua::pushstring(L, combined["generator"].asString());
 }
@@ -81,4 +83,5 @@ const luaL_Reg generationlib[] = {
     {"load_fragment", lua::wrap<l_load_fragment>},
     {"get_generators", lua::wrap<l_get_generators>},
     {"get_default_generator", lua::wrap<l_get_default_generator>},
-    {NULL, NULL}};
+    {NULL, NULL}
+};

src/objects/Player.cpp

@@ -63,10 +63,14 @@ Player::~Player() = default;
 
 void Player::updateEntity() {
     if (eid == ENTITY_AUTO) {
-        auto& def = level.content.entities.require("base:player");
+        const auto& defaults = level.content.getDefaults();
-        eid = level.entities->spawn(def, getPosition());
+        const auto& defName = defaults["player-entity"].asString();
-        if (auto entity = level.entities->get(eid)) {
+        if (!defName.empty()) {
-            entity->setPlayer(id);
+            auto& def = level.content.entities.require(defName);
+            eid = level.entities->spawn(def, getPosition());
+            if (auto entity = level.entities->get(eid)) {
+                entity->setPlayer(id);
+            }
         }
     } else if (auto entity = level.entities->get(eid)) {
         position = entity->getTransform().pos;