mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-08-09 19:10:56 +02:00
Change from paragraph of usernames to single column of usernames
This commit is contained in:
parent
4e8fcd47c0
commit
d071bc50a4
1 changed files with 19 additions and 59 deletions
|
@ -11,22 +11,21 @@
|
||||||
|
|
||||||
var usersWindow = (function () {
|
var usersWindow = (function () {
|
||||||
|
|
||||||
var WINDOW_BOUNDS_2D = { x: 100, y: 100, width: 300, height: 0 },
|
var WINDOW_BOUNDS_2D = { x: 100, y: 100, width: 150, height: 0 },
|
||||||
WINDOW_MARGIN_2D = 12,
|
WINDOW_MARGIN_2D = 12,
|
||||||
WINDOW_FOREGROUND_COLOR_2D = { red: 240, green: 240, blue: 240 },
|
WINDOW_FOREGROUND_COLOR_2D = { red: 240, green: 240, blue: 240 },
|
||||||
WINDOW_FOREGROUND_ALPHA_2D = 0.9,
|
WINDOW_FOREGROUND_ALPHA_2D = 0.9,
|
||||||
WINDOW_BACKGROUND_COLOR_2D = { red: 120, green: 120, blue: 120 },
|
WINDOW_BACKGROUND_COLOR_2D = { red: 120, green: 120, blue: 120 },
|
||||||
WINDOW_BACKGROUND_ALPHA_2D = 0.7,
|
WINDOW_BACKGROUND_ALPHA_2D = 0.7,
|
||||||
usersPane2D,
|
usersPane2D,
|
||||||
USERS_PANE_TEXT_WIDTH_2D = WINDOW_BOUNDS_2D.width - 2 * WINDOW_MARGIN_2D,
|
|
||||||
USERS_FONT_2D = { size: 14 },
|
USERS_FONT_2D = { size: 14 },
|
||||||
usersLineHeight,
|
usersLineHeight,
|
||||||
usersLineSpacing,
|
usersLineSpacing,
|
||||||
USERNAME_SPACER = "\u00a0\u00a0\u00a0\u00a0", // Nonbreaking spaces
|
USERNAME_SPACER = "\u00a0\u00a0\u00a0\u00a0", // Nonbreaking spaces
|
||||||
usernameSpacerWidth2D,
|
usernameSpacerWidth2D,
|
||||||
|
|
||||||
usersOnline,
|
usersOnline, // Raw data
|
||||||
linesOfUserIndexes = [], // 2D array of lines of indexes into usersOnline
|
linesOfUsers, // Array of indexes pointing into usersOnline
|
||||||
|
|
||||||
API_URL = "https://metaverse.highfidelity.io/api/v1/users?status=online",
|
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
|
||||||
|
@ -34,7 +33,7 @@ var usersWindow = (function () {
|
||||||
processUsers,
|
processUsers,
|
||||||
usersTimedOut,
|
usersTimedOut,
|
||||||
usersTimer = null,
|
usersTimer = null,
|
||||||
UPDATE_TIMEOUT = 5000; // ms = 5s
|
UPDATE_TIMEOUT = 5000, // ms = 5s
|
||||||
|
|
||||||
MENU_NAME = "Tools",
|
MENU_NAME = "Tools",
|
||||||
MENU_ITEM = "Users Online",
|
MENU_ITEM = "Users Online",
|
||||||
|
@ -49,10 +48,7 @@ var usersWindow = (function () {
|
||||||
overlayY,
|
overlayY,
|
||||||
minY,
|
minY,
|
||||||
maxY,
|
maxY,
|
||||||
lineClicked,
|
lineClicked;
|
||||||
i,
|
|
||||||
userIndex,
|
|
||||||
foundUser;
|
|
||||||
|
|
||||||
if (!isVisible) {
|
if (!isVisible) {
|
||||||
return;
|
return;
|
||||||
|
@ -72,74 +68,38 @@ var usersWindow = (function () {
|
||||||
lineClicked = numLinesBefore;
|
lineClicked = numLinesBefore;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (0 <= lineClicked && lineClicked < linesOfUserIndexes.length) {
|
if (0 <= lineClicked && lineClicked < linesOfUsers.length
|
||||||
foundUser = false;
|
&& overlayX <= usersOnline[linesOfUsers[lineClicked]].usernameWidth) {
|
||||||
i = 0;
|
|
||||||
while (!foundUser && i < linesOfUserIndexes[lineClicked].length) {
|
|
||||||
userIndex = linesOfUserIndexes[lineClicked][i];
|
|
||||||
foundUser = usersOnline[userIndex].leftX <= overlayX && overlayX <= usersOnline[userIndex].rightX;
|
|
||||||
i += 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (foundUser) {
|
print("Go to " + usersOnline[linesOfUsers[lineClicked]].username);
|
||||||
location.goToUser(usersOnline[userIndex].username);
|
// DJRTODO
|
||||||
}
|
//location.goToUser(usersOnline[userIndex].username);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function updateWindow() {
|
function updateWindow() {
|
||||||
var displayText = "",
|
var displayText = "",
|
||||||
numUsersDisplayed = 0,
|
myUsername,
|
||||||
lineText = "",
|
|
||||||
lineWidth = 0,
|
|
||||||
myUsername = GlobalServices.username,
|
|
||||||
usernameWidth,
|
|
||||||
user,
|
user,
|
||||||
i;
|
i;
|
||||||
|
|
||||||
// Create 2D array of lines x IDs into usersOnline.
|
myUsername = GlobalServices.username;
|
||||||
// Augment usersOnline entries with x-coordinates of left and right of displayed username.
|
linesOfUsers = [];
|
||||||
linesOfUserIndexes = [];
|
|
||||||
for (i = 0; i < usersOnline.length; i += 1) {
|
for (i = 0; i < usersOnline.length; i += 1) {
|
||||||
user = usersOnline[i];
|
user = usersOnline[i];
|
||||||
if (user.username !== myUsername && user.online) {
|
if (user.username !== myUsername && user.online) {
|
||||||
|
usersOnline[i].usernameWidth = Overlays.textSize(usersPane2D, user.username).width;
|
||||||
usernameWidth = Overlays.textSize(usersPane2D, user.username).width;
|
linesOfUsers.push(i);
|
||||||
|
displayText += "\n" + user.username;
|
||||||
if (linesOfUserIndexes.length === 0
|
|
||||||
|| lineWidth + usernameSpacerWidth2D + usernameWidth > USERS_PANE_TEXT_WIDTH_2D) {
|
|
||||||
|
|
||||||
displayText += "\n" + lineText;
|
|
||||||
|
|
||||||
// New line
|
|
||||||
linesOfUserIndexes.push([i]);
|
|
||||||
usersOnline[i].leftX = 0;
|
|
||||||
usersOnline[i].rightX = usernameWidth;
|
|
||||||
|
|
||||||
lineText = user.username;
|
|
||||||
lineWidth = usernameWidth;
|
|
||||||
|
|
||||||
} else {
|
|
||||||
// Append
|
|
||||||
linesOfUserIndexes[linesOfUserIndexes.length - 1].push(i);
|
|
||||||
usersOnline[i].leftX = lineWidth + usernameSpacerWidth2D;
|
|
||||||
usersOnline[i].rightX = lineWidth + usernameSpacerWidth2D + usernameWidth;
|
|
||||||
|
|
||||||
lineText += USERNAME_SPACER + user.username;
|
|
||||||
lineWidth = usersOnline[i].rightX;
|
|
||||||
}
|
|
||||||
|
|
||||||
numUsersDisplayed += 1;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
displayText += "\n" + lineText;
|
displayText = displayText.slice(1); // Remove leading "\n".
|
||||||
displayText = displayText.slice(2); // Remove leading "\n"s.
|
|
||||||
|
|
||||||
Overlays.editOverlay(usersPane2D, {
|
Overlays.editOverlay(usersPane2D, {
|
||||||
text: numUsersDisplayed > 0 ? displayText : "No users online",
|
text: linesOfUsers.length > 0 ? displayText : "No users online",
|
||||||
height: (numUsersDisplayed > 0 ? linesOfUserIndexes.length : 1) * (usersLineHeight + usersLineSpacing)
|
height: (linesOfUsers.length > 0 ? linesOfUsers.length : 1) * (usersLineHeight + usersLineSpacing)
|
||||||
- usersLineSpacing + 2 * WINDOW_MARGIN_2D
|
- usersLineSpacing + 2 * WINDOW_MARGIN_2D
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue