Remove unused builtin font
This commit is contained in:
parent
bd20d2512c
commit
08876e30ab
@ -191,7 +191,6 @@ source/Irrlicht/Irrlicht.cpp
|
|||||||
source/Irrlicht/irrXML.cpp
|
source/Irrlicht/irrXML.cpp
|
||||||
source/Irrlicht/os.cpp
|
source/Irrlicht/os.cpp
|
||||||
source/Irrlicht/COpenGLNormalMapRenderer.cpp
|
source/Irrlicht/COpenGLNormalMapRenderer.cpp
|
||||||
source/Irrlicht/BuiltInFont.h
|
|
||||||
source/Irrlicht/CAnimatedMeshSceneNode.h
|
source/Irrlicht/CAnimatedMeshSceneNode.h
|
||||||
source/Irrlicht/CAttributeImpl.h
|
source/Irrlicht/CAttributeImpl.h
|
||||||
source/Irrlicht/CAttributes.h
|
source/Irrlicht/CAttributes.h
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -40,7 +40,6 @@
|
|||||||
#include "IWriteFile.h"
|
#include "IWriteFile.h"
|
||||||
#include "IXMLWriter.h"
|
#include "IXMLWriter.h"
|
||||||
|
|
||||||
#include "BuiltInFont.h"
|
|
||||||
#include "os.h"
|
#include "os.h"
|
||||||
|
|
||||||
namespace irr
|
namespace irr
|
||||||
@ -78,8 +77,6 @@ CGUIEnvironment::CGUIEnvironment(io::IFileSystem* fs, video::IVideoDriver* drive
|
|||||||
registerGUIElementFactory(factory);
|
registerGUIElementFactory(factory);
|
||||||
factory->drop();
|
factory->drop();
|
||||||
|
|
||||||
loadBuiltInFont();
|
|
||||||
|
|
||||||
IGUISkin* skin = createSkin( gui::EGST_WINDOWS_METALLIC );
|
IGUISkin* skin = createSkin( gui::EGST_WINDOWS_METALLIC );
|
||||||
setSkin(skin);
|
setSkin(skin);
|
||||||
skin->drop();
|
skin->drop();
|
||||||
@ -165,29 +162,6 @@ CGUIEnvironment::~CGUIEnvironment()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void CGUIEnvironment::loadBuiltInFont()
|
|
||||||
{
|
|
||||||
io::IReadFile* file = io::createMemoryReadFile(BuiltInFontData, BuiltInFontDataSize, DefaultFontName, false);
|
|
||||||
|
|
||||||
CGUIFont* font = new CGUIFont(this, DefaultFontName );
|
|
||||||
if (!font->load(file))
|
|
||||||
{
|
|
||||||
os::Printer::log("Error: Could not load built-in Font. Did you compile without the BMP loader?", ELL_ERROR);
|
|
||||||
font->drop();
|
|
||||||
file->drop();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
SFont f;
|
|
||||||
f.NamedPath.setPath(DefaultFontName);
|
|
||||||
f.Font = font;
|
|
||||||
Fonts.push_back(f);
|
|
||||||
|
|
||||||
file->drop();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//! draws all gui elements
|
//! draws all gui elements
|
||||||
void CGUIEnvironment::drawAll()
|
void CGUIEnvironment::drawAll()
|
||||||
{
|
{
|
||||||
|
@ -262,8 +262,6 @@ private:
|
|||||||
|
|
||||||
void updateHoveredElement(core::position2d<s32> mousePos);
|
void updateHoveredElement(core::position2d<s32> mousePos);
|
||||||
|
|
||||||
void loadBuiltInFont();
|
|
||||||
|
|
||||||
struct SFont
|
struct SFont
|
||||||
{
|
{
|
||||||
io::SNamedPath NamedPath;
|
io::SNamedPath NamedPath;
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 8.1 KiB |
Loading…
x
Reference in New Issue
Block a user