From 549eead9f282192bf57fa6ff440935c81b51425f Mon Sep 17 00:00:00 2001 From: David Rowe Date: Wed, 11 Mar 2015 12:36:57 -0700 Subject: [PATCH 01/18] Prepare to add visibility control --- examples/users.js | 81 +++++++++++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 35 deletions(-) diff --git a/examples/users.js b/examples/users.js index 0274cd7321..425ec0e161 100644 --- a/examples/users.js +++ b/examples/users.js @@ -13,20 +13,21 @@ var usersWindow = (function () { var WINDOW_WIDTH_2D = 150, WINDOW_MARGIN_2D = 12, + WINDOW_FONT_2D = { size: 14 }, WINDOW_FOREGROUND_COLOR_2D = { red: 240, green: 240, blue: 240 }, WINDOW_FOREGROUND_ALPHA_2D = 0.9, WINDOW_HEADING_COLOR_2D = { red: 180, green: 180, blue: 180 }, WINDOW_HEADING_ALPHA_2D = 0.9, WINDOW_BACKGROUND_COLOR_2D = { red: 80, green: 80, blue: 80 }, WINDOW_BACKGROUND_ALPHA_2D = 0.7, - windowHeight = 0, - usersPane2D, - usersHeading2D, - USERS_FONT_2D = { size: 14 }, - usersLineHeight, - usersLineSpacing, + windowPane2D, + windowHeading2D, + windowHeight, + windowTextHeight, + windowLineSpacing, + windowLineHeight, // = windowTextHeight + windowLineSpacing - usersOnline, // Raw data + usersOnline, // Raw users data linesOfUsers, // Array of indexes pointing into usersOnline API_URL = "https://metaverse.highfidelity.io/api/v1/users?status=online", @@ -59,14 +60,15 @@ var usersWindow = (function () { } clickedOverlay = Overlays.getOverlayAtPoint({ x: event.x, y: event.y }); - if (clickedOverlay === usersPane2D) { + + if (clickedOverlay === windowPane2D) { overlayX = event.x - WINDOW_MARGIN_2D; - overlayY = event.y - viewportHeight + windowHeight - WINDOW_MARGIN_2D - (usersLineHeight + usersLineSpacing); + overlayY = event.y - viewportHeight + windowHeight - WINDOW_MARGIN_2D - windowLineHeight; - numLinesBefore = Math.floor(overlayY / (usersLineHeight + usersLineSpacing)); - minY = numLinesBefore * (usersLineHeight + usersLineSpacing); - maxY = minY + usersLineHeight; + numLinesBefore = Math.floor(overlayY / windowLineHeight); + minY = numLinesBefore * windowLineHeight; + maxY = minY + windowTextHeight; lineClicked = -1; if (minY <= overlayY && overlayY <= maxY) { @@ -75,8 +77,8 @@ var usersWindow = (function () { if (0 <= lineClicked && lineClicked < linesOfUsers.length && overlayX <= usersOnline[linesOfUsers[lineClicked]].usernameWidth) { - //print("Go to " + usersOnline[linesOfUsers[lineClicked]].username); - location.goToUser(usersOnline[linesOfUsers[lineClicked]].username); + print("Go to " + usersOnline[linesOfUsers[lineClicked]].username); + //location.goToUser(usersOnline[linesOfUsers[lineClicked]].username); } } } @@ -92,22 +94,23 @@ var usersWindow = (function () { for (i = 0; i < usersOnline.length; i += 1) { user = usersOnline[i]; if (user.username !== myUsername && user.online) { - usersOnline[i].usernameWidth = Overlays.textSize(usersPane2D, user.username).width; + usersOnline[i].usernameWidth = Overlays.textSize(windowPane2D, user.username).width; linesOfUsers.push(i); displayText += "\n" + user.username; } } - windowHeight = (linesOfUsers.length > 0 ? linesOfUsers.length + 1 : 1) * (usersLineHeight + usersLineSpacing) - - usersLineSpacing + 2 * WINDOW_MARGIN_2D; // First or only line is for heading + displayText = displayText.slice(1); // Remove leading "\n". + windowHeight = (linesOfUsers.length > 0 ? linesOfUsers.length + 1 : 1) * windowLineHeight + - windowLineSpacing + 2 * WINDOW_MARGIN_2D; // First or only line is for heading - Overlays.editOverlay(usersPane2D, { + Overlays.editOverlay(windowPane2D, { y: viewportHeight - windowHeight, height: windowHeight, text: displayText }); - Overlays.editOverlay(usersHeading2D, { + Overlays.editOverlay(windowHeading2D, { y: viewportHeight - windowHeight + WINDOW_MARGIN_2D, text: linesOfUsers.length > 0 ? "Online" : "No users online" }); @@ -168,8 +171,8 @@ var usersWindow = (function () { usersTimer = null; } - Overlays.editOverlay(usersPane2D, { visible: isVisible }); - Overlays.editOverlay(usersHeading2D, { visible: isVisible }); + Overlays.editOverlay(windowPane2D, { visible: isVisible }); + Overlays.editOverlay(windowHeading2D, { visible: isVisible }); } function onMenuItemEvent(event) { @@ -180,47 +183,55 @@ var usersWindow = (function () { function update() { viewportHeight = Controller.getViewportDimensions().y; - Overlays.editOverlay(usersPane2D, { + Overlays.editOverlay(windowPane2D, { y: viewportHeight - windowHeight }); - Overlays.editOverlay(usersHeading2D, { + Overlays.editOverlay(windowHeading2D, { y: viewportHeight - windowHeight + WINDOW_MARGIN_2D }); } function setUp() { - usersPane2D = Overlays.addOverlay("text", { - bounds: { x: 0, y: 0, width: WINDOW_WIDTH_2D, height: 0 }, - topMargin: WINDOW_MARGIN_2D, + var textSizeOverlay; + + textSizeOverlay = Overlays.addOverlay("text", { font: WINDOW_FONT_2D, visible: false }); + windowTextHeight = Math.floor(Overlays.textSize(textSizeOverlay, "1").height); + windowLineSpacing = Math.floor(Overlays.textSize(textSizeOverlay, "1\n2").height - 2 * windowTextHeight); + windowLineHeight = windowTextHeight + windowLineSpacing; + Overlays.deleteOverlay(textSizeOverlay); + + windowHeight = windowTextHeight + 2 * WINDOW_MARGIN_2D; + + windowPane2D = Overlays.addOverlay("text", { + bounds: { x: 0, y: 0, width: WINDOW_WIDTH_2D, height: windowHeight }, + topMargin: WINDOW_MARGIN_2D + windowLineHeight, leftMargin: WINDOW_MARGIN_2D, color: WINDOW_FOREGROUND_COLOR_2D, alpha: WINDOW_FOREGROUND_ALPHA_2D, backgroundColor: WINDOW_BACKGROUND_COLOR_2D, backgroundAlpha: WINDOW_BACKGROUND_ALPHA_2D, text: "", - font: USERS_FONT_2D, + font: WINDOW_FONT_2D, visible: isVisible }); - usersHeading2D = Overlays.addOverlay("text", { + windowHeading2D = Overlays.addOverlay("text", { x: WINDOW_MARGIN_2D, + y: 0, width: WINDOW_WIDTH_2D - 2 * WINDOW_MARGIN_2D, - height: USERS_FONT_2D.size, + height: windowTextHeight, topMargin: 0, leftMargin: 0, color: WINDOW_HEADING_COLOR_2D, alpha: WINDOW_HEADING_ALPHA_2D, backgroundAlpha: 0.0, text: "No users online", - font: USERS_FONT_2D, + font: WINDOW_FONT_2D, visible: isVisible }); viewportHeight = Controller.getViewportDimensions().y; - usersLineHeight = Math.floor(Overlays.textSize(usersPane2D, "1").height); - usersLineSpacing = Math.floor(Overlays.textSize(usersPane2D, "1\n2").height - 2 * usersLineHeight); - Controller.mousePressEvent.connect(onMousePressEvent); Menu.addMenuItem({ @@ -241,8 +252,8 @@ var usersWindow = (function () { Menu.removeMenuItem(MENU_NAME, MENU_ITEM); Script.clearTimeout(usersTimer); - Overlays.deleteOverlay(usersHeading2D); - Overlays.deleteOverlay(usersPane2D); + Overlays.deleteOverlay(windowHeading2D); + Overlays.deleteOverlay(windowPane2D); } setUp(); From a109a18bc3fbdfd1bd34046b2c942c128202c365 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Wed, 11 Mar 2015 19:28:29 -0700 Subject: [PATCH 02/18] Add visibility control --- examples/users.js | 373 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 257 insertions(+), 116 deletions(-) diff --git a/examples/users.js b/examples/users.js index 425ec0e161..7fb61253fe 100644 --- a/examples/users.js +++ b/examples/users.js @@ -22,21 +22,30 @@ var usersWindow = (function () { WINDOW_BACKGROUND_ALPHA_2D = 0.7, windowPane2D, windowHeading2D, + VISIBILITY_SPACER_2D = 12, // Space between list of users and visibility controls + visibilityHeading2D, + VISIBILITY_RADIO_SPACE = 20, + visibilityControls2D, windowHeight, windowTextHeight, windowLineSpacing, - windowLineHeight, // = windowTextHeight + windowLineSpacing + windowLineHeight, // = windowTextHeight + windowLineSpacing - usersOnline, // Raw users data - linesOfUsers, // Array of indexes pointing into usersOnline + usersOnline, // Raw users data + linesOfUsers = [], // Array of indexes pointing into usersOnline API_URL = "https://metaverse.highfidelity.io/api/v1/users?status=online", - HTTP_GET_TIMEOUT = 60000, // ms = 1 minute + HTTP_GET_TIMEOUT = 60000, // ms = 1 minute usersRequest, processUsers, - usersTimedOut, + pollUsersTimedOut, usersTimer = null, - UPDATE_TIMEOUT = 5000, // ms = 5s + USERS_UPDATE_TIMEOUT = 5000, // ms = 5s + + myVisibility, + VISIBILITY_VALUES = ["all", "friends", "none"], + visibilityInterval, + VISIBILITY_POLL_INTERVAL = 5000, // ms = 5s MENU_NAME = "Tools", MENU_ITEM = "Users Online", @@ -46,6 +55,157 @@ var usersWindow = (function () { viewportHeight; + function calculateWindowHeight() { + // Reserve 5 lines for window heading plus visibility heading and controls + // Subtract windowLineSpacing for both end of user list and end of controls + windowHeight = (linesOfUsers.length > 0 ? linesOfUsers.length + 5 : 5) * windowLineHeight + - 2 * windowLineSpacing + VISIBILITY_SPACER_2D + 2 * WINDOW_MARGIN_2D; + } + + function updateOverlayPositions() { + var i; + + Overlays.editOverlay(windowPane2D, { + y: viewportHeight - windowHeight + }); + Overlays.editOverlay(windowHeading2D, { + y: viewportHeight - windowHeight + WINDOW_MARGIN_2D + }); + Overlays.editOverlay(visibilityHeading2D, { + y: viewportHeight - 4 * windowLineHeight + windowLineSpacing - WINDOW_MARGIN_2D + }); + for (i = 0; i < visibilityControls2D.length; i += 1) { + Overlays.editOverlay(visibilityControls2D[i].overlay, { + y: viewportHeight - (3 - i) * windowLineHeight + windowLineSpacing - WINDOW_MARGIN_2D + }); + } + } + + function updateVisibilityControls() { + var i; + + for (i = 0; i < visibilityControls2D.length; i += 1) { + Overlays.editOverlay(visibilityControls2D[i].overlay, { + color: visibilityControls2D[i].selected ? WINDOW_FOREGROUND_COLOR_2D : WINDOW_HEADING_COLOR_2D + }); + } + } + + function updateUsersDisplay() { + var displayText = "", + myUsername, + user, + i; + + myUsername = GlobalServices.username; + linesOfUsers = []; + for (i = 0; i < usersOnline.length; i += 1) { + user = usersOnline[i]; + if (user.username !== myUsername && user.online) { + usersOnline[i].usernameWidth = Overlays.textSize(windowPane2D, user.username).width; + linesOfUsers.push(i); + displayText += "\n" + user.username; + } + } + + displayText = displayText.slice(1); // Remove leading "\n". + + calculateWindowHeight(); + + Overlays.editOverlay(windowPane2D, { + y: viewportHeight - windowHeight, + height: windowHeight, + text: displayText + }); + + Overlays.editOverlay(windowHeading2D, { + y: viewportHeight - windowHeight + WINDOW_MARGIN_2D, + text: linesOfUsers.length > 0 ? "Users online" : "No users online" + }); + + updateOverlayPositions(); + } + + function pollUsers() { + usersRequest = new XMLHttpRequest(); + usersRequest.open("GET", API_URL, true); + usersRequest.timeout = HTTP_GET_TIMEOUT; + usersRequest.ontimeout = pollUsersTimedOut; + usersRequest.onreadystatechange = processUsers; + usersRequest.send(); + } + + processUsers = function () { + var response; + + if (usersRequest.readyState === usersRequest.DONE) { + if (usersRequest.status === 200) { + response = JSON.parse(usersRequest.responseText); + if (response.status !== "success") { + print("Error: Request for users status returned status = " + response.status); + usersTimer = Script.setTimeout(pollUsers, HTTP_GET_TIMEOUT); // Try again after a longer delay. + return; + } + if (!response.hasOwnProperty("data") || !response.data.hasOwnProperty("users")) { + print("Error: Request for users status returned invalid data"); + usersTimer = Script.setTimeout(pollUsers, HTTP_GET_TIMEOUT); // Try again after a longer delay. + return; + } + + usersOnline = response.data.users; + updateUsersDisplay(); + } else { + print("Error: Request for users status returned " + usersRequest.status + " " + usersRequest.statusText); + usersTimer = Script.setTimeout(pollUsers, HTTP_GET_TIMEOUT); // Try again after a longer delay. + return; + } + + usersTimer = Script.setTimeout(pollUsers, USERS_UPDATE_TIMEOUT); // Update after finished processing. + } + }; + + pollUsersTimedOut = function () { + print("Error: Request for users status timed out"); + usersTimer = Script.setTimeout(pollUsers, HTTP_GET_TIMEOUT); // Try again after a longer delay. + }; + + function pollVisibility() { + var currentVisibility = myVisibility; + + myVisibility = GlobalServices.findableBy; + if (myVisibility !== currentVisibility) { + updateVisibilityControls(); + } + } + + function setVisible(visible) { + var i; + + isVisible = visible; + + if (isVisible) { + if (usersTimer === null) { + pollUsers(); + } + } else { + Script.clearTimeout(usersTimer); + usersTimer = null; + } + + Overlays.editOverlay(windowPane2D, { visible: isVisible }); + Overlays.editOverlay(windowHeading2D, { visible: isVisible }); + Overlays.editOverlay(visibilityHeading2D, { visible: isVisible }); + for (i = 0; i < visibilityControls2D.length; i += 1) { + Overlays.editOverlay(visibilityControls2D[i].overlay, { visible: isVisible }); + } + } + + function onMenuItemEvent(event) { + if (event === MENU_ITEM) { + setVisible(Menu.isOptionChecked(MENU_ITEM)); + } + } + function onMousePressEvent(event) { var clickedOverlay, numLinesBefore, @@ -53,7 +213,9 @@ var usersWindow = (function () { overlayY, minY, maxY, - lineClicked; + lineClicked, + i, + visibilityChanged; if (!isVisible) { return; @@ -77,118 +239,33 @@ var usersWindow = (function () { if (0 <= lineClicked && lineClicked < linesOfUsers.length && overlayX <= usersOnline[linesOfUsers[lineClicked]].usernameWidth) { - print("Go to " + usersOnline[linesOfUsers[lineClicked]].username); - //location.goToUser(usersOnline[linesOfUsers[lineClicked]].username); - } - } - } - - function updateWindow() { - var displayText = "", - myUsername, - user, - i; - - myUsername = GlobalServices.username; - linesOfUsers = []; - for (i = 0; i < usersOnline.length; i += 1) { - user = usersOnline[i]; - if (user.username !== myUsername && user.online) { - usersOnline[i].usernameWidth = Overlays.textSize(windowPane2D, user.username).width; - linesOfUsers.push(i); - displayText += "\n" + user.username; + //print("Go to " + usersOnline[linesOfUsers[lineClicked]].username); + location.goToUser(usersOnline[linesOfUsers[lineClicked]].username); } } - displayText = displayText.slice(1); // Remove leading "\n". - windowHeight = (linesOfUsers.length > 0 ? linesOfUsers.length + 1 : 1) * windowLineHeight - - windowLineSpacing + 2 * WINDOW_MARGIN_2D; // First or only line is for heading - - Overlays.editOverlay(windowPane2D, { - y: viewportHeight - windowHeight, - height: windowHeight, - text: displayText - }); - - Overlays.editOverlay(windowHeading2D, { - y: viewportHeight - windowHeight + WINDOW_MARGIN_2D, - text: linesOfUsers.length > 0 ? "Online" : "No users online" - }); - } - - function requestUsers() { - usersRequest = new XMLHttpRequest(); - usersRequest.open("GET", API_URL, true); - usersRequest.timeout = HTTP_GET_TIMEOUT; - usersRequest.ontimeout = usersTimedOut; - usersRequest.onreadystatechange = processUsers; - usersRequest.send(); - } - - processUsers = function () { - var response; - - if (usersRequest.readyState === usersRequest.DONE) { - if (usersRequest.status === 200) { - response = JSON.parse(usersRequest.responseText); - if (response.status !== "success") { - print("Error: Request for users status returned status = " + response.status); - usersTimer = Script.setTimeout(requestUsers, HTTP_GET_TIMEOUT); // Try again after a longer delay. - return; - } - if (!response.hasOwnProperty("data") || !response.data.hasOwnProperty("users")) { - print("Error: Request for users status returned invalid data"); - usersTimer = Script.setTimeout(requestUsers, HTTP_GET_TIMEOUT); // Try again after a longer delay. - return; - } - - usersOnline = response.data.users; - updateWindow(); - } else { - print("Error: Request for users status returned " + usersRequest.status + " " + usersRequest.statusText); - usersTimer = Script.setTimeout(requestUsers, HTTP_GET_TIMEOUT); // Try again after a longer delay. - return; + visibilityChanged = false; + for (i = 0; i < visibilityControls2D.length; i += 1) { + if (clickedOverlay === visibilityControls2D[i].overlay) { + GlobalServices.findableBy = VISIBILITY_VALUES[i]; + visibilityChanged = true; } - - usersTimer = Script.setTimeout(requestUsers, UPDATE_TIMEOUT); // Update after finished processing. } - }; - - usersTimedOut = function () { - print("Error: Request for users status timed out"); - usersTimer = Script.setTimeout(requestUsers, HTTP_GET_TIMEOUT); // Try again after a longer delay. - }; - - function setVisible(visible) { - isVisible = visible; - - if (isVisible) { - if (usersTimer === null) { - requestUsers(); + if (visibilityChanged) { + for (i = 0; i < visibilityControls2D.length; i += 1) { + visibilityControls2D[i].selected = clickedOverlay === visibilityControls2D[i].overlay; } - } else { - Script.clearTimeout(usersTimer); - usersTimer = null; - } - - Overlays.editOverlay(windowPane2D, { visible: isVisible }); - Overlays.editOverlay(windowHeading2D, { visible: isVisible }); - } - - function onMenuItemEvent(event) { - if (event === MENU_ITEM) { - setVisible(Menu.isOptionChecked(MENU_ITEM)); + updateVisibilityControls(); } } - function update() { + function onScriptUpdate() { + var oldViewportHeight = viewportHeight; + viewportHeight = Controller.getViewportDimensions().y; - Overlays.editOverlay(windowPane2D, { - y: viewportHeight - windowHeight - }); - Overlays.editOverlay(windowHeading2D, { - y: viewportHeight - windowHeight + WINDOW_MARGIN_2D - }); + if (viewportHeight !== oldViewportHeight) { + updateOverlayPositions(); + } } function setUp() { @@ -200,10 +277,15 @@ var usersWindow = (function () { windowLineHeight = windowTextHeight + windowLineSpacing; Overlays.deleteOverlay(textSizeOverlay); - windowHeight = windowTextHeight + 2 * WINDOW_MARGIN_2D; + calculateWindowHeight(); + + viewportHeight = Controller.getViewportDimensions().y; windowPane2D = Overlays.addOverlay("text", { - bounds: { x: 0, y: 0, width: WINDOW_WIDTH_2D, height: windowHeight }, + x: 0, + y: viewportHeight, // Start up off-screen + width: WINDOW_WIDTH_2D, + height: windowHeight, topMargin: WINDOW_MARGIN_2D + windowLineHeight, leftMargin: WINDOW_MARGIN_2D, color: WINDOW_FOREGROUND_COLOR_2D, @@ -217,7 +299,7 @@ var usersWindow = (function () { windowHeading2D = Overlays.addOverlay("text", { x: WINDOW_MARGIN_2D, - y: 0, + y: viewportHeight, width: WINDOW_WIDTH_2D - 2 * WINDOW_MARGIN_2D, height: windowTextHeight, topMargin: 0, @@ -230,7 +312,56 @@ var usersWindow = (function () { visible: isVisible }); - viewportHeight = Controller.getViewportDimensions().y; + visibilityHeading2D = Overlays.addOverlay("text", { + x: WINDOW_MARGIN_2D, + y: viewportHeight, + width: WINDOW_WIDTH_2D - 2 * WINDOW_MARGIN_2D, + height: windowTextHeight, + topMargin: 0, + leftMargin: 0, + color: WINDOW_HEADING_COLOR_2D, + alpha: WINDOW_HEADING_ALPHA_2D, + backgroundAlpha: 0.0, + text: "I am visible to:", + font: WINDOW_FONT_2D, + visible: isVisible + }); + + myVisibility = GlobalServices.findableBy; + if (!/^(all|friends|none)$/.test(myVisibility)) { + print("Error: Unrecognized findableBy value"); + myVisibility = ""; + } + + visibilityControls2D = [ { + overlay: Overlays.addOverlay("text", { + x: WINDOW_MARGIN_2D + VISIBILITY_RADIO_SPACE, + y: viewportHeight, + width: WINDOW_WIDTH_2D - 2 * WINDOW_MARGIN_2D, + height: windowTextHeight, + topMargin: 0, + leftMargin: 0, + color: WINDOW_HEADING_COLOR_2D, + alpha: WINDOW_FOREGROUND_ALPHA_2D, + backgroundAlpha: 0.0, + text: "everyone", + font: WINDOW_FONT_2D, + visible: isVisible + }), + selected: myVisibility === VISIBILITY_VALUES[0] + } ]; + visibilityControls2D[1] = { + overlay: Overlays.cloneOverlay(visibilityControls2D[0].overlay), + selected: myVisibility === VISIBILITY_VALUES[1] + }; + Overlays.editOverlay(visibilityControls2D[1].overlay, { text: "my friends" }); + visibilityControls2D[2] = { + overlay: Overlays.cloneOverlay(visibilityControls2D[0].overlay), + selected: myVisibility === VISIBILITY_VALUES[2] + }; + Overlays.editOverlay(visibilityControls2D[2].overlay, { text: "no one" }); + + updateVisibilityControls(); Controller.mousePressEvent.connect(onMousePressEvent); @@ -243,17 +374,27 @@ var usersWindow = (function () { }); Menu.menuItemEvent.connect(onMenuItemEvent); - Script.update.connect(update); + Script.update.connect(onScriptUpdate); + + visibilityInterval = Script.setInterval(pollVisibility, VISIBILITY_POLL_INTERVAL); + + pollUsers(); - requestUsers(); } function tearDown() { + var i; + Menu.removeMenuItem(MENU_NAME, MENU_ITEM); + Script.clearInterval(visibilityInterval); Script.clearTimeout(usersTimer); - Overlays.deleteOverlay(windowHeading2D); Overlays.deleteOverlay(windowPane2D); + Overlays.deleteOverlay(windowHeading2D); + Overlays.deleteOverlay(visibilityHeading2D); + for (i = 0; i <= visibilityControls2D.length; i += 1) { + Overlays.deleteOverlay(visibilityControls2D[i].overlay); + } } setUp(); From eb22b0085b40da82ca5d873b44b5ad8a80d4d70b Mon Sep 17 00:00:00 2001 From: David Rowe Date: Wed, 11 Mar 2015 20:05:35 -0700 Subject: [PATCH 03/18] Add radio buttons --- examples/users.js | 75 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 54 insertions(+), 21 deletions(-) diff --git a/examples/users.js b/examples/users.js index 7fb61253fe..82fbb7be25 100644 --- a/examples/users.js +++ b/examples/users.js @@ -24,7 +24,7 @@ var usersWindow = (function () { windowHeading2D, VISIBILITY_SPACER_2D = 12, // Space between list of users and visibility controls visibilityHeading2D, - VISIBILITY_RADIO_SPACE = 20, + VISIBILITY_RADIO_SPACE = 16, visibilityControls2D, windowHeight, windowTextHeight, @@ -53,7 +53,13 @@ var usersWindow = (function () { isVisible = true, - viewportHeight; + viewportHeight, + + HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/", + RADIO_BUTTON_SVG = HIFI_PUBLIC_BUCKET + "images/radio-button.svg", + RADIO_BUTTON_SVG_DIAMETER = 14, + RADIO_BUTTON_DISPLAY_SCALE = 0.7, // 1.0 = windowTextHeight + radioButtonDiameter; function calculateWindowHeight() { // Reserve 5 lines for window heading plus visibility heading and controls @@ -63,7 +69,8 @@ var usersWindow = (function () { } function updateOverlayPositions() { - var i; + var i, + y; Overlays.editOverlay(windowPane2D, { y: viewportHeight - windowHeight @@ -75,19 +82,23 @@ var usersWindow = (function () { y: viewportHeight - 4 * windowLineHeight + windowLineSpacing - WINDOW_MARGIN_2D }); for (i = 0; i < visibilityControls2D.length; i += 1) { - Overlays.editOverlay(visibilityControls2D[i].overlay, { - y: viewportHeight - (3 - i) * windowLineHeight + windowLineSpacing - WINDOW_MARGIN_2D - }); + y = viewportHeight - (3 - i) * windowLineHeight + windowLineSpacing - WINDOW_MARGIN_2D; + Overlays.editOverlay(visibilityControls2D[i].radioOverlay, { y: y }); + Overlays.editOverlay(visibilityControls2D[i].textOverlay, { y: y }); } } function updateVisibilityControls() { - var i; + var i, + color; for (i = 0; i < visibilityControls2D.length; i += 1) { - Overlays.editOverlay(visibilityControls2D[i].overlay, { - color: visibilityControls2D[i].selected ? WINDOW_FOREGROUND_COLOR_2D : WINDOW_HEADING_COLOR_2D + color = visibilityControls2D[i].selected ? WINDOW_FOREGROUND_COLOR_2D : WINDOW_HEADING_COLOR_2D; + Overlays.editOverlay(visibilityControls2D[i].radioOverlay, { + color: color, + subImage: { y: visibilityControls2D[i].selected ? 0 : RADIO_BUTTON_SVG_DIAMETER } }); + Overlays.editOverlay(visibilityControls2D[i].textOverlay, { color: color }); } } @@ -196,7 +207,8 @@ var usersWindow = (function () { Overlays.editOverlay(windowHeading2D, { visible: isVisible }); Overlays.editOverlay(visibilityHeading2D, { visible: isVisible }); for (i = 0; i < visibilityControls2D.length; i += 1) { - Overlays.editOverlay(visibilityControls2D[i].overlay, { visible: isVisible }); + Overlays.editOverlay(visibilityControls2D[i].radioOverlay, { visible: isVisible }); + Overlays.editOverlay(visibilityControls2D[i].textOverlay, { visible: isVisible }); } } @@ -246,14 +258,16 @@ var usersWindow = (function () { visibilityChanged = false; for (i = 0; i < visibilityControls2D.length; i += 1) { - if (clickedOverlay === visibilityControls2D[i].overlay) { + // Don't need to test radioOverlay if it us under textOverlay. + if (clickedOverlay === visibilityControls2D[i].textOverlay) { GlobalServices.findableBy = VISIBILITY_VALUES[i]; visibilityChanged = true; } } if (visibilityChanged) { for (i = 0; i < visibilityControls2D.length; i += 1) { - visibilityControls2D[i].selected = clickedOverlay === visibilityControls2D[i].overlay; + // Don't need to handle radioOverlay if it us under textOverlay. + visibilityControls2D[i].selected = clickedOverlay === visibilityControls2D[i].textOverlay; } updateVisibilityControls(); } @@ -275,6 +289,7 @@ var usersWindow = (function () { windowTextHeight = Math.floor(Overlays.textSize(textSizeOverlay, "1").height); windowLineSpacing = Math.floor(Overlays.textSize(textSizeOverlay, "1\n2").height - 2 * windowTextHeight); windowLineHeight = windowTextHeight + windowLineSpacing; + radioButtonDiameter = RADIO_BUTTON_DISPLAY_SCALE * windowTextHeight; Overlays.deleteOverlay(textSizeOverlay); calculateWindowHeight(); @@ -333,14 +348,29 @@ var usersWindow = (function () { myVisibility = ""; } - visibilityControls2D = [ { - overlay: Overlays.addOverlay("text", { - x: WINDOW_MARGIN_2D + VISIBILITY_RADIO_SPACE, + visibilityControls2D = [{ + radioOverlay: Overlays.addOverlay("image", { // Create first so that it is under textOverlay. + x: WINDOW_MARGIN_2D, + y: viewportHeight, + width: radioButtonDiameter, + height: radioButtonDiameter, + imageURL: RADIO_BUTTON_SVG, + subImage: { + x: 0, + y: RADIO_BUTTON_SVG_DIAMETER, // Off + width: RADIO_BUTTON_SVG_DIAMETER, + height: RADIO_BUTTON_SVG_DIAMETER + }, + color: WINDOW_HEADING_COLOR_2D, + alpha: WINDOW_FOREGROUND_ALPHA_2D + }), + textOverlay: Overlays.addOverlay("text", { + x: WINDOW_MARGIN_2D, y: viewportHeight, width: WINDOW_WIDTH_2D - 2 * WINDOW_MARGIN_2D, height: windowTextHeight, topMargin: 0, - leftMargin: 0, + leftMargin: VISIBILITY_RADIO_SPACE, color: WINDOW_HEADING_COLOR_2D, alpha: WINDOW_FOREGROUND_ALPHA_2D, backgroundAlpha: 0.0, @@ -351,15 +381,17 @@ var usersWindow = (function () { selected: myVisibility === VISIBILITY_VALUES[0] } ]; visibilityControls2D[1] = { - overlay: Overlays.cloneOverlay(visibilityControls2D[0].overlay), + radioOverlay: Overlays.cloneOverlay(visibilityControls2D[0].radioOverlay), + textOverlay: Overlays.cloneOverlay(visibilityControls2D[0].textOverlay), selected: myVisibility === VISIBILITY_VALUES[1] }; - Overlays.editOverlay(visibilityControls2D[1].overlay, { text: "my friends" }); + Overlays.editOverlay(visibilityControls2D[1].textOverlay, { text: "my friends" }); visibilityControls2D[2] = { - overlay: Overlays.cloneOverlay(visibilityControls2D[0].overlay), + radioOverlay: Overlays.cloneOverlay(visibilityControls2D[0].radioOverlay), + textOverlay: Overlays.cloneOverlay(visibilityControls2D[0].textOverlay), selected: myVisibility === VISIBILITY_VALUES[2] }; - Overlays.editOverlay(visibilityControls2D[2].overlay, { text: "no one" }); + Overlays.editOverlay(visibilityControls2D[2].textOverlay, { text: "no one" }); updateVisibilityControls(); @@ -393,7 +425,8 @@ var usersWindow = (function () { Overlays.deleteOverlay(windowHeading2D); Overlays.deleteOverlay(visibilityHeading2D); for (i = 0; i <= visibilityControls2D.length; i += 1) { - Overlays.deleteOverlay(visibilityControls2D[i].overlay); + Overlays.deleteOverlay(visibilityControls2D[i].textOverlay); + Overlays.deleteOverlay(visibilityControls2D[i].radioOverlay); } } From 2e1679461530c5f30c20725a69fd40a314975c97 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Wed, 11 Mar 2015 21:18:53 -0700 Subject: [PATCH 04/18] Change font size to 12 --- examples/users.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/users.js b/examples/users.js index 82fbb7be25..df901329a2 100644 --- a/examples/users.js +++ b/examples/users.js @@ -13,7 +13,7 @@ var usersWindow = (function () { var WINDOW_WIDTH_2D = 150, WINDOW_MARGIN_2D = 12, - WINDOW_FONT_2D = { size: 14 }, + WINDOW_FONT_2D = { size: 12 }, WINDOW_FOREGROUND_COLOR_2D = { red: 240, green: 240, blue: 240 }, WINDOW_FOREGROUND_ALPHA_2D = 0.9, WINDOW_HEADING_COLOR_2D = { red: 180, green: 180, blue: 180 }, From dfd9506223e0a1bdacca54bae4347d6ce0d662b0 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Wed, 11 Mar 2015 21:20:47 -0700 Subject: [PATCH 05/18] Add user location after username Credit @nbq --- examples/users.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/examples/users.js b/examples/users.js index df901329a2..d9da6c89ae 100644 --- a/examples/users.js +++ b/examples/users.js @@ -116,6 +116,9 @@ var usersWindow = (function () { usersOnline[i].usernameWidth = Overlays.textSize(windowPane2D, user.username).width; linesOfUsers.push(i); displayText += "\n" + user.username; + if (user.location.root) { + displayText += " @ " + user.location.root.name; + } } } From b798761ec5767012d5b1da3935cc3907ff988cf1 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Wed, 11 Mar 2015 23:55:53 -0700 Subject: [PATCH 06/18] test fix for Austin's repro --- interface/src/Menu.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index ad03062a89..3a1e10ac4a 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -704,6 +704,12 @@ void Menu::removeAction(QMenu* menu, const QString& actionName) { } void Menu::setIsOptionChecked(const QString& menuOption, bool isChecked) { + if (thread() != QThread::currentThread()) { + QMetaObject::invokeMethod(Menu::getInstance(), "setIsOptionChecked", Qt::BlockingQueuedConnection, + Q_ARG(const QString&, menuOption), + Q_ARG(bool, isChecked)); + return; + } QAction* menu = _actionHash.value(menuOption); if (menu) { menu->setChecked(isChecked); From bbcce6a891c2b0ec312e758493e091bfca0a0827 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Thu, 12 Mar 2015 10:59:12 -0700 Subject: [PATCH 07/18] fix rendering of models in 3D TV mode --- interface/src/devices/TV3DManager.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/interface/src/devices/TV3DManager.cpp b/interface/src/devices/TV3DManager.cpp index 205ebfd29d..b5f57301f1 100644 --- a/interface/src/devices/TV3DManager.cpp +++ b/interface/src/devices/TV3DManager.cpp @@ -107,13 +107,16 @@ void TV3DManager::display(Camera& whichCamera) { const bool displayOverlays = Menu::getInstance()->isOptionChecked(MenuOption::UserInterface); DependencyManager::get()->prepare(); - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glEnable(GL_SCISSOR_TEST); // render left side view glViewport(portalX, portalY, portalW, portalH); glScissor(portalX, portalY, portalW, portalH); + + Camera eyeCamera; + eyeCamera.setRotation(whichCamera.getRotation()); + eyeCamera.setPosition(whichCamera.getPosition()); glPushMatrix(); { @@ -129,7 +132,8 @@ void TV3DManager::display(Camera& whichCamera) { glMatrixMode(GL_MODELVIEW); glLoadIdentity(); - Application::getInstance()->displaySide(whichCamera, false, RenderArgs::STEREO_LEFT); + eyeCamera.setEyeOffsetPosition(glm::vec3(-_activeEye->modelTranslation,0,0)); + Application::getInstance()->displaySide(eyeCamera, false, RenderArgs::MONO); if (displayOverlays) { applicationOverlay.displayOverlayTexture3DTV(whichCamera, _aspect, fov); @@ -150,7 +154,7 @@ void TV3DManager::display(Camera& whichCamera) { _activeEye = &_rightEye; glMatrixMode(GL_PROJECTION); glLoadIdentity(); // reset projection matrix - glFrustum(_rightEye.left, _rightEye.right, _rightEye.bottom, _rightEye.top, nearZ, farZ); // set left view frustum + glFrustum(_rightEye.left, _rightEye.right, _rightEye.bottom, _rightEye.top, nearZ, farZ); // set right view frustum GLfloat p[4][4]; glGetFloatv(GL_PROJECTION_MATRIX, &(p[0][0])); GLfloat cotangent = p[1][1]; @@ -159,7 +163,8 @@ void TV3DManager::display(Camera& whichCamera) { glMatrixMode(GL_MODELVIEW); glLoadIdentity(); - Application::getInstance()->displaySide(whichCamera, false, RenderArgs::STEREO_RIGHT); + eyeCamera.setEyeOffsetPosition(glm::vec3(-_activeEye->modelTranslation,0,0)); + Application::getInstance()->displaySide(eyeCamera, false, RenderArgs::MONO); if (displayOverlays) { applicationOverlay.displayOverlayTexture3DTV(whichCamera, _aspect, fov); From 7bfc7477486caf05fbeb29d812541e467e96fde7 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 12 Mar 2015 12:13:32 -0700 Subject: [PATCH 08/18] Revert "Revert "NOT MERGEABLE: graceful cleanup on Application dtor for NodeList"" This reverts commit 9269b2a0b2ae9d05abf721f32b3f3f91ad844b16. --- domain-server/src/DomainServer.cpp | 4 -- interface/src/Application.cpp | 40 +++++++++---------- interface/src/Application.h | 6 +-- libraries/networking/src/LimitedNodeList.cpp | 5 +++ libraries/networking/src/LimitedNodeList.h | 2 + .../networking/src/ThreadedAssignment.cpp | 4 -- 6 files changed, 27 insertions(+), 34 deletions(-) diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index d02ad73b47..7af9ffd85c 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -267,10 +267,6 @@ void DomainServer::setupNodeListAndAssignments(const QUuid& sessionUUID) { connect(nodeList.data(), &LimitedNodeList::nodeAdded, this, &DomainServer::nodeAdded); connect(nodeList.data(), &LimitedNodeList::nodeKilled, this, &DomainServer::nodeKilled); - QTimer* silentNodeTimer = new QTimer(this); - connect(silentNodeTimer, SIGNAL(timeout()), nodeList.data(), SLOT(removeSilentNodes())); - silentNodeTimer->start(NODE_SILENCE_THRESHOLD_MSECS); - connect(&nodeList->getNodeSocket(), SIGNAL(readyRead()), SLOT(readAvailableDatagrams())); // add whatever static assignments that have been parsed to the queue diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 141a58b317..5a84c7895a 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -146,7 +146,6 @@ const qint64 MAXIMUM_CACHE_SIZE = 10 * BYTES_PER_GIGABYTES; // 10GB static QTimer* locationUpdateTimer = NULL; static QTimer* balanceUpdateTimer = NULL; -static QTimer* silentNodeTimer = NULL; static QTimer* identityPacketTimer = NULL; static QTimer* billboardPacketTimer = NULL; static QTimer* checkFPStimer = NULL; @@ -258,7 +257,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : _dependencyManagerIsSetup(setupEssentials(argc, argv)), _window(new MainWindow(desktop())), _toolWindow(NULL), - _nodeThread(new QThread(this)), _datagramProcessor(), _undoStack(), _undoStackScriptingInterface(&_undoStack), @@ -329,18 +327,20 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : _runningScriptsWidget = new RunningScriptsWidget(_window); // start the nodeThread so its event loop is running - _nodeThread->setObjectName("Datagram Processor Thread"); - _nodeThread->start(); + QThread* nodeThread = new QThread(this); + nodeThread->setObjectName("Datagram Processor Thread"); + nodeThread->start(); // make sure the node thread is given highest priority - _nodeThread->setPriority(QThread::TimeCriticalPriority); + nodeThread->setPriority(QThread::TimeCriticalPriority); + + _datagramProcessor = new DatagramProcessor(nodeList.data()); // put the NodeList and datagram processing on the node thread - nodeList->moveToThread(_nodeThread); - _datagramProcessor.moveToThread(_nodeThread); + nodeList->moveToThread(nodeThread); // connect the DataProcessor processDatagrams slot to the QUDPSocket readyRead() signal - connect(&nodeList->getNodeSocket(), SIGNAL(readyRead()), &_datagramProcessor, SLOT(processDatagrams())); + connect(&nodeList->getNodeSocket(), &QUdpSocket::readyRead, _datagramProcessor, &DatagramProcessor::processDatagrams); // put the audio processing on a separate thread QThread* audioThread = new QThread(); @@ -427,12 +427,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : // connect to the packet sent signal of the _entityEditSender connect(&_entityEditSender, &EntityEditPacketSender::packetSent, this, &Application::packetSent); - // move the silentNodeTimer to the _nodeThread - silentNodeTimer = new QTimer(); - connect(silentNodeTimer, SIGNAL(timeout()), nodeList.data(), SLOT(removeSilentNodes())); - silentNodeTimer->start(NODE_SILENCE_THRESHOLD_MSECS); - silentNodeTimer->moveToThread(_nodeThread); - // send the identity packet for our avatar each second to our avatar mixer identityPacketTimer = new QTimer(); connect(identityPacketTimer, &QTimer::timeout, _myAvatar, &MyAvatar::sendIdentityPacket); @@ -547,7 +541,7 @@ void Application::aboutToQuit() { } void Application::cleanupBeforeQuit() { - _datagramProcessor.shutdown(); // tell the datagram processor we're shutting down, so it can short circuit + _datagramProcessor->shutdown(); // tell the datagram processor we're shutting down, so it can short circuit _entities.shutdown(); // tell the entities system we're shutting down, so it will stop running scripts ScriptEngine::stopAllScripts(this); // stop all currently running global scripts @@ -555,7 +549,6 @@ void Application::cleanupBeforeQuit() { // depending on what thread they run in locationUpdateTimer->stop(); balanceUpdateTimer->stop(); - QMetaObject::invokeMethod(silentNodeTimer, "stop", Qt::BlockingQueuedConnection); identityPacketTimer->stop(); billboardPacketTimer->stop(); checkFPStimer->stop(); @@ -565,7 +558,6 @@ void Application::cleanupBeforeQuit() { // and then delete those that got created by "new" delete locationUpdateTimer; delete balanceUpdateTimer; - delete silentNodeTimer; delete identityPacketTimer; delete billboardPacketTimer; delete checkFPStimer; @@ -597,10 +589,6 @@ Application::~Application() { tree->lockForWrite(); _entities.getTree()->setSimulation(NULL); tree->unlock(); - - // ask the datagram processing thread to quit and wait until it is done - _nodeThread->quit(); - _nodeThread->wait(); _octreeProcessor.terminate(); _entityEditSender.terminate(); @@ -620,6 +608,14 @@ Application::~Application() { DependencyManager::destroy(); //DependencyManager::destroy(); DependencyManager::destroy(); + + auto nodeList = DependencyManager::get(); + QThread* nodeThread = nodeList->thread(); + nodeList->deleteLater(); + + // ask the node thread to quit and wait until it is done + nodeThread->quit(); + nodeThread->wait(); qInstallMessageHandler(NULL); // NOTE: Do this as late as possible so we continue to get our log messages } @@ -1498,7 +1494,7 @@ void Application::checkFPS() { _fps = (float)_frameCount / diffTime; _frameCount = 0; - _datagramProcessor.resetCounters(); + _datagramProcessor->resetCounters(); _timerStart.start(); // ask the node list to check in with the domain server diff --git a/interface/src/Application.h b/interface/src/Application.h index bcd31fcd51..248aaa0f6a 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -445,10 +445,8 @@ private: MainWindow* _window; ToolWindow* _toolWindow; - - - QThread* _nodeThread; - DatagramProcessor _datagramProcessor; + + DatagramProcessor* _datagramProcessor; QUndoStack _undoStack; UndoStackScriptingInterface _undoStackScriptingInterface; diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp index 279d958082..520dc650ed 100644 --- a/libraries/networking/src/LimitedNodeList.cpp +++ b/libraries/networking/src/LimitedNodeList.cpp @@ -80,6 +80,10 @@ LimitedNodeList::LimitedNodeList(unsigned short socketListenPort, unsigned short connect(localSocketUpdate, &QTimer::timeout, this, &LimitedNodeList::updateLocalSockAddr); localSocketUpdate->start(LOCAL_SOCKET_UPDATE_INTERVAL_MSECS); + QTimer* silentNodeTimer = new QTimer(this); + connect(silentNodeTimer, &QTimer::timeout, this, &LimitedNodeList::removeSilentNodes); + silentNodeTimer->start(NODE_SILENCE_THRESHOLD_MSECS); + // check the local socket right now updateLocalSockAddr(); @@ -500,6 +504,7 @@ void LimitedNodeList::resetPacketStats() { } void LimitedNodeList::removeSilentNodes() { + QSet killedNodes; eachNodeHashIterator([&](NodeHash::iterator& it){ diff --git a/libraries/networking/src/LimitedNodeList.h b/libraries/networking/src/LimitedNodeList.h index afbdf23fba..a071eced31 100644 --- a/libraries/networking/src/LimitedNodeList.h +++ b/libraries/networking/src/LimitedNodeList.h @@ -223,6 +223,8 @@ protected: HifiSockAddr _localSockAddr; HifiSockAddr _publicSockAddr; HifiSockAddr _stunSockAddr; + + QTimer* _silentNodeTimer; // XXX can BandwidthRecorder be used for this? int _numCollectedPackets; diff --git a/libraries/networking/src/ThreadedAssignment.cpp b/libraries/networking/src/ThreadedAssignment.cpp index ea94a8e22c..79b4e7f437 100644 --- a/libraries/networking/src/ThreadedAssignment.cpp +++ b/libraries/networking/src/ThreadedAssignment.cpp @@ -67,10 +67,6 @@ void ThreadedAssignment::commonInit(const QString& targetName, NodeType_t nodeTy connect(domainServerTimer, SIGNAL(timeout()), this, SLOT(checkInWithDomainServerOrExit())); domainServerTimer->start(DOMAIN_SERVER_CHECK_IN_MSECS); - QTimer* silentNodeRemovalTimer = new QTimer(this); - connect(silentNodeRemovalTimer, SIGNAL(timeout()), nodeList.data(), SLOT(removeSilentNodes())); - silentNodeRemovalTimer->start(NODE_SILENCE_THRESHOLD_MSECS); - if (shouldSendStats) { // send a stats packet every 1 second QTimer* statsTimer = new QTimer(this); From 09e2c0987e6af3155b0b668b76ffc5ab2b4b0820 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 12 Mar 2015 12:27:48 -0700 Subject: [PATCH 09/18] use Dependency customDeleter for Application NL --- interface/src/Application.cpp | 10 +++++++--- libraries/networking/src/NodeList.h | 3 +++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 5a84c7895a..baa7dd633d 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -336,6 +336,11 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : _datagramProcessor = new DatagramProcessor(nodeList.data()); + // have the NodeList use deleteLater from DM customDeleter + nodeList->setCustomDeleter([](Dependency* dependency) { + static_cast(dependency)->deleteLater(); + }); + // put the NodeList and datagram processing on the node thread nodeList->moveToThread(nodeThread); @@ -609,9 +614,8 @@ Application::~Application() { //DependencyManager::destroy(); DependencyManager::destroy(); - auto nodeList = DependencyManager::get(); - QThread* nodeThread = nodeList->thread(); - nodeList->deleteLater(); + QThread* nodeThread = DependencyManager::get()->thread(); + DependencyManager::destroy(); // ask the node thread to quit and wait until it is done nodeThread->quit(); diff --git a/libraries/networking/src/NodeList.h b/libraries/networking/src/NodeList.h index 1c6de4bb6c..ccfaa7a4cf 100644 --- a/libraries/networking/src/NodeList.h +++ b/libraries/networking/src/NodeList.h @@ -37,6 +37,7 @@ const quint64 DOMAIN_SERVER_CHECK_IN_MSECS = 1 * 1000; const int MAX_SILENT_DOMAIN_SERVER_CHECK_INS = 5; +class Application; class Assignment; class NodeList : public LimitedNodeList { @@ -95,6 +96,8 @@ private: HifiSockAddr _assignmentServerSocket; bool _hasCompletedInitialSTUNFailure; unsigned int _stunRequestsSinceSuccess; + + friend class Application; }; #endif // hifi_NodeList_h From 471e55c8cedf7ab321aaed72b84dfe55c741c3a9 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 12 Mar 2015 12:36:39 -0700 Subject: [PATCH 10/18] fix some lingering warnings --- interface/src/Application.cpp | 1 - interface/src/avatar/MyAvatar.cpp | 2 - interface/src/avatar/SkeletonModel.cpp | 2 - libraries/entities/src/LightEntityItem.cpp | 1 - libraries/model/src/model/Stage.cpp | 86 +++++++++++----------- libraries/physics/src/MeshInfo.cpp | 8 +- 6 files changed, 48 insertions(+), 52 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index baa7dd633d..72c17ed09b 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2739,7 +2739,6 @@ const GLfloat WORLD_DIFFUSE_COLOR[] = { 0.6f, 0.525f, 0.525f }; const GLfloat WORLD_SPECULAR_COLOR[] = { 0.94f, 0.94f, 0.737f, 1.0f }; const glm::vec3 GLOBAL_LIGHT_COLOR = { 0.6f, 0.525f, 0.525f }; -const float GLOBAL_LIGHT_INTENSITY = 1.0f; void Application::setupWorldLight() { diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 9ecc0a3798..d9c9ff3ad1 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -49,8 +49,6 @@ using namespace std; const glm::vec3 DEFAULT_UP_DIRECTION(0.0f, 1.0f, 0.0f); const float YAW_SPEED = 500.0f; // degrees/sec const float PITCH_SPEED = 100.0f; // degrees/sec -const float COLLISION_RADIUS_SCALAR = 1.2f; // pertains to avatar-to-avatar collisions -const float COLLISION_RADIUS_SCALE = 0.125f; const float DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES = 30.0f; const float MAX_WALKING_SPEED = 2.5f; // human walking speed diff --git a/interface/src/avatar/SkeletonModel.cpp b/interface/src/avatar/SkeletonModel.cpp index d083116ecd..52dd424b71 100644 --- a/interface/src/avatar/SkeletonModel.cpp +++ b/interface/src/avatar/SkeletonModel.cpp @@ -791,8 +791,6 @@ void SkeletonModel::renderBoundingCollisionShapes(float alpha) { glPopMatrix(); } -const int BALL_SUBDIVISIONS = 10; - bool SkeletonModel::hasSkeleton() { return isActive() ? _geometry->getFBXGeometry().rootJointIndex != -1 : false; } diff --git a/libraries/entities/src/LightEntityItem.cpp b/libraries/entities/src/LightEntityItem.cpp index 3265891b18..62a44c7e21 100644 --- a/libraries/entities/src/LightEntityItem.cpp +++ b/libraries/entities/src/LightEntityItem.cpp @@ -32,7 +32,6 @@ LightEntityItem::LightEntityItem(const EntityItemID& entityItemID, const EntityI _type = EntityTypes::Light; // default property values - const quint8 MAX_COLOR = 255; _color[RED_INDEX] = _color[GREEN_INDEX] = _color[BLUE_INDEX] = 0; _intensity = 1.0f; _exponent = 0.0f; diff --git a/libraries/model/src/model/Stage.cpp b/libraries/model/src/model/Stage.cpp index 970539a908..1c171eee76 100644 --- a/libraries/model/src/model/Stage.cpp +++ b/libraries/model/src/model/Stage.cpp @@ -134,55 +134,55 @@ void EarthSunModel::setSunLongitude(float lon) { _sunLongitude = validateLongitude(lon); invalidate(); } - -Atmosphere::Atmosphere() { - // only if created from nothing shall we create the Buffer to store the properties - Data data; - _dataBuffer = gpu::BufferView(new gpu::Buffer(sizeof(Data), (const gpu::Buffer::Byte*) &data)); - + +Atmosphere::Atmosphere() { + // only if created from nothing shall we create the Buffer to store the properties + Data data; + _dataBuffer = gpu::BufferView(new gpu::Buffer(sizeof(Data), (const gpu::Buffer::Byte*) &data)); + setScatteringWavelength(_scatteringWavelength); setRayleighScattering(_rayleighScattering); setInnerOuterRadiuses(getInnerRadius(), getOuterRadius()); } -void Atmosphere::setScatteringWavelength(Vec3 wavelength) { - _scatteringWavelength = wavelength; - Data& data = editData(); - data._invWaveLength = Vec4(1.0f / powf(wavelength.x, 4.0f), 1.0f / powf(wavelength.y, 4.0f), 1.0f / powf(wavelength.z, 4.0f), 0.0f); -} - -void Atmosphere::setRayleighScattering(float scattering) { - _rayleighScattering = scattering; - updateScattering(); -} - -void Atmosphere::setMieScattering(float scattering) { - _mieScattering = scattering; - updateScattering(); -} - -void Atmosphere::setSunBrightness(float brightness) { - _sunBrightness = brightness; - updateScattering(); -} +void Atmosphere::setScatteringWavelength(Vec3 wavelength) { + _scatteringWavelength = wavelength; + Data& data = editData(); + data._invWaveLength = Vec4(1.0f / powf(wavelength.x, 4.0f), 1.0f / powf(wavelength.y, 4.0f), 1.0f / powf(wavelength.z, 4.0f), 0.0f); +} -void Atmosphere::updateScattering() { - Data& data = editData(); - - data._scatterings.x = getRayleighScattering() * getSunBrightness(); - data._scatterings.y = getMieScattering() * getSunBrightness(); - - data._scatterings.z = getRayleighScattering() * 4.0f * glm::pi(); - data._scatterings.w = getMieScattering() * 4.0f * glm::pi(); -} +void Atmosphere::setRayleighScattering(float scattering) { + _rayleighScattering = scattering; + updateScattering(); +} -void Atmosphere::setInnerOuterRadiuses(float inner, float outer) { - Data& data = editData(); - data._radiuses.x = inner; - data._radiuses.y = outer; - data._scales.x = 1.0f / (outer - inner); - data._scales.z = data._scales.x / data._scales.y; -} +void Atmosphere::setMieScattering(float scattering) { + _mieScattering = scattering; + updateScattering(); +} + +void Atmosphere::setSunBrightness(float brightness) { + _sunBrightness = brightness; + updateScattering(); +} + +void Atmosphere::updateScattering() { + Data& data = editData(); + + data._scatterings.x = getRayleighScattering() * getSunBrightness(); + data._scatterings.y = getMieScattering() * getSunBrightness(); + + data._scatterings.z = getRayleighScattering() * 4.0f * glm::pi(); + data._scatterings.w = getMieScattering() * 4.0f * glm::pi(); +} + +void Atmosphere::setInnerOuterRadiuses(float inner, float outer) { + Data& data = editData(); + data._radiuses.x = inner; + data._radiuses.y = outer; + data._scales.x = 1.0f / (outer - inner); + data._scales.z = data._scales.x / data._scales.y; +} const int NUM_DAYS_PER_YEAR = 365; @@ -267,7 +267,7 @@ void SunSkyStage::updateGraphicsObject() const { static int firstTime = 0; if (firstTime == 0) { firstTime++; - bool result = gpu::Shader::makeProgram(*(_skyPipeline->getProgram())); + gpu::Shader::makeProgram(*(_skyPipeline->getProgram())); } diff --git a/libraries/physics/src/MeshInfo.cpp b/libraries/physics/src/MeshInfo.cpp index 8df5ff914d..29ddc74a98 100644 --- a/libraries/physics/src/MeshInfo.cpp +++ b/libraries/physics/src/MeshInfo.cpp @@ -17,9 +17,11 @@ using namespace meshinfo; //origin is the default reference point for generating the tetrahedron from each triangle of the mesh. MeshInfo::MeshInfo(vector *vertices, vector *triangles) :\ -_vertices(vertices), -_triangles(triangles), -_centerOfMass(Vertex(0.0, 0.0, 0.0)){ + _vertices(vertices), + _centerOfMass(Vertex(0.0, 0.0, 0.0)), + _triangles(triangles) +{ + } MeshInfo::~MeshInfo(){ From 2bedd1cfc7bee8b11b3fce9158906fa5476de4cf Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Thu, 12 Mar 2015 12:39:06 -0700 Subject: [PATCH 11/18] Move editEntities.js to edit.js --- examples/defaultScripts.js | 2 +- examples/{editEntities.js => edit.js} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename examples/{editEntities.js => edit.js} (100%) diff --git a/examples/defaultScripts.js b/examples/defaultScripts.js index 6b57bf18dd..05ffb0bd3f 100644 --- a/examples/defaultScripts.js +++ b/examples/defaultScripts.js @@ -9,7 +9,7 @@ // Script.load("progress.js"); -Script.load("editEntities.js"); +Script.load("edit.js"); Script.load("selectAudioDevice.js"); Script.load("controllers/hydra/hydraMove.js"); Script.load("headMove.js"); diff --git a/examples/editEntities.js b/examples/edit.js similarity index 100% rename from examples/editEntities.js rename to examples/edit.js From df8864f9b096da9448c480586a0edfa861ed0e0a Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 12 Mar 2015 15:04:51 -0700 Subject: [PATCH 12/18] Revert "make sure UserActivityLogger::close() waits for the pending log message to complete" This reverts commit 3bd3f5a6d22ca68d508c90a541015ab6c122c581. --- libraries/networking/src/AccountManager.cpp | 12 ------------ libraries/networking/src/AccountManager.h | 4 ---- libraries/networking/src/UserActivityLogger.cpp | 4 +--- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/libraries/networking/src/AccountManager.cpp b/libraries/networking/src/AccountManager.cpp index e71c80efc8..2a809f2a7c 100644 --- a/libraries/networking/src/AccountManager.cpp +++ b/libraries/networking/src/AccountManager.cpp @@ -19,7 +19,6 @@ #include #include #include -#include #include #include @@ -300,8 +299,6 @@ void AccountManager::processReply() { passErrorToCallback(requestReply); } delete requestReply; - - emit replyFinished(); } void AccountManager::passSuccessToCallback(QNetworkReply* requestReply) { @@ -342,15 +339,6 @@ void AccountManager::passErrorToCallback(QNetworkReply* requestReply) { } } -void AccountManager::waitForAllPendingReplies() { - while (_pendingCallbackMap.size() > 0) { - QEventLoop loop; - QObject::connect(this, &AccountManager::replyFinished, &loop, &QEventLoop::quit); - loop.exec(); - } -} - - void AccountManager::persistAccountToSettings() { if (_shouldPersistToSettingsFile) { // store this access token into the local settings diff --git a/libraries/networking/src/AccountManager.h b/libraries/networking/src/AccountManager.h index 22d070fbe6..2c9a441db1 100644 --- a/libraries/networking/src/AccountManager.h +++ b/libraries/networking/src/AccountManager.h @@ -72,8 +72,6 @@ public: void requestProfile(); DataServerAccountInfo& getAccountInfo() { return _accountInfo; } - - void waitForAllPendingReplies(); public slots: void requestAccessToken(const QString& login, const QString& password); @@ -95,8 +93,6 @@ signals: void loginFailed(); void logoutComplete(); void balanceChanged(qint64 newBalance); - void replyFinished(); - private slots: void processReply(); void handleKeypairGenerationError(); diff --git a/libraries/networking/src/UserActivityLogger.cpp b/libraries/networking/src/UserActivityLogger.cpp index f74ea99c1e..f2646369c1 100644 --- a/libraries/networking/src/UserActivityLogger.cpp +++ b/libraries/networking/src/UserActivityLogger.cpp @@ -61,7 +61,7 @@ void UserActivityLogger::logAction(QString action, QJsonObject details, JSONCall params.errorCallbackReceiver = this; params.errorCallbackMethod = "requestError"; } - + accountManager.authenticatedRequest(USER_ACTIVITY_URL, QNetworkAccessManager::PostOperation, params, @@ -89,8 +89,6 @@ void UserActivityLogger::launch(QString applicationVersion) { void UserActivityLogger::close() { const QString ACTION_NAME = "close"; logAction(ACTION_NAME, QJsonObject()); - - AccountManager::getInstance().waitForAllPendingReplies(); } void UserActivityLogger::changedDisplayName(QString displayName) { From 0b55a0f123dc7ebfec579bfd119659394bfef6e2 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 12 Mar 2015 15:06:44 -0700 Subject: [PATCH 13/18] remove the close event from UserActivityLogger --- interface/src/Application.cpp | 4 ---- libraries/networking/src/UserActivityLogger.cpp | 5 ----- libraries/networking/src/UserActivityLogger.h | 2 +- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 72c17ed09b..3457000fdb 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -573,10 +573,6 @@ void Application::cleanupBeforeQuit() { _settingsThread.quit(); saveSettings(); _window->saveGeometry(); - - // TODO: now that this is in cleanupBeforeQuit do we really need it to stop and force - // an event loop to send the packet? - UserActivityLogger::getInstance().close(); // let the avatar mixer know we're out MyAvatar::sendKillAvatar(); diff --git a/libraries/networking/src/UserActivityLogger.cpp b/libraries/networking/src/UserActivityLogger.cpp index f2646369c1..64828708b2 100644 --- a/libraries/networking/src/UserActivityLogger.cpp +++ b/libraries/networking/src/UserActivityLogger.cpp @@ -86,11 +86,6 @@ void UserActivityLogger::launch(QString applicationVersion) { logAction(ACTION_NAME, actionDetails); } -void UserActivityLogger::close() { - const QString ACTION_NAME = "close"; - logAction(ACTION_NAME, QJsonObject()); -} - void UserActivityLogger::changedDisplayName(QString displayName) { const QString ACTION_NAME = "changed_display_name"; QJsonObject actionDetails; diff --git a/libraries/networking/src/UserActivityLogger.h b/libraries/networking/src/UserActivityLogger.h index 295ad5ee8d..2811be86a8 100644 --- a/libraries/networking/src/UserActivityLogger.h +++ b/libraries/networking/src/UserActivityLogger.h @@ -30,7 +30,7 @@ public slots: void logAction(QString action, QJsonObject details = QJsonObject(), JSONCallbackParameters params = JSONCallbackParameters()); void launch(QString applicationVersion); - void close(); + void changedDisplayName(QString displayName); void changedModel(QString typeOfModel, QString modelURL); void changedDomain(QString domainURL); From bc6ac9081fa42ed94fc89d28bc773f373bd28ff8 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 12 Mar 2015 15:08:05 -0700 Subject: [PATCH 14/18] remove the launch activity from UserActivityLogger --- interface/src/Application.cpp | 1 - libraries/networking/src/UserActivityLogger.cpp | 9 --------- libraries/networking/src/UserActivityLogger.h | 2 -- 3 files changed, 12 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 3457000fdb..2b990ec09b 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -407,7 +407,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : // set the account manager's root URL and trigger a login request if we don't have the access token accountManager.setAuthURL(DEFAULT_NODE_AUTH_URL); - UserActivityLogger::getInstance().launch(applicationVersion()); // once the event loop has started, check and signal for an access token QMetaObject::invokeMethod(&accountManager, "checkAndSignalForAccessToken", Qt::QueuedConnection); diff --git a/libraries/networking/src/UserActivityLogger.cpp b/libraries/networking/src/UserActivityLogger.cpp index 64828708b2..d21f524576 100644 --- a/libraries/networking/src/UserActivityLogger.cpp +++ b/libraries/networking/src/UserActivityLogger.cpp @@ -77,15 +77,6 @@ void UserActivityLogger::requestError(QNetworkReply& errorReply) { qDebug() << errorReply.error() << "-" << errorReply.errorString(); } -void UserActivityLogger::launch(QString applicationVersion) { - const QString ACTION_NAME = "launch"; - QJsonObject actionDetails; - QString VERSION_KEY = "version"; - actionDetails.insert(VERSION_KEY, applicationVersion); - - logAction(ACTION_NAME, actionDetails); -} - void UserActivityLogger::changedDisplayName(QString displayName) { const QString ACTION_NAME = "changed_display_name"; QJsonObject actionDetails; diff --git a/libraries/networking/src/UserActivityLogger.h b/libraries/networking/src/UserActivityLogger.h index 2811be86a8..edc17a6472 100644 --- a/libraries/networking/src/UserActivityLogger.h +++ b/libraries/networking/src/UserActivityLogger.h @@ -29,8 +29,6 @@ public slots: void disable(bool disable); void logAction(QString action, QJsonObject details = QJsonObject(), JSONCallbackParameters params = JSONCallbackParameters()); - void launch(QString applicationVersion); - void changedDisplayName(QString displayName); void changedModel(QString typeOfModel, QString modelURL); void changedDomain(QString domainURL); From 0fe843db019d644b4534e05f91c47e8d33d2d468 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 12 Mar 2015 15:53:05 -0700 Subject: [PATCH 15/18] Revert "remove the launch activity from UserActivityLogger" This reverts commit bc6ac9081fa42ed94fc89d28bc773f373bd28ff8. --- interface/src/Application.cpp | 1 + libraries/networking/src/UserActivityLogger.cpp | 9 +++++++++ libraries/networking/src/UserActivityLogger.h | 2 ++ 3 files changed, 12 insertions(+) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 2b990ec09b..3457000fdb 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -407,6 +407,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : // set the account manager's root URL and trigger a login request if we don't have the access token accountManager.setAuthURL(DEFAULT_NODE_AUTH_URL); + UserActivityLogger::getInstance().launch(applicationVersion()); // once the event loop has started, check and signal for an access token QMetaObject::invokeMethod(&accountManager, "checkAndSignalForAccessToken", Qt::QueuedConnection); diff --git a/libraries/networking/src/UserActivityLogger.cpp b/libraries/networking/src/UserActivityLogger.cpp index d21f524576..64828708b2 100644 --- a/libraries/networking/src/UserActivityLogger.cpp +++ b/libraries/networking/src/UserActivityLogger.cpp @@ -77,6 +77,15 @@ void UserActivityLogger::requestError(QNetworkReply& errorReply) { qDebug() << errorReply.error() << "-" << errorReply.errorString(); } +void UserActivityLogger::launch(QString applicationVersion) { + const QString ACTION_NAME = "launch"; + QJsonObject actionDetails; + QString VERSION_KEY = "version"; + actionDetails.insert(VERSION_KEY, applicationVersion); + + logAction(ACTION_NAME, actionDetails); +} + void UserActivityLogger::changedDisplayName(QString displayName) { const QString ACTION_NAME = "changed_display_name"; QJsonObject actionDetails; diff --git a/libraries/networking/src/UserActivityLogger.h b/libraries/networking/src/UserActivityLogger.h index edc17a6472..2811be86a8 100644 --- a/libraries/networking/src/UserActivityLogger.h +++ b/libraries/networking/src/UserActivityLogger.h @@ -29,6 +29,8 @@ public slots: void disable(bool disable); void logAction(QString action, QJsonObject details = QJsonObject(), JSONCallbackParameters params = JSONCallbackParameters()); + void launch(QString applicationVersion); + void changedDisplayName(QString displayName); void changedModel(QString typeOfModel, QString modelURL); void changedDomain(QString domainURL); From 2a84d9a6ab2944ad184778decf7d2077235088b8 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Fri, 13 Mar 2015 10:06:49 -0700 Subject: [PATCH 16/18] Fix issue with .svo's not loading when the url has parameters --- interface/src/Application.cpp | 7 ++++--- interface/src/GLCanvas.cpp | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 72c17ed09b..25077e0ac1 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -889,7 +889,7 @@ bool Application::event(QEvent* event) { if (!url.isEmpty()) { if (url.scheme() == HIFI_URL_SCHEME) { DependencyManager::get()->handleLookupString(fileEvent->url().toString()); - } else if (url.url().toLower().endsWith(SVO_EXTENSION)) { + } else if (url.path().toLower().endsWith(SVO_EXTENSION)) { emit svoImportRequested(url.url()); } } @@ -1455,10 +1455,11 @@ void Application::dropEvent(QDropEvent *event) { QString snapshotPath; const QMimeData *mimeData = event->mimeData(); foreach (QUrl url, mimeData->urls()) { - if (url.url().toLower().endsWith(SNAPSHOT_EXTENSION)) { + auto lower = url.path().toLower(); + if (lower.endsWith(SNAPSHOT_EXTENSION)) { snapshotPath = url.toLocalFile(); break; - } else if (url.url().toLower().endsWith(SVO_EXTENSION)) { + } else if (lower.endsWith(SVO_EXTENSION)) { emit svoImportRequested(url.url()); event->acceptProposedAction(); return; diff --git a/interface/src/GLCanvas.cpp b/interface/src/GLCanvas.cpp index 4ece8f0857..4587fca0f4 100644 --- a/interface/src/GLCanvas.cpp +++ b/interface/src/GLCanvas.cpp @@ -170,7 +170,7 @@ void GLCanvas::wheelEvent(QWheelEvent* event) { void GLCanvas::dragEnterEvent(QDragEnterEvent* event) { const QMimeData *mimeData = event->mimeData(); foreach (QUrl url, mimeData->urls()) { - auto lower = url.url().toLower(); + auto lower = url.path().toLower(); if (lower.endsWith(SNAPSHOT_EXTENSION) || lower.endsWith(SVO_EXTENSION)) { event->acceptProposedAction(); break; From 504dceda6b4e75f259393dc755a383d21fca5e6c Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Fri, 13 Mar 2015 10:07:12 -0700 Subject: [PATCH 17/18] Update edit.js icons --- examples/edit.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/edit.js b/examples/edit.js index c236336266..e7c8c897ac 100644 --- a/examples/edit.js +++ b/examples/edit.js @@ -126,7 +126,7 @@ var toolBar = (function () { // Hide active button for now - this may come back, so not deleting yet. activeButton = toolBar.addTool({ - imageURL: toolIconUrl + "models-tool.svg", + imageURL: toolIconUrl + "edit-status.svg", subImage: { x: 0, y: Tool.IMAGE_WIDTH, width: Tool.IMAGE_WIDTH, height: Tool.IMAGE_HEIGHT }, width: toolWidth, height: toolHeight, @@ -135,7 +135,7 @@ var toolBar = (function () { }, true, false); newModelButton = toolBar.addTool({ - imageURL: toolIconUrl + "add-model-tool.svg", + imageURL: toolIconUrl + "upload.svg", subImage: { x: 0, y: Tool.IMAGE_WIDTH, width: Tool.IMAGE_WIDTH, height: Tool.IMAGE_HEIGHT }, width: toolWidth, height: toolHeight, @@ -144,7 +144,7 @@ var toolBar = (function () { }); browseModelsButton = toolBar.addTool({ - imageURL: toolIconUrl + "list-icon.svg", + imageURL: toolIconUrl + "marketplace.svg", width: toolWidth, height: toolHeight, alpha: 0.9, From e94bac1971f3fc5e84324de22578b60f8fc0c0ca Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Fri, 13 Mar 2015 10:07:31 -0700 Subject: [PATCH 18/18] Fix subimage indexing in toolBars.js --- examples/libraries/toolBars.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/libraries/toolBars.js b/examples/libraries/toolBars.js index 951b6704ec..670a69dec7 100644 --- a/examples/libraries/toolBars.js +++ b/examples/libraries/toolBars.js @@ -94,7 +94,7 @@ Tool = function(properties, selectable, selected) { // selectable and selected a } selected = doSelect; - properties.subImage.y = (selected ? 2 : 1) * properties.subImage.height; + properties.subImage.y = (selected ? 0 : 1) * properties.subImage.height; Overlays.editOverlay(this.overlay(), { subImage: properties.subImage }); } this.toggle = function() { @@ -102,7 +102,7 @@ Tool = function(properties, selectable, selected) { // selectable and selected a return; } selected = !selected; - properties.subImage.y = (selected ? 2 : 1) * properties.subImage.height; + properties.subImage.y = (selected ? 0 : 1) * properties.subImage.height; Overlays.editOverlay(this.overlay(), { subImage: properties.subImage }); return selected;