ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed #1598 (error message about font texture not found).

Browse Source
This commit is contained in:
hiker 2014-10-04 23:32:54 +10:00
parent b56901bacd
commit f63e7d93b8
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
data/fonts/materials.xml Normal file
View File

@ -0,0 +1,22 @@
<?xml version="1.0"?>
<materials>
<!-- Fonts -->
<material name="title_font.png" shader="unlit"/>
<material name="title_font_2.png" shader="unlit"/>
<material name="sigmar0.png" shader="unlit"/>
<material name="AR_PL_SungtiL_GB0.png" shader="unlit"/>
<material name="comix.png" shader="unlit"/>
<material name="LayneHansom0.png" shader="unlit"/>
<material name="LayneHansomBigDigits.png" shader="unlit"/>
<material name="Mplus2p_JP0.png" shader="unlit"/>
<material name="rasheeq0.png" shader="unlit"/>
<material name="rasheeq3.png" shader="unlit"/>
<material name="rasheeq4.png" shader="unlit"/>
<material name="wqyMicroHei0.png" shader="unlit"/>
<material name="wqyMicroHei1.png" shader="unlit"/>
<material name="wqyMicroHei2.png" shader="unlit"/>
<material name="wqyMicroHei3.png" shader="unlit"/>
<material name="wqyMicroHei4.png" shader="unlit"/>
<material name="wqyMicroHei5.png" shader="unlit"/>
</materials>

10
src/main.cpp
View File

@ -1206,7 +1206,15 @@ int main(int argc, char *argv[] )
// Get into menu mode initially.
input_manager->setMode(InputManager::MENU);
main_loop = new MainLoop();
material_manager -> loadMaterial ();
material_manager->loadMaterial();
// Load the font textures
file_manager->pushTextureSearchPath(
file_manager->getAsset(FileManager::FONT,""));
material_manager->addSharedMaterial(
file_manager->getAsset(FileManager::FONT,"materials.xml"));
file_manager->popTextureSearchPath();
GUIEngine::addLoadingIcon( irr_driver->getTexture(FileManager::GUI,
"options_video.png"));
kart_properties_manager -> loadAllKarts ();