fix app:/ asset loading (whoops)

This commit is contained in:
zetaPRIME 2017-05-07 14:11:23 -04:00
parent 244e2c2ed0
commit d4947d8d11
3 changed files with 7 additions and 2 deletions

View File

@ -296,7 +296,7 @@ string ThemeManager::ResolveAssetPath(const string& id) {
if (p.IsFile()) return p; if (p.IsFile()) return p;
} }
// TBD - directly in romfs, or in an assets folder? // TBD - directly in romfs, or in an assets folder?
Path bp = Path("romfs:"); Path bp = Path("romfs:/");
Path p = bp.Combine(sid); Path p = bp.Combine(sid);
if (p.IsFile()) return p; if (p.IsFile()) return p;
p = bp.Combine(sid+".json"); p = bp.Combine(sid+".json");

View File

@ -53,6 +53,10 @@ roadmap to v0.5.1 {
language config and atlas support language config and atlas support
maybe implement some way of "knocking out" and replacing metrics during runtime for theme switching maybe implement some way of "knocking out" and replacing metrics during runtime for theme switching
fix font glyph padding to eliminate slight "crosstalk" in bordered variants fix font glyph padding to eliminate slight "crosstalk" in bordered variants
SOUND.
quick includes for all UI elements, etc.
} }
today's agenda { today's agenda {

View File

@ -107,7 +107,8 @@ void Core::Init() {
pipf->SetPreset("normal.16"); pipf->SetPreset("normal.16");
pipf->textConfig->borderColor = Color::black; pipf->textConfig->borderColor = Color::black;
pipf->textConfig->justification = Vector2::half; pipf->textConfig->justification = Vector2::half;
pipf->SetText("This label is on a parallax layer. Try moving the 3D slider.\n\nLorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."); //pipf->SetText("This label is on a parallax layer. Try moving the 3D slider.\n\nLorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.");
pipf->SetText(ThemeManager::ResolveAssetPath("app:/decorations/osk.background"));
parallax->Add(pipf); parallax->Add(pipf);
clearColor = Color(0.0f, 0.5f, 0.5f); clearColor = Color(0.0f, 0.5f, 0.5f);