sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ndk/Console: Fix compilation 

Former-commit-id: 3579cc6a392f1e74134e035192c5ecdd3e779266
This commit is contained in:
Lynix 2016-01-07 18:07:03 +01:00
parent 55cfd66c7a
commit 8441dcfa2a
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
SDK/include/NDK/Console.hpp
View File

@ -32,10 +32,11 @@ namespace Ndk
void AddLine(const Nz::String& text, const Nz::Color& color = Nz::Color::White); void AddLine(const Nz::String& text, const Nz::Color& color = Nz::Color::White);
inline const EntityHandle& GetBackground() const;
inline unsigned int GetCharacterSize() const; inline unsigned int GetCharacterSize() const;
inline const EntityHandle& GetHistory() const; inline const EntityHandle& GetHistory() const;
inline const EntityHandle& GetHistoryBackground() const;
inline const EntityHandle& GetInput() const; inline const EntityHandle& GetInput() const;
inline const EntityHandle& GetInputBackground() const;
inline const Nz::Vector2f& GetSize() const; inline const Nz::Vector2f& GetSize() const;
inline const Nz::FontRef& GetTextFont() const; inline const Nz::FontRef& GetTextFont() const;
@ -65,13 +66,13 @@ namespace Ndk
}; };
std::vector<Line> m_historyLines; std::vector<Line> m_historyLines;
EntityOwner m_background; EntityOwner m_historyBackground;
EntityOwner m_history; EntityOwner m_history;
EntityOwner m_input; EntityOwner m_input;
EntityOwner m_inputBackground; EntityOwner m_inputBackground;
Nz::FontRef m_defaultFont; Nz::FontRef m_defaultFont;
Nz::LuaInstance& m_instance; Nz::LuaInstance& m_instance;
Nz::SpriteRef m_backgroundSprite; Nz::SpriteRef m_historyBackgroundSprite;
Nz::SpriteRef m_inputBackgroundSprite; Nz::SpriteRef m_inputBackgroundSprite;
Nz::SimpleTextDrawer m_historyDrawer; Nz::SimpleTextDrawer m_historyDrawer;
Nz::SimpleTextDrawer m_inputDrawer; Nz::SimpleTextDrawer m_inputDrawer;

15
SDK/include/NDK/Console.inl
View File

@ -7,11 +7,6 @@
namespace Ndk namespace Ndk
{ {
inline const EntityHandle& Console::GetBackground() const
{
return m_background;
}
inline unsigned int Console::GetCharacterSize() const inline unsigned int Console::GetCharacterSize() const
{ {
return m_characterSize; return m_characterSize;
@ -22,11 +17,21 @@ namespace Ndk
return m_history; return m_history;
} }
inline const EntityHandle& Console::GetHistoryBackground() const
{
return m_historyBackground;
}
inline const EntityHandle& Console::GetInput() const inline const EntityHandle& Console::GetInput() const
{ {
return m_input; return m_input;
} }
inline const EntityHandle& Console::GetInputBackground() const
{
return m_inputBackground;
}
inline const Nz::Vector2f& Console::GetSize() const inline const Nz::Vector2f& Console::GetSize() const
{ {
return m_size; return m_size;