From 14f216e9c7f017b83fc9bcad20e75f8ce106244f Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 30 Oct 2014 10:05:31 -0700 Subject: [PATCH 1/2] set imageURL in ImageOverlay when imageURL is changed --- interface/src/ui/overlays/ImageOverlay.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/interface/src/ui/overlays/ImageOverlay.cpp b/interface/src/ui/overlays/ImageOverlay.cpp index b0bcd6d5ae..3b9d95af2e 100644 --- a/interface/src/ui/overlays/ImageOverlay.cpp +++ b/interface/src/ui/overlays/ImageOverlay.cpp @@ -36,6 +36,7 @@ ImageOverlay::~ImageOverlay() { // TODO: handle setting image multiple times, how do we manage releasing the bound texture? void ImageOverlay::setImageURL(const QUrl& url) { + _imageURL = url; _isLoaded = false; QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance(); QNetworkReply* reply = networkAccessManager.get(QNetworkRequest(url)); From 183d080b1ed5858bf18b2dc82e83577c023a19f2 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 30 Oct 2014 10:11:05 -0700 Subject: [PATCH 2/2] use new lobby panel wall to avoid shimmer on frame edge --- examples/lobby.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/lobby.js b/examples/lobby.js index a2d8d6ae75..9b452ae511 100644 --- a/examples/lobby.js +++ b/examples/lobby.js @@ -18,9 +18,9 @@ var reticle = false; var avatarStickPosition = {}; var orbNaturalExtentsMin = { x: -1230, y: -1223, z: -1210 }; -var orbNaturalExtentsMax = { x: 1230, y: 1229, z: 1223 }; -var panelsNaturalExtentsMin = { x: -1181, y: -326, z: 56 }; -var panelsNaturalExtentsMax = { x: 1181, y: 576, z: 1183 }; +var orbNaturalExtentsMax = { x: 1230, y: 1229, z: 1210 }; +var panelsNaturalExtentsMin = { x: -1223, y: -348, z: 45 }; +var panelsNaturalExtentsMax = { x: 1223, y: 604, z: 1223 }; var orbNaturalDimensions = Vec3.subtract(orbNaturalExtentsMax, orbNaturalExtentsMin); var panelsNaturalDimensions = Vec3.subtract(panelsNaturalExtentsMax, panelsNaturalExtentsMin); @@ -47,14 +47,14 @@ function drawLobby() { var orbPosition = Vec3.sum(Camera.getPosition(), Vec3.multiplyQbyV(towardsMe, ORB_SHIFT)); var panelWallProps = { - url: HIFI_PUBLIC_BUCKET + "models/sets/Lobby/LobbyPrototype/PanelWall3.fbx", + url: HIFI_PUBLIC_BUCKET + "models/sets/Lobby/LobbyPrototype/Lobby5_PanelsWithFrames.fbx", position: Vec3.sum(orbPosition, Vec3.multiplyQbyV(towardsMe, panelsCenterShift)), rotation: towardsMe, dimensions: panelsDimensions }; var orbShellProps = { - url: HIFI_PUBLIC_BUCKET + "models/sets/Lobby/LobbyConcepts/Lobby5_OrbShellOnly.fbx", + url: HIFI_PUBLIC_BUCKET + "models/sets/Lobby/LobbyPrototype/Lobby5_OrbNoFrames.fbx", position: orbPosition, rotation: towardsMe, dimensions: orbDimensions,