diff --git a/data/fonts/AR_PL_SungtiL_GB0.png b/data/fonts/AR_PL_SungtiL_GB0.png deleted file mode 100644 index 60935805a..000000000 Binary files a/data/fonts/AR_PL_SungtiL_GB0.png and /dev/null differ diff --git a/data/fonts/BigDigitFont.xml b/data/fonts/BigDigitFont.xml deleted file mode 100755 index 8ae41eeeb..000000000 Binary files a/data/fonts/BigDigitFont.xml and /dev/null differ diff --git a/data/fonts/LayneHansom0.png b/data/fonts/LayneHansom0.png deleted file mode 100644 index 0a95d96e7..000000000 Binary files a/data/fonts/LayneHansom0.png and /dev/null differ diff --git a/data/fonts/LayneHansomBigDigits.png b/data/fonts/LayneHansomBigDigits.png deleted file mode 100644 index 63995e7dd..000000000 Binary files a/data/fonts/LayneHansomBigDigits.png and /dev/null differ diff --git a/data/fonts/Mplus2p_JP0.png b/data/fonts/Mplus2p_JP0.png deleted file mode 100644 index df680d859..000000000 Binary files a/data/fonts/Mplus2p_JP0.png and /dev/null differ diff --git a/data/fonts/StkChineseFont.xml b/data/fonts/StkChineseFont.xml deleted file mode 100755 index 109cda2e2..000000000 Binary files a/data/fonts/StkChineseFont.xml and /dev/null differ diff --git a/data/fonts/StkFont.xml b/data/fonts/StkFont.xml deleted file mode 100644 index 060581d27..000000000 Binary files a/data/fonts/StkFont.xml and /dev/null differ diff --git a/data/fonts/StkJapaneseFont.xml b/data/fonts/StkJapaneseFont.xml deleted file mode 100644 index 6bd67b8d1..000000000 Binary files a/data/fonts/StkJapaneseFont.xml and /dev/null differ diff --git a/data/fonts/comix.png b/data/fonts/comix.png deleted file mode 100644 index c1ac074e1..000000000 Binary files a/data/fonts/comix.png and /dev/null differ diff --git a/data/fonts/materials.xml b/data/fonts/materials.xml deleted file mode 100644 index 8c34897e6..000000000 --- a/data/fonts/materials.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/fonts/rasheeq.xml b/data/fonts/rasheeq.xml deleted file mode 100644 index c8aedd16c..000000000 Binary files a/data/fonts/rasheeq.xml and /dev/null differ diff --git a/data/fonts/rasheeq0.png b/data/fonts/rasheeq0.png deleted file mode 100644 index 0899fe412..000000000 Binary files a/data/fonts/rasheeq0.png and /dev/null differ diff --git a/data/fonts/rasheeq1.png b/data/fonts/rasheeq1.png deleted file mode 100644 index 6aa3cb07b..000000000 Binary files a/data/fonts/rasheeq1.png and /dev/null differ diff --git a/data/fonts/rasheeq3.png b/data/fonts/rasheeq3.png deleted file mode 100644 index 8260832df..000000000 Binary files a/data/fonts/rasheeq3.png and /dev/null differ diff --git a/data/fonts/rasheeq4.png b/data/fonts/rasheeq4.png deleted file mode 100644 index f036a6b92..000000000 Binary files a/data/fonts/rasheeq4.png and /dev/null differ diff --git a/data/fonts/sigmar0.png b/data/fonts/sigmar0.png deleted file mode 100755 index 1b6939531..000000000 Binary files a/data/fonts/sigmar0.png and /dev/null differ diff --git a/data/fonts/title_font.png b/data/fonts/title_font.png deleted file mode 100644 index f22628a00..000000000 Binary files a/data/fonts/title_font.png and /dev/null differ diff --git a/data/fonts/title_font.xml b/data/fonts/title_font.xml deleted file mode 100644 index dedade837..000000000 Binary files a/data/fonts/title_font.xml and /dev/null differ diff --git a/data/fonts/title_font_2.png b/data/fonts/title_font_2.png deleted file mode 100644 index 65dd87744..000000000 Binary files a/data/fonts/title_font_2.png and /dev/null differ diff --git a/data/fonts/wqyMicroHei0.png b/data/fonts/wqyMicroHei0.png deleted file mode 100755 index 6982eb727..000000000 Binary files a/data/fonts/wqyMicroHei0.png and /dev/null differ diff --git a/data/fonts/wqyMicroHei1.png b/data/fonts/wqyMicroHei1.png deleted file mode 100755 index 55580d04e..000000000 Binary files a/data/fonts/wqyMicroHei1.png and /dev/null differ diff --git a/data/fonts/wqyMicroHei2.png b/data/fonts/wqyMicroHei2.png deleted file mode 100755 index 8268af53a..000000000 Binary files a/data/fonts/wqyMicroHei2.png and /dev/null differ diff --git a/data/fonts/wqyMicroHei3.png b/data/fonts/wqyMicroHei3.png deleted file mode 100755 index 7bc8d11ed..000000000 Binary files a/data/fonts/wqyMicroHei3.png and /dev/null differ diff --git a/data/fonts/wqyMicroHei4.png b/data/fonts/wqyMicroHei4.png deleted file mode 100755 index 14dc8314e..000000000 Binary files a/data/fonts/wqyMicroHei4.png and /dev/null differ diff --git a/data/fonts/wqyMicroHei5.png b/data/fonts/wqyMicroHei5.png deleted file mode 100755 index f7f6c6e1c..000000000 Binary files a/data/fonts/wqyMicroHei5.png and /dev/null differ diff --git a/data/fonts/wqyMicroHei6.png b/data/fonts/wqyMicroHei6.png deleted file mode 100755 index 87f2bf36b..000000000 Binary files a/data/fonts/wqyMicroHei6.png and /dev/null differ diff --git a/src/io/file_manager.cpp b/src/io/file_manager.cpp index 602e42904..5e59722e0 100644 --- a/src/io/file_manager.cpp +++ b/src/io/file_manager.cpp @@ -115,7 +115,6 @@ FileManager::FileManager() { m_subdir_name.resize(ASSET_COUNT); m_subdir_name[CHALLENGE ] = "challenges"; - m_subdir_name[FONT ] = "fonts"; m_subdir_name[GFX ] = "gfx"; m_subdir_name[GRANDPRIX ] = "grandprix"; m_subdir_name[GUI ] = "gui"; diff --git a/src/io/file_manager.hpp b/src/io/file_manager.hpp index 6d097ad62..baf420535 100644 --- a/src/io/file_manager.hpp +++ b/src/io/file_manager.hpp @@ -48,7 +48,7 @@ public: * The last entry ASSET_COUNT specifies the number of entries. */ enum AssetType {ASSET_MIN, CHALLENGE=ASSET_MIN, - FONT, GFX, GRANDPRIX, GUI, LIBRARY, MODEL, MUSIC, + GFX, GRANDPRIX, GUI, LIBRARY, MODEL, MUSIC, SCRIPT, SFX, SHADER, SKIN, TEXTURE, TTF, TRANSLATION, ASSET_MAX = TRANSLATION, ASSET_COUNT}; diff --git a/src/main.cpp b/src/main.cpp index f4a789912..c507f3122 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1289,14 +1289,6 @@ int main(int argc, char *argv[] ) main_loop = new MainLoop(); material_manager->loadMaterial(); - // Load the font textures - they are all lazily loaded - // so no need to push a texture search path. They will actually - // be loaded from ScalableFont. - 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 ();