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

the big refactor + extracted data classes from coders/json to data/dynamic

Browse Source
This commit is contained in:
MihailRis
2024-01-17 16:32:53 +03:00
parent 34d4500e24
commit 377c8e5029
36 changed files with 908 additions and 875 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontend/ContentGfxCache.cpp
+4 -4
View File
@@ -8,12 +8,12 @@
#include "../voxels/Block.h"
ContentGfxCache::ContentGfxCache(const Content* content, Assets* assets) {
const ContentIndices* contentIds = content->indices;
sideregions = new UVRegion[contentIds->countBlockDefs() * 6];
auto indices = content->getIndices();
sideregions = new UVRegion[indices->countBlockDefs() * 6];
Atlas* atlas = assets->getAtlas("blocks");
for (uint i = 0; i < contentIds->countBlockDefs(); i++) {
Block* def = contentIds->getBlockDef(i);
for (uint i = 0; i < indices->countBlockDefs(); i++) {
Block* def = indices->getBlockDef(i);
for (uint side = 0; side < 6; side++) {
std::string tex = def->textureFaces[side];
if (atlas->has(tex)) {
src/frontend/InventoryView.cpp
+1 -1
View File
@@ -22,7 +22,7 @@ InventoryView::InventoryView(
LevelFrontend* frontend,
std::vector<itemid_t> items)
: content(content),
indices(content->indices),
indices(content->getIndices()),
items(items),
frontend(frontend),
columns(columns) {
src/frontend/WorldRenderer.cpp
+3 -3
View File
@@ -132,7 +132,7 @@ void WorldRenderer::draw(const GfxContext& pctx, Camera* camera, bool hudVisible
1.0f+fog*2.0f, 4);
const Content* content = level->content;
const ContentIndices* contentIds = content->indices;
auto indices = content->getIndices();
Assets* assets = engine->getAssets();
Atlas* atlas = assets->getAtlas("blocks");
Shader* shader = assets->getShader("main");
@@ -170,7 +170,7 @@ void WorldRenderer::draw(const GfxContext& pctx, Camera* camera, bool hudVisible
shader->uniform1i("u_cubemap", 1);
{
itemid_t id = level->player->getChosenItem();
ItemDef* item = contentIds->getItemDef(id);
ItemDef* item = indices->getItemDef(id);
assert(item != nullptr);
float multiplier = 0.5f;
shader->uniform3f("u_torchlightColor",
@@ -189,7 +189,7 @@ void WorldRenderer::draw(const GfxContext& pctx, Camera* camera, bool hudVisible
// Selected block
if (PlayerController::selectedBlockId != -1 && hudVisible){
blockid_t id = PlayerController::selectedBlockId;
Block* block = contentIds->getBlockDef(id);
Block* block = indices->getBlockDef(id);
assert(block != nullptr);
const vec3 pos = PlayerController::selectedBlockPosition;
const vec3 point = PlayerController::selectedPointPosition;
src/frontend/hud.cpp
+2 -2
View File
@@ -82,7 +82,7 @@ void HudRenderer::createDebugPanel(Engine* engine) {
}));
panel->add(create_label([=](){
auto player = level->player;
auto indices = level->content->indices;
auto* indices = level->content->getIndices();
auto def = indices->getBlockDef(player->selectedVoxel.id);
std::wstringstream stream;
stream << std::hex << level->player->selectedVoxel.states;
@@ -171,7 +171,7 @@ HudRenderer::HudRenderer(Engine* engine, LevelFrontend* frontend)
auto level = frontend->getLevel();
auto menu = gui->getMenu();
auto content = level->content;
auto indices = content->indices;
auto indices = content->getIndices();
std::vector<itemid_t> items;
for (itemid_t id = 1; id < indices->countItemDefs(); id++) {
src/frontend/locale/langs.cpp
+43 -47
View File
@@ -7,22 +7,17 @@
#include "../../content/ContentPack.h"
#include "../../files/files.h"
#include "../../util/stringutil.h"
#include "../../data/dynamic.h"
using std::string;
using std::wstring;
using std::vector;
using std::unique_ptr;
using std::unordered_map;
using std::filesystem::path;
namespace fs = std::filesystem;
unique_ptr<langs::Lang> langs::current;
unordered_map<string, langs::LocaleInfo> langs::locales_info;
std::unique_ptr<langs::Lang> langs::current;
std::unordered_map<std::string, langs::LocaleInfo> langs::locales_info;
langs::Lang::Lang(string locale) : locale(locale) {
langs::Lang::Lang(std::string locale) : locale(locale) {
}
const wstring& langs::Lang::get(const wstring& key) const {
const std::wstring& langs::Lang::get(const std::wstring& key) const {
auto found = map.find(key);
if (found == map.end()) {
return key;
@@ -30,11 +25,11 @@ const wstring& langs::Lang::get(const wstring& key) const {
return found->second;
}
void langs::Lang::put(const wstring& key, const wstring& text) {
void langs::Lang::put(const std::wstring& key, const std::wstring& text) {
map[key] = text;
}
const string& langs::Lang::getId() const {
const std::string& langs::Lang::getId() const {
return locale;
}
@@ -50,16 +45,16 @@ class Reader : public BasicParser {
}
}
public:
Reader(string file, string source) : BasicParser(file, source) {
Reader(std::string file, std::string source) : BasicParser(file, source) {
}
void read(langs::Lang& lang, std::string prefix) {
skipWhitespace();
while (hasNext()) {
string key = parseString('=', true);
std::string key = parseString('=', true);
util::trim(key);
key = prefix + key;
string text = parseString('\n', false);
std::string text = parseString('\n', false);
util::trim(text);
lang.put(util::str2wstr_utf8(key),
util::str2wstr_utf8(text));
@@ -68,22 +63,22 @@ public:
}
};
void langs::loadLocalesInfo(const path& resdir, string& fallback) {
path file = resdir/path(langs::TEXTS_FOLDER)/path("langs.json");
unique_ptr<json::JObject> root (files::read_json(file));
void langs::loadLocalesInfo(const fs::path& resdir, std::string& fallback) {
fs::path file = resdir/fs::path(langs::TEXTS_FOLDER)/fs::path("langs.json");
auto root = files::read_json(file);
langs::locales_info.clear();
root->str("fallback", fallback);
auto langs = root->obj("langs");
auto langs = root->map("langs");
if (langs) {
std::cout << "locales ";
for (auto& entry : langs->map) {
auto langInfo = entry.second;
for (auto& entry : langs->values) {
auto langInfo = entry.second.get();
string name;
if (langInfo->type == json::valtype::object) {
name = langInfo->value.obj->getStr("name", "none");
std::string name;
if (langInfo->type == dynamic::valtype::map) {
name = langInfo->value.map->getStr("name", "none");
} else {
continue;
}
@@ -95,8 +90,8 @@ void langs::loadLocalesInfo(const path& resdir, string& fallback) {
}
}
std::string langs::locale_by_envlocale(const std::string& envlocale, const path& resdir){
string fallback = FALLBACK_DEFAULT;
std::string langs::locale_by_envlocale(const std::string& envlocale, const fs::path& resdir){
std::string fallback = FALLBACK_DEFAULT;
if (locales_info.size() == 0) {
loadLocalesInfo(resdir, fallback);
}
@@ -116,32 +111,33 @@ std::string langs::locale_by_envlocale(const std::string& envlocale, const path&
}
}
void langs::load(const path& resdir,
const string& locale,
const vector<ContentPack>& packs,
void langs::load(const fs::path& resdir,
const std::string& locale,
const std::vector<ContentPack>& packs,
Lang& lang) {
path filename = path(TEXTS_FOLDER)/path(locale + LANG_FILE_EXT);
path core_file = resdir/filename;
fs::path filename = fs::path(TEXTS_FOLDER)/fs::path(locale + LANG_FILE_EXT);
fs::path core_file = resdir/filename;
if (fs::is_regular_file(core_file)) {
string text = files::read_string(core_file);
std::string text = files::read_string(core_file);
Reader reader(core_file.string(), text);
reader.read(lang, "");
}
for (auto pack : packs) {
path file = pack.folder/filename;
fs::path file = pack.folder/filename;
if (fs::is_regular_file(file)) {
string text = files::read_string(file);
std::string text = files::read_string(file);
Reader reader(file.string(), text);
reader.read(lang, pack.id+":");
}
}
}
void langs::load(const path& resdir,
const string& locale,
const string& fallback,
const vector<ContentPack>& packs) {
unique_ptr<Lang> lang (new Lang(locale));
void langs::load(const fs::path& resdir,
const std::string& locale,
const std::string& fallback,
const std::vector<ContentPack>& packs) {
auto lang = std::make_unique<Lang>(locale);
load(resdir, fallback, packs, *lang.get());
if (locale != fallback) {
load(resdir, locale, packs, *lang.get());
@@ -149,10 +145,10 @@ void langs::load(const path& resdir,
current.reset(lang.release());
}
void langs::setup(const path& resdir,
string locale,
const vector<ContentPack>& packs) {
string fallback = langs::FALLBACK_DEFAULT;
void langs::setup(const fs::path& resdir,
std::string locale,
const std::vector<ContentPack>& packs) {
std::string fallback = langs::FALLBACK_DEFAULT;
langs::loadLocalesInfo(resdir, fallback);
if (langs::locales_info.find(locale) == langs::locales_info.end()) {
locale = fallback;
@@ -160,13 +156,13 @@ void langs::setup(const path& resdir,
langs::load(resdir, locale, fallback, packs);
}
const wstring& langs::get(const wstring& key) {
const std::wstring& langs::get(const std::wstring& key) {
return current->get(key);
}
const wstring& langs::get(const wstring& key, const wstring& context) {
wstring ctxkey = context + L"." + key;
const wstring& text = current->get(ctxkey);
const std::wstring& langs::get(const std::wstring& key, const std::wstring& context) {
std::wstring ctxkey = context + L"." + key;
const std::wstring& text = current->get(ctxkey);
if (&ctxkey != &text) {
return text;
}