diff options
author | 2015-02-18 08:19:17 +0100 | |
---|---|---|
committer | 2015-02-18 08:19:17 +0100 | |
commit | 5618dda14676615935d28984a6c7bc5c3dfb42d9 (patch) | |
tree | dc508e8b62a5149141b870970e376bdf1fd43e12 /3rdparty/bgfx/examples/common/font/text_buffer_manager.cpp | |
parent | b827e665e06bf5e68db6d2861f1de3166fe92288 (diff) |
Update of bx, bgfx, genie and mongoose (nw)
mongoose change should fix issue on XP
Diffstat (limited to '3rdparty/bgfx/examples/common/font/text_buffer_manager.cpp')
-rw-r--r-- | 3rdparty/bgfx/examples/common/font/text_buffer_manager.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/3rdparty/bgfx/examples/common/font/text_buffer_manager.cpp b/3rdparty/bgfx/examples/common/font/text_buffer_manager.cpp index 654d1cabec1..f3dd51342db 100644 --- a/3rdparty/bgfx/examples/common/font/text_buffer_manager.cpp +++ b/3rdparty/bgfx/examples/common/font/text_buffer_manager.cpp @@ -74,7 +74,7 @@ public: /// Append a wide char unicode string to the buffer using current pen /// position and color. void appendText(FontHandle _fontHandle, const wchar_t* _string, const wchar_t* _end = NULL); - + /// Append a whole face of the atlas cube, mostly used for debugging /// and visualizing atlas. void appendAtlasFace(uint16_t _faceIndex); @@ -250,7 +250,7 @@ void TextBuffer::appendText(FontHandle _fontHandle, const char* _string, const c } } - BX_CHECK(state == UTF8_ACCEPT, "The string is not well-formed"); + BX_CHECK(state == UTF8_ACCEPT, "The string is not well-formed"); } void TextBuffer::appendText(FontHandle _fontHandle, const wchar_t* _string, const wchar_t* _end) @@ -366,7 +366,7 @@ void TextBuffer::appendGlyph(FontHandle _handle, CodePoint _codePoint) float txtDecals = (font.ascender - m_lineAscender); m_lineAscender = font.ascender; - m_lineGap = font.lineGap; + m_lineGap = font.lineGap; verticalCenterLastLine( (txtDecals), (m_penY - m_lineAscender), (m_penY + m_lineAscender - m_lineDescender + m_lineGap) ); } @@ -575,6 +575,7 @@ TextBufferManager::TextBufferManager(FontManager* _fontManager) break; case bgfx::RendererType::Direct3D11: + case bgfx::RendererType::Direct3D12: vs_font_basic = bgfx::makeRef(vs_font_basic_dx11, sizeof(vs_font_basic_dx11) ); fs_font_basic = bgfx::makeRef(fs_font_basic_dx11, sizeof(fs_font_basic_dx11) ); vs_font_distance_field = bgfx::makeRef(vs_font_distance_field_dx11, sizeof(vs_font_distance_field_dx11) ); |