Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-20 06:20:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #118 from AleziaKurdis/PlacesApp-add-MS

Browse source 
Places App: "Add MS node" capability
This commit is contained in:
Julian Groß 2022-07-16 22:44:12 +02:00 committed by GitHub
commit d1eba882ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 111 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/system/places/federation.json
View file

@ -1,4 +1,4 @@
[ [
{"node": "https://metaverse.vircadia.com/live"}, {"node": "https://metaverse.vircadia.com/live"},
{"node": "https://mv.overte.org/server"} {"node": "https://mv.overte.org/server"}
] ]

44
scripts/system/places/places.css
View file

@ -487,6 +487,41 @@ div.placeEntry {
text-align: center; text-align: center;
} }
div.addMsEntry {
width: 85%;
height: 38px;
background: #292929;
border: 0px;
border-radius: 6px;
box-shadow: 3px 3px 5px rgba(0,0,0,0.8);
margin: 6px 0px 9px 6px;
text-align: left;
}
#addMS {
margin: 8px;
width: 85%;
}
#addMsBtn {
background: #bababa;
background-image: linear-gradient(to bottom, #bababa, #424242);
border-radius: 4px;
color: #ffffff;
font-size: 18px;
padding: 1px 5px 1px 5px;
border: 0px;
text-decoration: none;
font-weight: 700;
}
#addMsBtn:hover {
background: #e0e0e0;
background-image: linear-gradient(to bottom, #e0e0e0, #737373);
text-decoration: none;
font-weight: 700;
}
div.placeEntryHighlighter { div.placeEntryHighlighter {
width: 85%; width: 85%;
height: 80px; height: 80px;
@ -847,7 +882,7 @@ td.warningTitle {
font-size: 10px; font-size: 10px;
font-style: none; font-style: none;
color: #ffffff; color: #ffffff;
text-align: left; text-align: left;
} }
.region-LOCAL { .region-LOCAL {
@ -913,3 +948,10 @@ button.federationFilterOn:hover {
button.externalFilterOn:hover { button.externalFilterOn:hover {
border: solid #00e2ff 1px; border: solid #00e2ff 1px;
} }
#reloading {
width: 80%;
color: #ffffff;
font-size: 18px;
text-align: center;
}

86
scripts/system/places/places.html
View file

@ -245,11 +245,14 @@
metaverseCounter++; metaverseCounter++;
} }
formattedMetaverseList = formattedMetaverseList + "<div class = 'addMsEntry'><input type = 'text' id='addMS'> <button id='addMsBtn' onclick='addMS();'>&plus;</button></div>";
formattedMetaverseList = formattedMetaverseList + "<div id='reloading'></div>";
document.getElementById("searchFiltersBar").style.display = "none"; document.getElementById("searchFiltersBar").style.display = "none";
document.getElementById("list_content").innerHTML = formattedMetaverseList; document.getElementById("list_content").innerHTML = formattedMetaverseList;
var metaversePageInfo = " nodes"; var metaversePageInfo = " nodes";
if (metaverseCounter <= 1) { if (metaverseCounter <= 1) {
metaversePageInfo = " node"; metaversePageInfo = " node";
@ -261,11 +264,11 @@
if (currentListFormat === "DOMAINS") { if (currentListFormat === "DOMAINS") {
placeRecords.sort(sortDomainsOrder); placeRecords.sort(sortDomainsOrder);
} }
var currentDomain = ""; var currentDomain = "";
var counter = 0; var counter = 0;
var formatedList = ""; var formatedList = "";
if (warning !== "") { if (warning !== "") {
formatedList = formatedList + "<div class='warningEntry'>"; formatedList = formatedList + "<div class='warningEntry'>";
formatedList = formatedList + "<table class='warningTable'>"; formatedList = formatedList + "<table class='warningTable'>";
@ -276,14 +279,14 @@
formatedList = formatedList + "</table>"; formatedList = formatedList + "</table>";
formatedList = formatedList + "</div>"; formatedList = formatedList + "</div>";
} }
for (var i = 0; i < placeRecords.length; i++) { for (var i = 0; i < placeRecords.length; i++) {
if (counter === loadRecordsUpTo) { if (counter === loadRecordsUpTo) {
//Display Load More button //Display Load More button
formatedList = formatedList + "<div id='loadMore'><button id='loadMoreBtn' onClick='loadMore();'>LOAD MORE...</button></div>"; formatedList = formatedList + "<div id='loadMore'><button id='loadMoreBtn' onClick='loadMore();'>LOAD MORE...</button></div>";
break; break;
} }
/* /*
Here's where you generate the list. Here's where you generate the list.
@ -337,7 +340,7 @@
placeRecords[i].capacity placeRecords[i].capacity
Number (Would be the max number of user allowed in the targetted domain.) Number (Would be the max number of user allowed in the targetted domain.)
placeRecords[i].tags placeRecords[i].tags
String: Preformated list of tags String: Preformated list of tags
@ -364,7 +367,7 @@
} else { } else {
document.getElementById("searchFiltersBar").style.display = "none"; document.getElementById("searchFiltersBar").style.display = "none";
} }
var lowerCasePlaceName = placeRecords[i].name.toLowerCase(); var lowerCasePlaceName = placeRecords[i].name.toLowerCase();
var lowerCasePlaceDescription = placeRecords[i].description.toLowerCase(); var lowerCasePlaceDescription = placeRecords[i].description.toLowerCase();
var lowerCasePlaceManagers = placeRecords[i].managers.toLowerCase(); var lowerCasePlaceManagers = placeRecords[i].managers.toLowerCase();
@ -380,12 +383,12 @@
(lowerCasePlaceTags.indexOf(searchedText.toLowerCase()) !== -1 && seachedFieldsFilter.indexOf("tags") !== -1) ) { (lowerCasePlaceTags.indexOf(searchedText.toLowerCase()) !== -1 && seachedFieldsFilter.indexOf("tags") !== -1) ) {
if (currentListFormat === "DOMAINS" && currentDomain !== placeRecords[i].domain) { if (currentListFormat === "DOMAINS" && currentDomain !== placeRecords[i].domain) {
var capacity = "?"; var capacity = "?";
if (placeRecords[i].capacity !== 0) { if (placeRecords[i].capacity !== 0) {
capacity = placeRecords[i].capacity; capacity = placeRecords[i].capacity;
} }
//display Domain section //display Domain section
formatedList = formatedList + "<div id='domainEntry' class='domainEntry'>"; formatedList = formatedList + "<div id='domainEntry' class='domainEntry'>";
formatedList = formatedList + "<table class='domainTable'>"; formatedList = formatedList + "<table class='domainTable'>";
@ -400,7 +403,7 @@
currentDomain = placeRecords[i].domain; currentDomain = placeRecords[i].domain;
} }
var moreStyle = ""; var moreStyle = "";
if (placeRecords[i].category === "A") { if (placeRecords[i].category === "A") {
moreStyle = " style='background-image: url(" + placeRecords[i].thumbnail + "); background-repeat: no-repeat; background-position: 50% 50%; background-size: cover;'"; moreStyle = " style='background-image: url(" + placeRecords[i].thumbnail + "); background-repeat: no-repeat; background-position: 50% 50%; background-size: cover;'";
@ -409,21 +412,21 @@
} else if (placeRecords[i].category === "U") { //TO REMOVE ONCE BEACONS GET REMOVED } else if (placeRecords[i].category === "U") { //TO REMOVE ONCE BEACONS GET REMOVED
moreStyle = " style='background-color: #38130f;'"; moreStyle = " style='background-color: #38130f;'";
} }
var shortenedDescription = placeRecords[i].description.substr(0, 55); var shortenedDescription = placeRecords[i].description.substr(0, 55);
if (shortenedDescription.slice(-1) !== ".") { if (shortenedDescription.slice(-1) !== ".") {
shortenedDescription = shortenedDescription + "..."; shortenedDescription = shortenedDescription + "...";
} }
var placeUrl = "hifi://" + placeRecords[i].name; var placeUrl = "hifi://" + placeRecords[i].name;
if (placeRecords[i].category === "U") { //TO REMOVE ONCE BEACONS GET REMOVED if (placeRecords[i].category === "U") { //TO REMOVE ONCE BEACONS GET REMOVED
placeUrl = placeRecords[i].address; placeUrl = placeRecords[i].address;
} else if (placeRecords[i].metaverseRegion !== "local") { } else if (placeRecords[i].metaverseRegion !== "local") {
placeUrl = "hifi://" + placeRecords[i].address; placeUrl = "hifi://" + placeRecords[i].address;
} }
//Add the place to the list //Add the place to the list
formatedList = formatedList + "<div class = 'placeEntry' id='place-" + placeRecords[i].id + "'" + moreStyle + "><div class = 'blur'>"; formatedList = formatedList + "<div class = 'placeEntry' id='place-" + placeRecords[i].id + "'" + moreStyle + "><div class = 'blur'>";
formatedList = formatedList + "<table class='placeTable'>"; formatedList = formatedList + "<table class='placeTable'>";
formatedList = formatedList + " <tr valign = 'top'>"; formatedList = formatedList + " <tr valign = 'top'>";
@ -460,12 +463,12 @@
document.getElementById("listInfo").innerHTML = counter + placeInfo + " of " + placeRecords.length + "."; document.getElementById("listInfo").innerHTML = counter + placeInfo + " of " + placeRecords.length + ".";
} }
} }
function loadMore() { function loadMore() {
loadRecordsUpTo = loadRecordsUpTo + NUMBER_OF_RECORDS_PER_LOAD; loadRecordsUpTo = loadRecordsUpTo + NUMBER_OF_RECORDS_PER_LOAD;
generateContent(); generateContent();
} }
function teleport(placeID, address) { function teleport(placeID, address) {
var teleportOrder = { var teleportOrder = {
"channel": channel, "channel": channel,
@ -476,7 +479,7 @@
EventBridge.emitWebEvent(JSON.stringify(teleportOrder)); EventBridge.emitWebEvent(JSON.stringify(teleportOrder));
} }
function goHome() { function goHome() {
var message = { var message = {
"channel": channel, "channel": channel,
@ -484,7 +487,7 @@
}; };
EventBridge.emitWebEvent(JSON.stringify(message)); EventBridge.emitWebEvent(JSON.stringify(message));
} }
function goBack() { function goBack() {
var message = { var message = {
"channel": channel, "channel": channel,
@ -492,7 +495,7 @@
}; };
EventBridge.emitWebEvent(JSON.stringify(message)); EventBridge.emitWebEvent(JSON.stringify(message));
} }
function goForward() { function goForward() {
var message = { var message = {
"channel": channel, "channel": channel,
@ -509,8 +512,9 @@
"value": pinned "value": pinned
}; };
EventBridge.emitWebEvent(JSON.stringify(message)); EventBridge.emitWebEvent(JSON.stringify(message));
sleepFor(210); document.getElementById("reloading").innerHTML = "RELOADING...";
reload(); sleepFor(210);
reload();
} }
function fetchMetaverse(metaverseIndex, fetch) { function fetchMetaverse(metaverseIndex, fetch) {
@ -521,10 +525,11 @@
"value": fetch "value": fetch
}; };
EventBridge.emitWebEvent(JSON.stringify(message)); EventBridge.emitWebEvent(JSON.stringify(message));
document.getElementById("reloading").innerHTML = "RELOADING...";
sleepFor(210); sleepFor(210);
reload(); reload();
} }
function filterLifeOnly() { function filterLifeOnly() {
if (lifeOnlyFilter) { if (lifeOnlyFilter) {
lifeOnlyFilter = false; lifeOnlyFilter = false;
@ -569,7 +574,7 @@
loadRecordsUpTo = NUMBER_OF_RECORDS_PER_LOAD; loadRecordsUpTo = NUMBER_OF_RECORDS_PER_LOAD;
generateContent(); generateContent();
} }
function filterMaturity(targeted) { function filterMaturity(targeted) {
if (maturityFilter.indexOf(targeted) === -1) { if (maturityFilter.indexOf(targeted) === -1) {
maturityFilter.push(targeted); maturityFilter.push(targeted);
@ -591,7 +596,7 @@
displaySearchFieldsFilter(); displaySearchFieldsFilter();
generateContent(); generateContent();
} }
function arrayRemove(arr, value) { function arrayRemove(arr, value) {
return arr.filter(function(ele){ return arr.filter(function(ele){
return ele != value; return ele != value;
@ -656,13 +661,13 @@
} }
} }
function filterSearch() { function filterSearch() {
document.getElementById("clearBtn").style.display = "block"; document.getElementById("clearBtn").style.display = "block";
loadRecordsUpTo = NUMBER_OF_RECORDS_PER_LOAD; loadRecordsUpTo = NUMBER_OF_RECORDS_PER_LOAD;
generateContent(); generateContent();
} }
function teleportUsingAddressBarValue(url) { function teleportUsingAddressBarValue(url) {
var finalizedUrl = url; var finalizedUrl = url;
if (url.substr(0, 7).toLocaleLowerCase() !== "http://" && if (url.substr(0, 7).toLocaleLowerCase() !== "http://" &&
@ -679,7 +684,7 @@
loadRecordsUpTo = NUMBER_OF_RECORDS_PER_LOAD; loadRecordsUpTo = NUMBER_OF_RECORDS_PER_LOAD;
generateContent(); generateContent();
} }
function displayTab(tab) { function displayTab(tab) {
currentListFormat = tab; currentListFormat = tab;
if (tab === "PLACES") { if (tab === "PLACES") {
@ -695,11 +700,11 @@
document.getElementById("listFormatDomains").disabled = false; document.getElementById("listFormatDomains").disabled = false;
document.getElementById("listFormatMetaverse").disabled = true; document.getElementById("listFormatMetaverse").disabled = true;
} }
loadRecordsUpTo = NUMBER_OF_RECORDS_PER_LOAD; loadRecordsUpTo = NUMBER_OF_RECORDS_PER_LOAD;
generateContent(); generateContent();
} }
function openDetail(placeId) { function openDetail(placeId) {
for (var k=0; k < placeList.length; k++) { for (var k=0; k < placeList.length; k++) {
@ -718,7 +723,7 @@
document.getElementById("placeDetail-placeName").innerHTML = placeDetail.name; document.getElementById("placeDetail-placeName").innerHTML = placeDetail.name;
document.getElementById("placeDetail-managers").innerHTML = "By <br>&nbsp;&nbsp;&nbsp;&nbsp;" + placeDetail.managers; document.getElementById("placeDetail-managers").innerHTML = "By <br>&nbsp;&nbsp;&nbsp;&nbsp;" + placeDetail.managers;
document.getElementById("placeDetail-description").innerHTML = placeDetail.description; document.getElementById("placeDetail-description").innerHTML = placeDetail.description;
var placeUrl = "hifi://" + placeDetail.name; var placeUrl = "hifi://" + placeDetail.name;
if (placeDetail.category === "U") { //TO REMOVE ONCE BEACONS GET REMOVED if (placeDetail.category === "U") { //TO REMOVE ONCE BEACONS GET REMOVED
placeUrl = placeDetail.address; placeUrl = placeDetail.address;
@ -737,7 +742,7 @@
document.getElementById("placeDetail-capacity").innerHTML = "CAPACITY: <b>" + capacity + "</b>"; document.getElementById("placeDetail-capacity").innerHTML = "CAPACITY: <b>" + capacity + "</b>";
document.getElementById("placeDetail-metaverse").innerHTML = "<font class='region-" + placeDetail.metaverseRegion.toUpperCase() + "'>" + placeDetail.metaverseServer + "</font>"; document.getElementById("placeDetail-metaverse").innerHTML = "<font class='region-" + placeDetail.metaverseRegion.toUpperCase() + "'>" + placeDetail.metaverseServer + "</font>";
document.getElementById("placeDetail-region").innerHTML = "<font class='region-" + placeDetail.metaverseRegion.toUpperCase() + "'>" + placeDetail.metaverseRegion.toUpperCase() + "</font>"; document.getElementById("placeDetail-region").innerHTML = "<font class='region-" + placeDetail.metaverseRegion.toUpperCase() + "'>" + placeDetail.metaverseRegion.toUpperCase() + "</font>";
document.getElementById("placeDetail").style.width = "100%"; document.getElementById("placeDetail").style.width = "100%";
} }
@ -750,6 +755,21 @@
while(new Date().getTime() < now + milliseconds){ /* do nothing */ } while(new Date().getTime() < now + milliseconds){ /* do nothing */ }
} }
function addMS() {
var msUrlToAdd = document.getElementById("addMS").value;
if (msUrlToAdd.substr(0, 4).toLocaleLowerCase() === "http") {
var message = {
"channel": channel,
"action": "ADD_MS",
"metaverseUrl": msUrlToAdd
};
EventBridge.emitWebEvent(JSON.stringify(message));
document.getElementById("reloading").innerHTML = "RELOADING...";
sleepFor(210);
reload();
}
}
displayMaturityFilter(); displayMaturityFilter();
document.getElementById("clearBtn").style.display = "none"; document.getElementById("clearBtn").style.display = "none";
document.getElementById("searchFiltersBar").style.display = "none"; document.getElementById("searchFiltersBar").style.display = "none";

15
scripts/system/places/places.js
View file

@ -106,8 +106,19 @@
d = new Date(); d = new Date();
timestamp = d.getTime(); timestamp = d.getTime();
metaverseServers[messageObj.metaverseIndex].fetch = messageObj.value; metaverseServers[messageObj.metaverseIndex].fetch = messageObj.value;
saveMetaverseToFetchSetting(); saveMetaverseToFetchSetting();
} else if (messageObj.action === "ADD_MS" && (n - timestamp) > INTERCALL_DELAY) {
d = new Date();
timestamp = d.getTime();
var newMs = {
"url": messageObj.metaverseUrl,
"region": "external",
"fetch": false,
"pinned": true,
"order": "Z"
}
metaverseServers.push(newMs);
savePinnedMetaverseSetting();
} }
} }
} }