Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update from Seth

Browse source
This commit is contained in:
David Rowe 2016-12-16 16:11:27 +13:00 committed by Seth Alves
parent 8ef8de7891
commit 1b8108bfba
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/ui/overlays/Web3DOverlay.cpp
View file

@ -90,7 +90,7 @@ Web3DOverlay::~Web3DOverlay() {
} }
void Web3DOverlay::update(float deltatime) { 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? // Perhaps rather than deleting the following code it should be run only if isFacingAvatar() is true?
/* /*
if (usecTimestampNow() > _transformExpiry) { if (usecTimestampNow() > _transformExpiry) {
@ -167,8 +167,14 @@ void Web3DOverlay::render(RenderArgs* args) {
vec4 color(toGlm(getColor()), getAlpha()); vec4 color(toGlm(getColor()), getAlpha());
Transform transform = getTransform(); 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); applyTransformTo(transform, true);
setTransform(transform); setTransform(transform);
*/
if (glm::length2(getDimensions()) != 1.0f) { if (glm::length2(getDimensions()) != 1.0f) {
transform.postScale(vec3(getDimensions(), 1.0f)); transform.postScale(vec3(getDimensions(), 1.0f));
} }