xenia-project/archived-elemental-forms
1
0
Fork 0
mirror of https://github.com/xenia-project/elemental-forms.git synced 2026-01-31 01:25:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moving string table loading out of init.

Browse Source
This commit is contained in:
Ben Vanik
2015-07-06 18:48:03 -07:00
parent b7322a9600
commit 5225dc08dc
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/el/elemental_forms.cc
View File

@@ -28,13 +28,12 @@ using graphics::Renderer;
// From elements.cc:
void RegisterBuiltinElementInflaters();
bool Initialize(Renderer* renderer, const char* language_file) {
bool Initialize(Renderer* renderer) {
assert(!is_initialized());
Renderer::set(renderer);
util::StringTable::set(std::make_unique<util::StringTable>());
util::StringTable::get()->Load(language_file);
text::FontManager::set(std::make_unique<text::FontManager>());
Skin::set(std::make_unique<Skin>());
parsing::ElementFactory::set(std::make_unique<parsing::ElementFactory>());

2
src/el/elemental_forms.h
View File

@@ -25,7 +25,7 @@ namespace el {
using el::util::format_string;
// Initializes Elemental Forms. Call this before using any elemental API.
bool Initialize(graphics::Renderer* renderer, const char* language_file);
bool Initialize(graphics::Renderer* renderer);
// Shuts down Elemental Forms. Call this after deleting the last element, to
// free libelemental internals.

6
testbed/testbed_application.cc
View File

@@ -26,6 +26,7 @@
#include "el/util/metrics.h"
#include "el/util/string.h"
#include "el/util/string_builder.h"
#include "el/util/string_table.h"
#include "testbed/list_window.h"
#include "testbed/resource_edit_window.h"
#include "testbed/scratch/code_text_box.h"
@@ -210,10 +211,11 @@ int app_main() {
ApplicationBackend::Create(application, 1280, 700, "Demo");
if (!application_backend) return 1;
el::Initialize(application_backend->GetRenderer(),
"resources/language/lng_en.tb.txt");
el::Initialize(application_backend->GetRenderer());
CodeTextBox::RegisterInflater();
util::StringTable::get()->Load("resources/language/lng_en.tb.txt");
// Load the default skin, and override skin that contains the graphics
// specific to the demo.
Skin::get()->Load("resources/default_skin/skin.tb.txt",