summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/bgfx/examples/common/font/text_metrics.h
diff options
context:
space:
mode:
author Julian Sikorski <belegdol+github@gmail.com>2019-10-13 13:50:38 +0200
committer R. Belmont <rb6502@users.noreply.github.com>2019-10-13 07:50:38 -0400
commit0837e7451a84f95c29dbdb9bd6b8b931fee1635d (patch)
tree626bcbd250a7fbebdf5958a288d2f438d4f9fb5a /3rdparty/bgfx/examples/common/font/text_metrics.h
parentc913ccb59d713ce0b91135520719ac5385e54358 (diff)
WIP: sync bgfx, bx and bimg with latest upstream (#5723)
* Sync with bgfx upstream revision b91d0b6 * Sync with bx upstream revision d60912b * Sync with bimg upstream revision bd81f60 * Add astc-codec decoder * Rename VertexDecl to VertexLayout * Rename UniformType enum Int1 to Sampler. * Add NVN stub * Fix unused-const-variable error on macOS * Drop redundant explicit language parameters buildoptions_cpp are only applied to c++ files and buildoptions_objcpp are only applied to objective c++ files. As such, hardcoding -x offers no benefit while preventing overrides (such as one needed by 3rdparty/bgfx/src/renderer_vk.cpp on macOS) from working. * Re-introduce -x c++ in places where C code is compiled as C++ to prevent clang from throwing a warning * Build bgfx as Objective-C++ on macOS It is needed due to included headers * Enable Direct3D12 and Vulkan bgfx rendering backends * Enable building of spirv shaders * Properly escape /c in cmd call * Comment out dx12 bgfx renderer * Honor VERBOSE setting during shaders build * Only invert hlsl shader XYZ_TO_sRGB matrix for opengl * Add spirv shaders * OpenGL ES needs transposed matrix too * Metal needs transposed matrix as well
Diffstat (limited to '3rdparty/bgfx/examples/common/font/text_metrics.h')
-rw-r--r--3rdparty/bgfx/examples/common/font/text_metrics.h16
1 files changed, 2 insertions, 14 deletions
diff --git a/3rdparty/bgfx/examples/common/font/text_metrics.h b/3rdparty/bgfx/examples/common/font/text_metrics.h
index 48c9323580e..e6a14543b16 100644
--- a/3rdparty/bgfx/examples/common/font/text_metrics.h
+++ b/3rdparty/bgfx/examples/common/font/text_metrics.h
@@ -47,22 +47,10 @@ public:
float getLineHeight() const { return m_lineHeight; }
/// Return the number of text line in the given text.
- uint32_t getLineCount(const char* _string) const;
-
- /// Return the number of text line in the given text.
- uint32_t getLineCount(const wchar_t* _string) const;
-
- /// Return the first and last character visible in the [_firstLine, _lastLine] range.
- void getSubText(const char* _string, uint32_t _firstLine, uint32_t _lastLine, const char*& _begin, const char*& _end);
+ uint32_t getLineCount(const bx::StringView& _string) const;
/// Return the first and last character visible in the [_firstLine, _lastLine] range.
- void getSubText(const wchar_t* _string, uint32_t _firstLine, uint32_t _lastLine, const wchar_t*& _begin, const wchar_t*& _end);
-
- /// Return the first and last character visible in the [_top, _bottom] range,
- void getVisibleText(const char* _string, float _top, float _bottom, const char*& _begin, const char*& _end);
-
- /// Return the first and last character visible in the [_top, _bottom] range,
- void getVisibleText(const wchar_t* _string, float _top, float _bottom, const wchar_t*& _begin, const wchar_t*& _end);
+ void getSubText(const bx::StringView& _str, uint32_t _firstLine, uint32_t _lastLine, const char*& _begin, const char*& _end);
private:
float m_lineHeight;