PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'main' into main

Browse Source
This commit is contained in:
Onran
2024-02-21 22:41:44 +09:00
committed by GitHub
parent bc4ce5f7f1 6ee63eb717
commit 12e6a92798
26 changed files with 191 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/world/World.cpp
+4 -17
View File
@@ -82,10 +82,6 @@ void World::write(Level* level) {
wfile->writePlayer(level->player);
}
const float DEF_PLAYER_Y = 100.0f;
const float DEF_PLAYER_SPEED = 4.0f;
const int DEF_PLAYER_INVENTORY_SIZE = 40;
Level* World::create(std::string name,
std::string type,
fs::path directory,
@@ -94,12 +90,8 @@ Level* World::create(std::string name,
const Content* content,
const std::vector<ContentPack>& packs) {
auto world = new World(name, type, directory, seed, settings, content, packs);
auto inv = std::make_shared<Inventory>(world->getNextInventoryId(), DEF_PLAYER_INVENTORY_SIZE);
auto player = new Player(
glm::vec3(0, DEF_PLAYER_Y, 0), DEF_PLAYER_SPEED, inv
);
auto level = new Level(world, content, player, settings);
level->inventories->store(player->getInventory());
auto level = new Level(world, content, settings);
return level;
}
@@ -116,13 +108,8 @@ Level* World::load(fs::path directory,
throw world_load_error("could not to find world.json");
}
auto inv = std::make_shared<Inventory>(0, DEF_PLAYER_INVENTORY_SIZE);
auto player = new Player(
glm::vec3(0, DEF_PLAYER_Y, 0), DEF_PLAYER_SPEED, inv
);
auto level = new Level(world.get(), content, player, settings);
wfile->readPlayer(player);
level->inventories->store(player->getInventory());
auto level = new Level(world.get(), content, settings);
wfile->readPlayer(level->player);
world.release();
return level;
}