From d4947d8d1190c734b7fb3a91025e7f2a007b81a3 Mon Sep 17 00:00:00 2001 From: zetaPRIME Date: Sun, 7 May 2017 14:11:23 -0400 Subject: [PATCH] fix app:/ asset loading (whoops) --- libstarlight/source/starlight/ThemeManager.cpp | 2 +- libstarlight/todo.txt | 4 ++++ testbed/source/Core.cpp | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libstarlight/source/starlight/ThemeManager.cpp b/libstarlight/source/starlight/ThemeManager.cpp index ba4fd22..9da5194 100644 --- a/libstarlight/source/starlight/ThemeManager.cpp +++ b/libstarlight/source/starlight/ThemeManager.cpp @@ -296,7 +296,7 @@ string ThemeManager::ResolveAssetPath(const string& id) { if (p.IsFile()) return p; } // TBD - directly in romfs, or in an assets folder? - Path bp = Path("romfs:"); + Path bp = Path("romfs:/"); Path p = bp.Combine(sid); if (p.IsFile()) return p; p = bp.Combine(sid+".json"); diff --git a/libstarlight/todo.txt b/libstarlight/todo.txt index c1a1fcf..c8e39b9 100644 --- a/libstarlight/todo.txt +++ b/libstarlight/todo.txt @@ -53,6 +53,10 @@ roadmap to v0.5.1 { language config and atlas support 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 + + SOUND. + + quick includes for all UI elements, etc. } today's agenda { diff --git a/testbed/source/Core.cpp b/testbed/source/Core.cpp index e63612f..8e5ad4d 100644 --- a/testbed/source/Core.cpp +++ b/testbed/source/Core.cpp @@ -107,7 +107,8 @@ void Core::Init() { pipf->SetPreset("normal.16"); pipf->textConfig->borderColor = Color::black; 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); clearColor = Color(0.0f, 0.5f, 0.5f);