voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-07 20:11:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #852 from MihailRis/refactor-world-renderer

Browse source 
update world renderer (part 1)
This commit is contained in:
MihailRis 2026-08-11 19:32:41 +03:00 • committed by GitHub
commit 33053f07ed
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
45 changed files with 737 additions and 593 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/world/Level.cpp
View file

@ -71,12 +71,12 @@ Level::Level(
Level::~Level() = default;
World* Level::getWorld() {
return world.get();
World& Level::getWorld() {
return *world;
}
const World* Level::getWorld() const {
return world.get();
const World& Level::getWorld() const {
return *world;
}
void Level::onSave() {

4
src/world/Level.hpp
View file

@ -46,9 +46,9 @@ public:
);
~Level();
World* getWorld();
World& getWorld();
const World* getWorld() const;
const World& getWorld() const;
void onSave();

8
src/world/World.cpp
View file

@ -147,7 +147,7 @@ std::unique_ptr<Level> World::load(
if (!playerRoot["players"].empty()) {
if (!playerRoot["players"][0].has("id")) {
level->getWorld()->getInfo().nextPlayerId++;
level->getWorld().getInfo().nextPlayerId++;
}
}
}
@ -216,9 +216,6 @@ void WorldInfo::deserialize(const dv::value& root) {
daytimeSpeed = timeobj["day-time-speed"].asNumber();
totalTime = timeobj["total-time"].asNumber();
}
if (root.has("weather")) {
fog = root["weather"]["fog"].asNumber();
}
nextInventoryId = root["next-inventory-id"].asInteger(2);
nextEntityId = root["next-entity-id"].asInteger(1);
root.at("next-player-id").get(nextPlayerId);
@ -244,9 +241,6 @@ dv::value WorldInfo::serialize() const {
timeobj["day-time-speed"] = daytimeSpeed;
timeobj["total-time"] = totalTime;
root["weather"] = dv::object();
root["weather"]["fog"] = fog;
root["next-inventory-id"] = nextInventoryId;
root["next-entity-id"] = nextEntityId;
root["next-player-id"] = nextPlayerId;

5
src/world/World.hpp
View file

@ -39,9 +39,6 @@ struct WorldInfo : public Serializable {
/// @brief total time passed in the world (not depending on daytimeSpeed)
double totalTime = 0.0;
/// @brief will be replaced with weather in future
float fog = 0.0f;
entityid_t nextEntityId = 0;
int major = 0, minor = -1;
@ -70,6 +67,8 @@ public:
const std::vector<ContentPack>& packs
);
World(const World&) = delete;
~World();
/// @brief Update world day-time and total time