Use images off the amazon bucket, not file://.

This commit is contained in:
Zander Otavka 2015-07-24 19:30:30 -07:00
parent 3983c31219
commit c37c3ec2d2

View file

@ -17,10 +17,10 @@ Script.include([
]); ]);
var BG_IMAGE_URL = HIFI_PUBLIC_BUCKET + "images/card-bg.svg"; var BG_IMAGE_URL = HIFI_PUBLIC_BUCKET + "images/card-bg.svg";
var CLOSE_IMAGE_URL = "file:///Users/zander/Desktop/assets/close.svg"; var CLOSE_IMAGE_URL = HIFI_PUBLIC_BUCKET + "images/close.svg";
var MIC_IMAGE_URL = "file:///Users/zander/Desktop/assets/mic-composite.svg"; var MIC_IMAGE_URL = HIFI_PUBLIC_BUCKET + "images/mic-toggle.svg";
var FACE_IMAGE_URL = "file:///Users/zander/Desktop/assets/face-composite.svg"; var FACE_IMAGE_URL = HIFI_PUBLIC_BUCKET + "images/face-toggle.svg";
var ADDRESS_BAR_IMAGE_URL = "file:///Users/zander/Desktop/assets/address-bar-composite.svg"; var ADDRESS_BAR_IMAGE_URL = HIFI_PUBLIC_BUCKET + "images/address-bar-toggle.svg";
var panel = new FloatingUIPanel({ var panel = new FloatingUIPanel({
anchorPosition: { anchorPosition: {
@ -36,7 +36,6 @@ var background = new BillboardOverlay({
y: 0.5, y: 0.5,
}, },
isFacingAvatar: false, isFacingAvatar: false,
visible: true,
alpha: 1.0, alpha: 1.0,
ignoreRayIntersection: false ignoreRayIntersection: false
}); });
@ -49,7 +48,6 @@ var closeButton = new BillboardOverlay({
y: 0.15, y: 0.15,
}, },
isFacingAvatar: false, isFacingAvatar: false,
visible: true,
alpha: 1.0, alpha: 1.0,
ignoreRayIntersection: false, ignoreRayIntersection: false,
offsetPosition: { offsetPosition: {
@ -76,7 +74,6 @@ var micMuteButton = new BillboardOverlay({
y: 0.15, y: 0.15,
}, },
isFacingAvatar: false, isFacingAvatar: false,
visible: true,
alpha: 1.0, alpha: 1.0,
ignoreRayIntersection: false, ignoreRayIntersection: false,
offsetPosition: { offsetPosition: {
@ -103,7 +100,6 @@ var faceMuteButton = new BillboardOverlay({
y: 0.15, y: 0.15,
}, },
isFacingAvatar: false, isFacingAvatar: false,
visible: true,
alpha: 1.0, alpha: 1.0,
ignoreRayIntersection: false, ignoreRayIntersection: false,
offsetPosition: { offsetPosition: {
@ -130,7 +126,6 @@ var addressBarButton = new BillboardOverlay({
y: 0.15, y: 0.15,
}, },
isFacingAvatar: false, isFacingAvatar: false,
visible: true,
alpha: 1.0, alpha: 1.0,
ignoreRayIntersection: false, ignoreRayIntersection: false,
offsetPosition: { offsetPosition: {
@ -198,7 +193,7 @@ function onMouseUp(event) {
} }
if (isRightClick && event.isRightButton) { if (isRightClick && event.isRightButton) {
panel.setProperties({ panel.setProperties({
visible: true, visible: !panel.visible,
offsetRotation: { offsetRotation: {
bind: "quat", bind: "quat",
value: Quat.multiply(MyAvatar.orientation, { x: 0, y: 1, z: 0, w: 0 }) value: Quat.multiply(MyAvatar.orientation, { x: 0, y: 1, z: 0, w: 0 })
@ -210,7 +205,6 @@ function onMouseUp(event) {
function onScriptEnd(event) { function onScriptEnd(event) {
panel.destroy(); panel.destroy();
panel2.destroy();
} }
Controller.mousePressEvent.connect(onMouseDown); Controller.mousePressEvent.connect(onMouseDown);