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

Add files via upload

Browse Source
This commit is contained in:
Onran
2024-02-23 11:48:32 +09:00
committed by GitHub
parent 549b392871
commit a5087cf221
11 changed files with 410 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/world/World.cpp
+43 -24
View File
@@ -6,7 +6,9 @@
#include "Level.h"
#include "../files/WorldFiles.h"
#include "../world/WorldTypes.h"
#include "../content/Content.h"
#include "../world/WorldGenerators.h"
#include "../content/ContentLUT.h"
#include "../voxels/Chunk.h"
#include "../voxels/Chunks.h"
@@ -21,12 +23,14 @@ world_load_error::world_load_error(std::string message)
World::World(
std::string name,
std::string generator,
fs::path directory,
uint64_t seed,
EngineSettings& settings,
const Content* content,
const std::vector<ContentPack> packs)
: name(name),
generator(generator),
seed(seed),
settings(settings),
content(content),
@@ -65,12 +69,13 @@ void World::write(Level* level) {
}
Level* World::create(std::string name,
std::string generator,
fs::path directory,
uint64_t seed,
EngineSettings& settings,
const Content* content,
const std::vector<ContentPack>& packs) {
auto world = new World(name, directory, seed, settings, content, packs);
auto world = new World(name, generator, directory, seed, settings, content, packs);
auto level = new Level(world, content, settings);
auto inventory = level->player->getInventory();
inventory->setId(world->getNextInventoryId());
@@ -83,7 +88,7 @@ Level* World::load(fs::path directory,
const Content* content,
const std::vector<ContentPack>& packs) {
auto world = std::make_unique<World>(
".", directory, 0, settings, content, packs
".", WorldGenerators::getDefaultGeneratorID(), directory, 0, settings, content, packs
);
auto& wfile = world->wfile;
@@ -111,6 +116,10 @@ void World::setName(const std::string& name) {
this->name = name;
}
void world::setGenerator(const std::string& generator) {
this->generator = generator;
}
bool World::hasPack(const std::string& id) const {
for (auto& pack : packs) {
if (pack.id == id)
@@ -131,47 +140,57 @@ uint64_t World::getSeed() const {
return seed;
}
std::string World::getGenerator() const {
return generator;
}
const std::vector<ContentPack>& World::getPacks() const {
return packs;
}
void World::deserialize(dynamic::Map* root) {
name = root->getStr("name", name);
generator = root->getStr("generator", generator);
seed = root->getInt("seed", seed);
auto verobj = root->map("version");
if (verobj) {
int major=0, minor=-1;
verobj->num("major", major);
verobj->num("minor", minor);
std::cout << "world version: " << major << "." << minor << std::endl;
}
if(generator == "") {
generator = WorldGenerators::getDefaultGeneratorID();
}
auto timeobj = root->map("time");
if (timeobj) {
timeobj->num("day-time", daytime);
timeobj->num("day-time-speed", daytimeSpeed);
auto verobj = root->map("version");
if (verobj) {
int major=0, minor=-1;
verobj->num("major", major);
verobj->num("minor", minor);
std::cout << "world version: " << major << "." << minor << std::endl;
}
auto timeobj = root->map("time");
if (timeobj) {
timeobj->num("day-time", daytime);
timeobj->num("day-time-speed", daytimeSpeed);
timeobj->num("total-time", totalTime);
}
}
nextInventoryId = root->getNum("next-inventory-id", 2);
}
std::unique_ptr<dynamic::Map> World::serialize() const {
auto root = std::make_unique<dynamic::Map>();
auto root = std::make_unique<dynamic::Map>();
auto& versionobj = root->putMap("version");
versionobj.put("major", ENGINE_VERSION_MAJOR);
versionobj.put("minor", ENGINE_VERSION_MINOR);
auto& versionobj = root->putMap("version");
versionobj.put("major", ENGINE_VERSION_MAJOR);
versionobj.put("minor", ENGINE_VERSION_MINOR);
root->put("name", name);
root->put("seed", seed);
root->put("name", name);
root->put("generator", generator);
root->put("seed", seed);
auto& timeobj = root->putMap("time");
timeobj.put("day-time", daytime);
timeobj.put("day-time-speed", daytimeSpeed);
timeobj.put("day-time", daytime);
timeobj.put("day-time-speed", daytimeSpeed);
timeobj.put("total-time", totalTime);
root->put("next-inventory-id", nextInventoryId);
return root;
}
}
src/world/World.h
+11 -3
View File
@@ -26,8 +26,9 @@ public:
world_load_error(std::string message);
};
class World : public Serializable {
class World : Serializable {
std::string name;
std::string generator;
uint64_t seed;
EngineSettings& settings;
const Content* const content;
@@ -47,11 +48,13 @@ public:
double totalTime = 0.0;
World(std::string name,
std::string generator,
fs::path directory,
uint64_t seed,
EngineSettings& settings,
const Content* content,
std::vector<ContentPack> packs);
~World();
/**
@@ -77,6 +80,7 @@ public:
* Create new world
* @param name internal world name
* @param directory root world directory
* @param type of the world
* @param seed world generation seed
* @param settings current engine settings
* @param content current engine Content instance
@@ -85,6 +89,7 @@ public:
* @return Level instance containing World instance
*/
static Level* create(std::string name,
std::string generator,
fs::path directory,
uint64_t seed,
EngineSettings& settings,
@@ -108,7 +113,8 @@ public:
void setName(const std::string& name);
void setSeed(uint64_t seed);
void setGenerator(const std::string& generator);
/**
* Check if world has content-pack installed
* @param id content-pack id
@@ -124,6 +130,8 @@ public:
/** Get world generation seed */
uint64_t getSeed() const;
/** Get world generator id */
std::string getGenerator() const;
/**
* Get vector of all content-packs installed in world
*/
@@ -148,4 +156,4 @@ public:
void deserialize(dynamic::Map *src) override;
};
#endif /* WORLD_WORLD_H_ */
#endif /* WORLD_WORLD_H_ */
src/world/WorldGenerators.cpp
+41
View File
@@ -0,0 +1,41 @@
#include "WorldGenerators.h"
#include "../voxels/WorldGenerator.h"
#include "../voxels/FlatWorldGenerator.h"
#include "../content/Content.h"
#include <vector>
#include <string>
#include <iostream>
#include <function>
std::map<std::string, std::function> generators;
template <typename T>
void WorldGenerators::addGenerator(std::string id) {
using create_func = std::function<T*>(const Content*);
generators[id] = create_func
}
std::vector<std::string> WorldGenerators::getGeneratorsIDs() {
std::vector<std::string> ids;
for(std::map<std::string, std::function>::iterator it = generators.begin(); it != generators.end(); ++it) {
ids.push_back(it->first);
}
return ids;
}
std::string WorldGenerators::getDefaultWorldGeneratorID() {
return "core:default";
}
WorldGenerator* WorldGenerators::createWorldGenerator(std::string id, const Content* content) {
for(std::map<std::string, std::function>::iterator it = generators.begin(); it != generators.end(); ++it) {
if(id == it->first) {
return (WorldGenerator*) it->second(content);
}
}
std::cerr << "unknown generator id: " << id << std::endl;
return nullptr;
}
src/world/WorldGenerators.h
+21
View File
@@ -0,0 +1,21 @@
#ifndef WORLD_WORLDTYPES_H_
#define WORLD_WORLDTYPES_H_
#include "../voxels/WorldGenerator.h"
#include "../content/Content.h"
#include <vector>
#include <string>
class WorldGenerators {
public:
static void addGenerator(std::string id);
static std::vector<std::string> getGeneratorsIDs();
static std::string getDefaultGeneratorID();
static WorldGenerator* createGenerator(std::string id, const Content* content);
};
#endif /* WORLD_WORLDTYPES_H_ */