From 88b8d7bc46316b50abedafa0ee44810b70a50083 Mon Sep 17 00:00:00 2001 From: SamGondelman Date: Fri, 20 Oct 2017 16:56:42 -0700 Subject: [PATCH] fix image3d overlay isFacingAvatar --- interface/src/ui/overlays/Image3DOverlay.cpp | 2 -- interface/src/ui/overlays/Text3DOverlay.cpp | 4 ---- interface/src/ui/overlays/Text3DOverlay.h | 3 --- 3 files changed, 9 deletions(-) diff --git a/interface/src/ui/overlays/Image3DOverlay.cpp b/interface/src/ui/overlays/Image3DOverlay.cpp index d0024d9710..313d71fc40 100644 --- a/interface/src/ui/overlays/Image3DOverlay.cpp +++ b/interface/src/ui/overlays/Image3DOverlay.cpp @@ -51,13 +51,11 @@ void Image3DOverlay::update(float deltatime) { _texture = DependencyManager::get()->getTexture(_url); _textureIsLoaded = false; } -#if OVERLAY_PANELS if (usecTimestampNow() > _transformExpiry) { Transform transform = getTransform(); applyTransformTo(transform); setTransform(transform); } -#endif Parent::update(deltatime); } diff --git a/interface/src/ui/overlays/Text3DOverlay.cpp b/interface/src/ui/overlays/Text3DOverlay.cpp index 2e55a9a471..d8188cf6dc 100644 --- a/interface/src/ui/overlays/Text3DOverlay.cpp +++ b/interface/src/ui/overlays/Text3DOverlay.cpp @@ -257,7 +257,3 @@ bool Text3DOverlay::findRayIntersection(const glm::vec3 &origin, const glm::vec3 return Billboard3DOverlay::findRayIntersection(origin, direction, distance, face, surfaceNormal); } -Transform Text3DOverlay::evalRenderTransform() { - return Parent::evalRenderTransform(); -} - diff --git a/interface/src/ui/overlays/Text3DOverlay.h b/interface/src/ui/overlays/Text3DOverlay.h index 6ed31f37b3..daa5fdc804 100644 --- a/interface/src/ui/overlays/Text3DOverlay.h +++ b/interface/src/ui/overlays/Text3DOverlay.h @@ -65,9 +65,6 @@ public: virtual Text3DOverlay* createClone() const override; -protected: - Transform evalRenderTransform() override; - private: TextRenderer3D* _textRenderer = nullptr;