From 9bf8f25ed0cabf8936af71fc757b3b7ff9820b68 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Fri, 16 Dec 2016 16:11:27 +1300 Subject: [PATCH] Update from Seth --- interface/src/ui/overlays/Web3DOverlay.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/interface/src/ui/overlays/Web3DOverlay.cpp b/interface/src/ui/overlays/Web3DOverlay.cpp index 666b8a6771..ee1a0f5256 100644 --- a/interface/src/ui/overlays/Web3DOverlay.cpp +++ b/interface/src/ui/overlays/Web3DOverlay.cpp @@ -90,7 +90,7 @@ Web3DOverlay::~Web3DOverlay() { } void Web3DOverlay::update(float deltatime) { - // FIXME: Transforms cause tablet overlay to detach from tablet entity. + // FIXME: applyTransformTo causes tablet overlay to detach from tablet entity. // Perhaps rather than deleting the following code it should be run only if isFacingAvatar() is true? /* if (usecTimestampNow() > _transformExpiry) { @@ -167,8 +167,14 @@ void Web3DOverlay::render(RenderArgs* args) { vec4 color(toGlm(getColor()), getAlpha()); Transform transform = getTransform(); + + // FIXME: applyTransformTo causes tablet overlay to detach from tablet entity. + // Perhaps rather than deleting the following code it should be run only if isFacingAvatar() is true? + /* applyTransformTo(transform, true); setTransform(transform); + */ + if (glm::length2(getDimensions()) != 1.0f) { transform.postScale(vec3(getDimensions(), 1.0f)); }