mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 17:01:18 +02:00
watch for announcements
This commit is contained in:
parent
a62a44ff6a
commit
ce7f3197f6
4 changed files with 116 additions and 4 deletions
|
@ -243,6 +243,10 @@ void WindowScriptingInterface::makeConnection(bool success, const QString& userN
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void WindowScriptingInterface::displayAnnouncement(const QString& message) {
|
||||||
|
emit announcement(message);
|
||||||
|
}
|
||||||
|
|
||||||
bool WindowScriptingInterface::isPhysicsEnabled() {
|
bool WindowScriptingInterface::isPhysicsEnabled() {
|
||||||
return qApp->isPhysicsEnabled();
|
return qApp->isPhysicsEnabled();
|
||||||
}
|
}
|
||||||
|
|
|
@ -57,6 +57,7 @@ public slots:
|
||||||
void copyToClipboard(const QString& text);
|
void copyToClipboard(const QString& text);
|
||||||
void takeSnapshot(bool notify = true, bool includeAnimated = false, float aspectRatio = 0.0f);
|
void takeSnapshot(bool notify = true, bool includeAnimated = false, float aspectRatio = 0.0f);
|
||||||
void makeConnection(bool success, const QString& userNameOrError);
|
void makeConnection(bool success, const QString& userNameOrError);
|
||||||
|
void displayAnnouncement(const QString& message);
|
||||||
void shareSnapshot(const QString& path, const QUrl& href = QUrl(""));
|
void shareSnapshot(const QString& path, const QUrl& href = QUrl(""));
|
||||||
bool isPhysicsEnabled();
|
bool isPhysicsEnabled();
|
||||||
|
|
||||||
|
@ -78,6 +79,7 @@ signals:
|
||||||
|
|
||||||
void connectionAdded(const QString& connectionName);
|
void connectionAdded(const QString& connectionName);
|
||||||
void connectionError(const QString& errorString);
|
void connectionError(const QString& errorString);
|
||||||
|
void announcement(const QString& message);
|
||||||
|
|
||||||
void messageBoxClosed(int id, int button);
|
void messageBoxClosed(int id, int button);
|
||||||
|
|
||||||
|
|
|
@ -188,10 +188,10 @@ function fadeOut(noticeOut, buttonOut, arraysOut) {
|
||||||
|
|
||||||
pauseTimer = Script.setInterval(function () {
|
pauseTimer = Script.setInterval(function () {
|
||||||
r -= 1;
|
r -= 1;
|
||||||
rFade = r / 10.0;
|
rFade = Math.max(0.0, r / 10.0);
|
||||||
Overlays.editOverlay(noticeOut, { alpha: rFade });
|
Overlays.editOverlay(noticeOut, { alpha: rFade });
|
||||||
Overlays.editOverlay(buttonOut, { alpha: rFade });
|
Overlays.editOverlay(buttonOut, { alpha: rFade });
|
||||||
if (r < 0) {
|
if (r <= 0) {
|
||||||
dismiss(noticeOut, buttonOut, arraysOut);
|
dismiss(noticeOut, buttonOut, arraysOut);
|
||||||
arrays.splice(arraysOut, 1);
|
arrays.splice(arraysOut, 1);
|
||||||
ready = true;
|
ready = true;
|
||||||
|
@ -660,6 +660,7 @@ Window.stillSnapshotTaken.connect(onSnapshotTaken);
|
||||||
Window.processingGifStarted.connect(processingGif);
|
Window.processingGifStarted.connect(processingGif);
|
||||||
Window.connectionAdded.connect(connectionAdded);
|
Window.connectionAdded.connect(connectionAdded);
|
||||||
Window.connectionError.connect(connectionError);
|
Window.connectionError.connect(connectionError);
|
||||||
|
Window.announcement.connect(onNotify);
|
||||||
Window.notifyEditError = onEditError;
|
Window.notifyEditError = onEditError;
|
||||||
Window.notify = onNotify;
|
Window.notify = onNotify;
|
||||||
Tablet.tabletNotification.connect(tabletNotification);
|
Tablet.tabletNotification.connect(tabletNotification);
|
||||||
|
|
|
@ -33,6 +33,7 @@
|
||||||
onGotoScreen = true;
|
onGotoScreen = true;
|
||||||
shouldActivateButton = true;
|
shouldActivateButton = true;
|
||||||
button.editProperties({isActive: shouldActivateButton});
|
button.editProperties({isActive: shouldActivateButton});
|
||||||
|
messagesWaiting(false);
|
||||||
} else {
|
} else {
|
||||||
shouldActivateButton = false;
|
shouldActivateButton = false;
|
||||||
onGotoScreen = false;
|
onGotoScreen = false;
|
||||||
|
@ -41,17 +42,121 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
|
var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
|
||||||
|
var NORMAL_ICON = "icons/tablet-icons/goto-i.svg";
|
||||||
|
var NORMAL_ACTIVE = "icons/tablet-icons/goto-a.svg";
|
||||||
|
var WAITING_ICON = "icons/tablet-icons/help-i.svg"; // To be changed when we get the artwork.
|
||||||
|
var WAITING_ACTIVE = "icons/tablet-icons/help-a.svg";
|
||||||
var button = tablet.addButton({
|
var button = tablet.addButton({
|
||||||
icon: "icons/tablet-icons/goto-i.svg",
|
icon: NORMAL_ICON,
|
||||||
activeIcon: "icons/tablet-icons/goto-a.svg",
|
activeIcon: NORMAL_ACTIVE,
|
||||||
text: buttonName,
|
text: buttonName,
|
||||||
sortOrder: 8
|
sortOrder: 8
|
||||||
});
|
});
|
||||||
|
function messagesWaiting(isWaiting) {
|
||||||
|
button.editProperties({
|
||||||
|
icon: isWaiting ? WAITING_ICON : NORMAL_ICON,
|
||||||
|
activeIcon: isWaiting ? WAITING_ACTIVE : NORMAL_ACTIVE
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
button.clicked.connect(onClicked);
|
button.clicked.connect(onClicked);
|
||||||
tablet.screenChanged.connect(onScreenChanged);
|
tablet.screenChanged.connect(onScreenChanged);
|
||||||
|
|
||||||
|
var METAVERSE_BASE = location.metaverseServerUrl;
|
||||||
|
function request(options, callback) { // cb(error, responseOfCorrectContentType) of url. A subset of npm request.
|
||||||
|
var httpRequest = new XMLHttpRequest(), key;
|
||||||
|
// QT bug: apparently doesn't handle onload. Workaround using readyState.
|
||||||
|
httpRequest.onreadystatechange = function () {
|
||||||
|
var READY_STATE_DONE = 4;
|
||||||
|
var HTTP_OK = 200;
|
||||||
|
if (httpRequest.readyState >= READY_STATE_DONE) {
|
||||||
|
var error = (httpRequest.status !== HTTP_OK) && httpRequest.status.toString() + ':' + httpRequest.statusText,
|
||||||
|
response = !error && httpRequest.responseText,
|
||||||
|
contentType = !error && httpRequest.getResponseHeader('content-type');
|
||||||
|
if (!error && contentType.indexOf('application/json') === 0) { // ignoring charset, etc.
|
||||||
|
try {
|
||||||
|
response = JSON.parse(response);
|
||||||
|
} catch (e) {
|
||||||
|
error = e;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
callback(error, response);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
if (typeof options === 'string') {
|
||||||
|
options = {uri: options};
|
||||||
|
}
|
||||||
|
if (options.url) {
|
||||||
|
options.uri = options.url;
|
||||||
|
}
|
||||||
|
if (!options.method) {
|
||||||
|
options.method = 'GET';
|
||||||
|
}
|
||||||
|
if (options.body && (options.method === 'GET')) { // add query parameters
|
||||||
|
var params = [], appender = (-1 === options.uri.search('?')) ? '?' : '&';
|
||||||
|
for (key in options.body) {
|
||||||
|
params.push(key + '=' + options.body[key]);
|
||||||
|
}
|
||||||
|
options.uri += appender + params.join('&');
|
||||||
|
delete options.body;
|
||||||
|
}
|
||||||
|
if (options.json) {
|
||||||
|
options.headers = options.headers || {};
|
||||||
|
options.headers["Content-type"] = "application/json";
|
||||||
|
options.body = JSON.stringify(options.body);
|
||||||
|
}
|
||||||
|
for (key in options.headers || {}) {
|
||||||
|
httpRequest.setRequestHeader(key, options.headers[key]);
|
||||||
|
}
|
||||||
|
httpRequest.open(options.method, options.uri, true);
|
||||||
|
httpRequest.send(options.body);
|
||||||
|
}
|
||||||
|
|
||||||
|
var stories = {};
|
||||||
|
var DEBUG = false;
|
||||||
|
function pollForAnnouncements() {
|
||||||
|
var actions = DEBUG ? 'snapshot' : 'announcement';
|
||||||
|
var count = DEBUG ? 10 : 100;
|
||||||
|
var options = [
|
||||||
|
'now=' + new Date().toISOString(),
|
||||||
|
'include_actions=' + actions,
|
||||||
|
'restriction=' + (Account.isLoggedIn() ? 'open,hifi' : 'open'),
|
||||||
|
'require_online=true',
|
||||||
|
'protocol=' + encodeURIComponent(location.protocolVersion()),
|
||||||
|
'per_page=' + count
|
||||||
|
];
|
||||||
|
var url = location.metaverseServerUrl + '/api/v1/user_stories?' + options.join('&');
|
||||||
|
request({
|
||||||
|
uri: url
|
||||||
|
}, function (error, data) {
|
||||||
|
if (error || (data.status !== 'success')) {
|
||||||
|
print("Error: unable to get", url, error || response.status);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
var didNotify = false;
|
||||||
|
data.user_stories.forEach(function (story) {
|
||||||
|
if (stories[story.id]) { // already seen
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
stories[story.id] = story;
|
||||||
|
var message = story.username + " says something is happending in " + story.place_name + ". Open GOTO to join them.";
|
||||||
|
Window.displayAnnouncement(message);
|
||||||
|
didNotify = true;
|
||||||
|
});
|
||||||
|
if (didNotify) {
|
||||||
|
messagesWaiting(true);
|
||||||
|
if (HMD.isHandControllerAvailable()) {
|
||||||
|
var STRENGTH = 1.0, DURATION_MS = 60, HAND = 2; // both hands
|
||||||
|
Controller.triggerHapticPulse(STRENGTH, DURATION_MS, HAND);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
var ANNOUNCEMENTS_POLL_TIME_MS = (DEBUG ? 10 : 60) * 1000;
|
||||||
|
var pollTimer = Script.setInterval(pollForAnnouncements, ANNOUNCEMENTS_POLL_TIME_MS);
|
||||||
|
|
||||||
Script.scriptEnding.connect(function () {
|
Script.scriptEnding.connect(function () {
|
||||||
|
Script.clearInterval(pollTimer);
|
||||||
button.clicked.disconnect(onClicked);
|
button.clicked.disconnect(onClicked);
|
||||||
tablet.removeButton(button);
|
tablet.removeButton(button);
|
||||||
tablet.screenChanged.disconnect(onScreenChanged);
|
tablet.screenChanged.disconnect(onScreenChanged);
|
||||||
|
|
Loading…
Reference in a new issue