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

Merge pull request #11643 from SamGondelman/billboard

Browse source 
Fix Image3DOverlay isFacingAvatar
This commit is contained in:
Bradley Austin Davis 2017-10-21 01:09:50 -07:00 committed by GitHub
commit e85494b958
3 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/ui/overlays/Image3DOverlay.cpp
View file

@ -51,13 +51,11 @@ void Image3DOverlay::update(float deltatime) {
_texture = DependencyManager::get<TextureCache>()->getTexture(_url); _texture = DependencyManager::get<TextureCache>()->getTexture(_url);
_textureIsLoaded = false; _textureIsLoaded = false;
} }
#if OVERLAY_PANELS
if (usecTimestampNow() > _transformExpiry) { if (usecTimestampNow() > _transformExpiry) {
Transform transform = getTransform(); Transform transform = getTransform();
applyTransformTo(transform); applyTransformTo(transform);
setTransform(transform); setTransform(transform);
} }
#endif
Parent::update(deltatime); Parent::update(deltatime);
} }

4
interface/src/ui/overlays/Text3DOverlay.cpp
View file

@ -257,7 +257,3 @@ bool Text3DOverlay::findRayIntersection(const glm::vec3 &origin, const glm::vec3
return Billboard3DOverlay::findRayIntersection(origin, direction, distance, face, surfaceNormal); return Billboard3DOverlay::findRayIntersection(origin, direction, distance, face, surfaceNormal);
} }
Transform Text3DOverlay::evalRenderTransform() {
return Parent::evalRenderTransform();
}

3
interface/src/ui/overlays/Text3DOverlay.h
View file

@ -65,9 +65,6 @@ public:
virtual Text3DOverlay* createClone() const override; virtual Text3DOverlay* createClone() const override;
protected:
Transform evalRenderTransform() override;
private: private:
TextRenderer3D* _textRenderer = nullptr; TextRenderer3D* _textRenderer = nullptr;