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

Fix the Space Bubble button flash behavior

Browse source
This commit is contained in:
Zach Fox 2018-01-18 11:14:56 -08:00
parent 5ce768f402
commit 1bda3faaf2
1 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
scripts/system/bubble.js
View file

@ -18,8 +18,6 @@
var bubbleOverlayTimestamp; var bubbleOverlayTimestamp;
// Used for flashing the HUD button upon activation // Used for flashing the HUD button upon activation
var bubbleButtonFlashState = false; var bubbleButtonFlashState = false;
// Used for flashing the HUD button upon activation
var bubbleButtonTimestamp;
// Affects bubble height // Affects bubble height
var BUBBLE_HEIGHT_SCALE = 0.15; var BUBBLE_HEIGHT_SCALE = 0.15;
// The bubble model itself // The bubble model itself
@ -36,6 +34,7 @@
var bubbleActivateSound = SoundCache.getSound(Script.resolvePath("assets/sounds/bubble.wav")); var bubbleActivateSound = SoundCache.getSound(Script.resolvePath("assets/sounds/bubble.wav"));
// Is the update() function connected? // Is the update() function connected?
var updateConnected = false; var updateConnected = false;
var bubbleFlashTimer = false;
var BUBBLE_VISIBLE_DURATION_MS = 3000; var BUBBLE_VISIBLE_DURATION_MS = 3000;
var BUBBLE_RAISE_ANIMATION_DURATION_MS = 750; var BUBBLE_RAISE_ANIMATION_DURATION_MS = 750;
@ -81,9 +80,16 @@
visible: true visible: true
}); });
bubbleOverlayTimestamp = Date.now(); bubbleOverlayTimestamp = Date.now();
bubbleButtonTimestamp = bubbleOverlayTimestamp;
Script.update.connect(update); Script.update.connect(update);
updateConnected = true; updateConnected = true;
// Flash button
if (!bubbleFlashTimer) {
bubbleFlashTimer = Script.setInterval(function () {
writeButtonProperties(bubbleButtonFlashState);
bubbleButtonFlashState = !bubbleButtonFlashState;
}, 500);
}
} }
// Called from the C++ scripting interface to show the bubble overlay // Called from the C++ scripting interface to show the bubble overlay
@ -103,12 +109,6 @@
var delay = (timestamp - bubbleOverlayTimestamp); var delay = (timestamp - bubbleOverlayTimestamp);
var overlayAlpha = 1.0 - (delay / BUBBLE_VISIBLE_DURATION_MS); var overlayAlpha = 1.0 - (delay / BUBBLE_VISIBLE_DURATION_MS);
if (overlayAlpha > 0) { if (overlayAlpha > 0) {
// Flash button
if ((timestamp - bubbleButtonTimestamp) >= BUBBLE_VISIBLE_DURATION_MS) {
writeButtonProperties(bubbleButtonFlashState);
bubbleButtonTimestamp = timestamp;
bubbleButtonFlashState = !bubbleButtonFlashState;
}
if (delay < BUBBLE_RAISE_ANIMATION_DURATION_MS) { if (delay < BUBBLE_RAISE_ANIMATION_DURATION_MS) {
Overlays.editOverlay(bubbleOverlay, { Overlays.editOverlay(bubbleOverlay, {
@ -157,8 +157,11 @@
Script.update.disconnect(update); Script.update.disconnect(update);
updateConnected = false; updateConnected = false;
} }
var bubbleActive = Users.getIgnoreRadiusEnabled(); if (bubbleFlashTimer) {
writeButtonProperties(bubbleActive); Script.clearTimeout(bubbleFlashTimer);
bubbleFlashTimer = false;
}
writeButtonProperties(Users.getIgnoreRadiusEnabled());
} }
} }
@ -166,6 +169,10 @@
// NOTE: the c++ calls this with just the first param -- we added a second // NOTE: the c++ calls this with just the first param -- we added a second
// just for not logging the initial state of the bubble when we startup. // just for not logging the initial state of the bubble when we startup.
function onBubbleToggled(enabled, doNotLog) { function onBubbleToggled(enabled, doNotLog) {
if (bubbleFlashTimer) {
Script.clearTimeout(bubbleFlashTimer);
bubbleFlashTimer = false;
}
writeButtonProperties(enabled); writeButtonProperties(enabled);
if (doNotLog !== true) { if (doNotLog !== true) {
UserActivityLogger.bubbleToggled(enabled); UserActivityLogger.bubbleToggled(enabled);
@ -200,6 +207,10 @@
// Cleanup the tablet button and overlays when script is stopped // Cleanup the tablet button and overlays when script is stopped
Script.scriptEnding.connect(function () { Script.scriptEnding.connect(function () {
button.clicked.disconnect(Users.toggleIgnoreRadius); button.clicked.disconnect(Users.toggleIgnoreRadius);
if (bubbleFlashTimer) {
Script.clearTimeout(bubbleFlashTimer);
bubbleFlashTimer = false;
}
if (tablet) { if (tablet) {
tablet.removeButton(button); tablet.removeButton(button);
} }