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

Merge branch 'main' of https://github.com/MihailRis/VoxelEngine-Cpp

Browse Source
This commit is contained in:
A-lex-Ra 2024-01-27 22:08:39 +06:00
commit ad7c03657a
4 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/data/dynamic.cpp
View File

@ -44,15 +44,27 @@ int64_t List::integer(size_t index) const {
}
Map* List::map(size_t index) const {
if (values[index]->type != valtype::map) {
throw std::runtime_error("type error");
}
return values[index]->value.map;
}
List* List::list(size_t index) const {
if (values[index]->type != valtype::list) {
throw std::runtime_error("type error");
}
return values[index]->value.list;
}
bool List::flag(size_t index) const {
return values[index]->value.boolean;
const auto& val = values[index];
switch (val->type) {
case valtype::integer: return val->value.integer;
case valtype::boolean: return val->value.boolean;
default:
throw std::runtime_error("type error");
}
}
List& List::put(std::string value) {
@ -180,9 +192,14 @@ int64_t Map::getInt(std::string key, int64_t def) const {
bool Map::getBool(std::string key, bool def) const {
auto found = values.find(key);
if (found != values.end())
return found->second->value.boolean;
return def;
if (found == values.end())
return def;
auto& val = found->second;
switch (val->type) {
case valtype::integer: return val->value.integer;
case valtype::boolean: return val->value.boolean;
default: throw std::runtime_error("type error");
}
}
void Map::num(std::string key, double& dst) const {
@ -232,9 +249,7 @@ List* Map::list(std::string key) const {
}
void Map::flag(std::string key, bool& dst) const {
auto found = values.find(key);
if (found != values.end())
dst = found->second->value.boolean;
dst = getBool(key, dst);
}
Map& Map::put(std::string key, uint value) {

2
src/data/dynamic.h
View File

@ -22,7 +22,7 @@ namespace dynamic {
std::string* str;
double decimal;
int64_t integer;
bool boolean;
uint64_t boolean;
};
class Value {

3
src/engine.cpp
View File

@ -138,6 +138,7 @@ void Engine::loadContent() {
auto resdir = paths->getResources();
ContentBuilder contentBuilder;
setup_definitions(&contentBuilder);
paths->setContentPacks(&contentPacks);
std::vector<fs::path> resRoots;
for (auto& pack : contentPacks) {
@ -163,7 +164,7 @@ void Engine::loadContent() {
}
assets->extend(*new_assets.get());
paths->setContentPacks(&contentPacks);
}
void Engine::loadWorldContent(const fs::path& folder) {

10
src/frontend/menu.cpp
View File

@ -250,9 +250,11 @@ void create_main_menu_panel(Engine* engine, PagesControl* menu) {
typedef std::function<void(const ContentPack& pack)> packconsumer;
const int PACKS_PANEL_WIDTH = 550;
std::shared_ptr<Panel> create_packs_panel(const std::vector<ContentPack>& packs, Engine* engine, bool backbutton, packconsumer callback) {
auto assets = engine->getAssets();
auto panel = std::make_shared<Panel>(vec2(400, 200), vec4(5.0f));
auto panel = std::make_shared<Panel>(vec2(PACKS_PANEL_WIDTH, 200), vec4(5.0f));
panel->color(vec4(1.0f, 1.0f, 1.0f, 0.07f));
panel->maxLength(400);
panel->scrollable(true);
@ -266,7 +268,7 @@ std::shared_ptr<Panel> create_packs_panel(const std::vector<ContentPack>& packs,
}
auto idlabel = std::make_shared<Label>("["+pack.id+"]");
idlabel->color(vec4(1, 1, 1, 0.5f));
packpanel->add(idlabel, vec2(360-idlabel->size().x, 2));
packpanel->add(idlabel, vec2(PACKS_PANEL_WIDTH-40-idlabel->size().x, 2));
auto titlelabel = std::make_shared<Label>(pack.title);
packpanel->add(titlelabel, vec2(78, 6));
@ -284,7 +286,7 @@ std::shared_ptr<Panel> create_packs_panel(const std::vector<ContentPack>& packs,
if (!pack.creator.empty()) {
auto creatorlabel = std::make_shared<Label>("@"+pack.creator);
creatorlabel->color(vec4(0.8f, 1.0f, 0.9f, 0.7f));
packpanel->add(creatorlabel, vec2(360-creatorlabel->size().x, 60));
packpanel->add(creatorlabel, vec2(PACKS_PANEL_WIDTH-40-creatorlabel->size().x, 60));
}
auto descriptionlabel = std::make_shared<Label>(pack.description);
@ -304,7 +306,7 @@ std::shared_ptr<Panel> create_packs_panel(const std::vector<ContentPack>& packs,
// TODO: refactor
void create_content_panel(Engine* engine, PagesControl* menu) {
auto paths = engine->getPaths();
auto mainPanel = create_page(engine, "content", 400, 0.0f, 5);
auto mainPanel = create_page(engine, "content", PACKS_PANEL_WIDTH, 0.0f, 5);
std::vector<ContentPack> scanned;
ContentPack::scan(engine->getPaths(), scanned);