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

try to make text entities fade

Browse source
This commit is contained in:
SamGondelman 2016-08-03 16:27:51 -07:00
parent 7713c1f4bf
commit d7052f6250
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,8 +15,6 @@
#include <PerfStat.h> #include <PerfStat.h>
#include <Transform.h> #include <Transform.h>
#include "RenderableTextEntityItem.h" #include "RenderableTextEntityItem.h"
#include "GLMHelpers.h" #include "GLMHelpers.h"
@ -31,8 +29,10 @@ void RenderableTextEntityItem::render(RenderArgs* args) {
Q_ASSERT(getType() == EntityTypes::Text); Q_ASSERT(getType() == EntityTypes::Text);
static const float SLIGHTLY_BEHIND = -0.005f; static const float SLIGHTLY_BEHIND = -0.005f;
glm::vec4 textColor = glm::vec4(toGlm(getTextColorX()), 1.0f); float fadeRatio = Interpolate::calculateFadeRatio(_fadeStartTime);
glm::vec4 backgroundColor = glm::vec4(toGlm(getBackgroundColorX()), 1.0f); bool transparent = fadeRatio < 1.0f;
glm::vec4 textColor = glm::vec4(toGlm(getTextColorX()), fadeRatio);
glm::vec4 backgroundColor = glm::vec4(toGlm(getBackgroundColorX()), fadeRatio);
glm::vec3 dimensions = getDimensions(); glm::vec3 dimensions = getDimensions();
// Render background // Render background
@ -62,7 +62,7 @@ void RenderableTextEntityItem::render(RenderArgs* args) {
batch.setModelTransform(transformToTopLeft); batch.setModelTransform(transformToTopLeft);
DependencyManager::get<GeometryCache>()->bindSimpleProgram(batch, false, false, false, false, true); DependencyManager::get<GeometryCache>()->bindSimpleProgram(batch, false, transparent, false, false, true);
DependencyManager::get<GeometryCache>()->renderQuad(batch, minCorner, maxCorner, backgroundColor); DependencyManager::get<GeometryCache>()->renderQuad(batch, minCorner, maxCorner, backgroundColor);
float scale = _lineHeight / _textRenderer->getFontSize(); float scale = _lineHeight / _textRenderer->getFontSize();

4
libraries/entities-renderer/src/RenderableTextEntityItem.h
View file

@ -14,6 +14,7 @@
#include <TextEntityItem.h> #include <TextEntityItem.h>
#include <TextRenderer3D.h> #include <TextRenderer3D.h>
#include <Interpolate.h>
#include "RenderableEntityItem.h" #include "RenderableEntityItem.h"
@ -27,10 +28,13 @@ public:
virtual void render(RenderArgs* args) override; virtual void render(RenderArgs* args) override;
bool isTransparent() override { return Interpolate::calculateFadeRatio(_fadeStartTime) < 1.0f; }
SIMPLE_RENDERABLE(); SIMPLE_RENDERABLE();
private: private:
TextRenderer3D* _textRenderer = TextRenderer3D::getInstance(SANS_FONT_FAMILY, FIXED_FONT_POINT_SIZE / 2.0f); TextRenderer3D* _textRenderer = TextRenderer3D::getInstance(SANS_FONT_FAMILY, FIXED_FONT_POINT_SIZE / 2.0f);
quint64 _fadeStartTime { usecTimestampNow() };
}; };

2
libraries/render-utils/src/sdf_text3D.slf
View file

@ -48,7 +48,7 @@ void main() {
packDeferredFragmentTranslucent( packDeferredFragmentTranslucent(
normalize(_normal), normalize(_normal),
a, a * Color.a,
Color.rgb, Color.rgb,
DEFAULT_FRESNEL, DEFAULT_FRESNEL,
DEFAULT_ROUGHNESS); DEFAULT_ROUGHNESS);