Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 09:09:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename getRowHeight

Browse source
This commit is contained in:
Atlante45 2015-06-12 19:50:32 +02:00
parent 26dd067982
commit 30ae78e3b6
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/entities-renderer/src/RenderableTextEntityItem.cpp
View file

@ -47,7 +47,7 @@ void RenderableTextEntityItem::render(RenderArgs* args) {
glm::vec3 maxCorner = glm::vec3(dimensions.x, 0.0f, SLIGHTLY_BEHIND); glm::vec3 maxCorner = glm::vec3(dimensions.x, 0.0f, SLIGHTLY_BEHIND);
DependencyManager::get<DeferredLightingEffect>()->renderQuad(batch, minCorner, maxCorner, backgroundColor); DependencyManager::get<DeferredLightingEffect>()->renderQuad(batch, minCorner, maxCorner, backgroundColor);
float scale = _lineHeight / _textRenderer->getRowHeight(); float scale = _lineHeight / _textRenderer->getFontSize();
transformToTopLeft.setScale(scale); // Scale to have the correct line height transformToTopLeft.setScale(scale); // Scale to have the correct line height
batch.setModelTransform(transformToTopLeft); batch.setModelTransform(transformToTopLeft);

6
libraries/render-utils/src/TextRenderer3D.cpp
View file

@ -113,7 +113,7 @@ public:
void read(QIODevice& path); void read(QIODevice& path);
glm::vec2 computeExtent(const QString& str) const; glm::vec2 computeExtent(const QString& str) const;
float getRowHeight() const { return _fontSize; } float getFontSize() const { return _fontSize; }
// Render string to batch // Render string to batch
void drawString(gpu::Batch& batch, float x, float y, const QString& str, void drawString(gpu::Batch& batch, float x, float y, const QString& str,
@ -476,9 +476,9 @@ glm::vec2 TextRenderer3D::computeExtent(const QString& str) const {
return glm::vec2(0.0f, 0.0f); return glm::vec2(0.0f, 0.0f);
} }
float TextRenderer3D::getRowHeight() const { float TextRenderer3D::getFontSize() const {
if (_font) { if (_font) {
return _font->getRowHeight(); return _font->getFontSize();
} }
return 0.0f; return 0.0f;
} }

2
libraries/render-utils/src/TextRenderer3D.h
View file

@ -50,7 +50,7 @@ public:
~TextRenderer3D(); ~TextRenderer3D();
glm::vec2 computeExtent(const QString& str) const; glm::vec2 computeExtent(const QString& str) const;
float getRowHeight() const; float getFontSize() const;
void draw(gpu::Batch& batch, float x, float y, const QString& str, const glm::vec4& color = glm::vec4(-1.0f), void draw(gpu::Batch& batch, float x, float y, const QString& str, const glm::vec4& color = glm::vec4(-1.0f),
const glm::vec2& bounds = glm::vec2(-1.0f)); const glm::vec2& bounds = glm::vec2(-1.0f));