mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-27 16:39:43 +00:00
Code Issues Releases Wiki Activity

Remove unused Gui::FontLoader::mTextures

Browse source
This commit is contained in:
elsid 2022-07-19 22:40:34 +02:00
parent 036937ee02
commit 5f800279ac
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
2 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
components/fontloader/fontloader.cpp
View file

@ -177,10 +177,6 @@ namespace Gui
Log(Debug::Error) << "Error in the FontLoader destructor: " << e.what(); Log(Debug::Error) << "Error in the FontLoader destructor: " << e.what();
} }
for (std::vector<MyGUI::ITexture*>::iterator it = mTextures.begin(); it != mTextures.end(); ++it)
delete *it;
mTextures.clear();
for (std::vector<MyGUI::ResourceManualFont*>::iterator it = mFonts.begin(); it != mFonts.end(); ++it) for (std::vector<MyGUI::ResourceManualFont*>::iterator it = mFonts.begin(); it != mFonts.end(); ++it)
{ {
try try
@ -318,15 +314,6 @@ namespace Gui
memcpy(texData, &textureData[0], textureData.size()); memcpy(texData, &textureData[0], textureData.size());
tex->unlock(); tex->unlock();
// Using ResourceManualFont::setTexture, enable for MyGUI 3.2.3
/*
osg::ref_ptr<osg::Texture2D> texture = new osg::Texture2D;
texture->setImage(image);
osgMyGUI::OSGTexture* myguiTex = new osgMyGUI::OSGTexture(texture);
mTextures.push_back(myguiTex);
font->setTexture(myguiTex);
*/
// We need to emulate loading from XML because the data members are private as of mygui 3.2.0 // We need to emulate loading from XML because the data members are private as of mygui 3.2.0
MyGUI::xml::Document xmlDocument; MyGUI::xml::Document xmlDocument;
MyGUI::xml::ElementPtr root = xmlDocument.createRoot("ResourceManualFont"); MyGUI::xml::ElementPtr root = xmlDocument.createRoot("ResourceManualFont");

1
components/fontloader/fontloader.hpp
View file

@ -43,7 +43,6 @@ namespace Gui
int mFontHeight; int mFontHeight;
float mScalingFactor; float mScalingFactor;
std::vector<MyGUI::ITexture*> mTextures;
std::vector<MyGUI::ResourceManualFont*> mFonts; std::vector<MyGUI::ResourceManualFont*> mFonts;
std::string getInternalFontName(const std::string& name); std::string getInternalFontName(const std::string& name);