Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 12:37:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reaction logic now nice and stable!

Browse source
This commit is contained in:
Zach Fox 2019-08-15 14:40:33 -07:00
parent af97384948
commit 2149f1acc7
1 changed files with 56 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

126
scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js
View file

@ -24,28 +24,6 @@
// #region EMOTE_UTILITY // #region EMOTE_UTILITY
// REMOVE THIS WHEN ENGINE CAN HANDLE BLENDING
function maybeEndOtherReactions(currentEmote) {
print("CURRENT EMOTE: ", currentEmote);
if (raiseHandPlaying && "raiseHand" != currentEmote) {
print("ENDING RAISE HAND");
MyAvatar.endReaction("raiseHand");
raiseHandPlaying = false;
}
if (pointPlaying && "point" != currentEmote) {
print("ENDING POINT");
MyAvatar.endReaction("point");
pointPlaying = false;
}
if (applaudPlaying && "applaud" != currentEmote) {
print("ENDING APPLAUD");
MyAvatar.endReaction("applaud");
maybeClearClapSoundInterval();
applaudPlaying = false;
}
}
function updateEmoteAppBarPosition() { function updateEmoteAppBarPosition() {
if (!emoteAppBarWindow) { if (!emoteAppBarWindow) {
@ -148,20 +126,51 @@ function maybeClearClapSoundInterval() {
} }
function toggleApplaud() { function toggleReaction(reaction) {
if (applaudPlaying) { var reactionEnding = reactionsBegun.indexOf(reaction) > -1;
MyAvatar.endReaction("applaud");
maybeClearClapSoundInterval(); if (reactionEnding) {
applaudPlaying = false; endReactionWrapper(reaction);
return; } else {
beginReactionWrapper(reaction);
} }
maybeEndOtherReactions("applaud"); }
MyAvatar.beginReaction("applaud");
var reactionsBegun = [];
function beginReactionWrapper(reaction) {
reactionsBegun.forEach(function(react) {
endReactionWrapper(react);
});
if (MyAvatar.beginReaction(reaction)) {
reactionsBegun.push(reaction);
}
// Insert reaction-specific logic here:
switch (reaction) {
case ("applaud"):
startClappingSounds(); startClappingSounds();
applaudPlaying = true; break;
// REMOVE THESE WHEN ENGINE CAN HANDLE BLENDING }
pointPlaying = false; }
raiseHandPlaying = false;
function endReactionWrapper(reaction) {
var reactionsBegunIndex = reactionsBegun.indexOf(reaction);
if (reactionsBegunIndex > -1) {
if (MyAvatar.endReaction(reaction)) {
reactionsBegun.splice(reactionsBegunIndex, 1);
}
}
// Insert reaction-specific logic here:
switch (reaction) {
case ("applaud"):
maybeClearClapSoundInterval();
break;
}
} }
@ -173,9 +182,6 @@ function toggleApplaud() {
make sense for more than one reaction to be playing. make sense for more than one reaction to be playing.
*/ */
var EMOTE_APP_BAR_MESSAGE_SOURCE = "EmoteAppBar.qml"; var EMOTE_APP_BAR_MESSAGE_SOURCE = "EmoteAppBar.qml";
var raiseHandPlaying = false;
var applaudPlaying = false;
var pointPlaying = false;
function onMessageFromEmoteAppBar(message) { function onMessageFromEmoteAppBar(message) {
console.log("MESSAGE From emote app bar: ", JSON.stringify(message)); console.log("MESSAGE From emote app bar: ", JSON.stringify(message));
if (message.source !== EMOTE_APP_BAR_MESSAGE_SOURCE) { if (message.source !== EMOTE_APP_BAR_MESSAGE_SOURCE) {
@ -183,41 +189,15 @@ function onMessageFromEmoteAppBar(message) {
} }
switch (message.method) { switch (message.method) {
case "positive": case "positive":
maybeEndOtherReactions("positive");
MyAvatar.triggerReaction("positive"); MyAvatar.triggerReaction("positive");
break; break;
case "negative": case "negative":
maybeEndOtherReactions("negative");
MyAvatar.triggerReaction("negative"); MyAvatar.triggerReaction("negative");
break; break;
case "raiseHand": case "raiseHand":
if (raiseHandPlaying) {
MyAvatar.endReaction("raiseHand");
raiseHandPlaying = false;
return;
}
maybeEndOtherReactions("raiseHand");
MyAvatar.beginReaction("raiseHand");
raiseHandPlaying = true;
// REMOVE THESE WHEN ENGINE CAN HANDLE BLENDING
pointPlaying = false;
applaudPlaying = false;
break;
case "applaud": case "applaud":
toggleApplaud();
break;
case "point": case "point":
if (pointPlaying) { toggleReaction(message.method);
MyAvatar.endReaction("point");
pointPlaying = false;
return;
}
maybeEndOtherReactions("point");
MyAvatar.beginReaction("point");
pointPlaying = true;
// REMOVE THESE WHEN ENGINE CAN HANDLE BLENDING
raiseHandPlaying = false;
applaudPlaying = false;
break; break;
case "toggleEmojiApp": case "toggleEmojiApp":
toggleEmojiApp(); toggleEmojiApp();
@ -262,11 +242,11 @@ function keyPressHandler(event) {
} else if (event.text === NEGATIVE_KEY) { } else if (event.text === NEGATIVE_KEY) {
MyAvatar.triggerReaction("negative"); MyAvatar.triggerReaction("negative");
} else if (event.text === RAISE_HAND_KEY) { } else if (event.text === RAISE_HAND_KEY) {
MyAvatar.beginReaction("raiseHand"); toggleReaction("raiseHand");
} else if (event.text === APPLAUD_KEY) { } else if (event.text === APPLAUD_KEY) {
toggleApplaud(); toggleReaction("applaud");
} else if (event.text === POINT_KEY) { } else if (event.text === POINT_KEY) {
MyAvatar.beginReaction("point"); toggleReaction("point");
} else if (event.text === EMOTE_WINDOW) { } else if (event.text === EMOTE_WINDOW) {
toggleEmojiApp(); toggleEmojiApp();
} }
@ -277,13 +257,17 @@ function keyPressHandler(event) {
function keyReleaseHandler(event) { function keyReleaseHandler(event) {
if (!event.isAutoRepeat) { if (!event.isAutoRepeat) {
if (event.text === RAISE_HAND_KEY) { if (event.text === RAISE_HAND_KEY) {
MyAvatar.endReaction("raiseHand"); if (reactionsBegun.indexOf("raiseHand") > -1) {
toggleReaction("raiseHand");
}
} else if (event.text === APPLAUD_KEY) { } else if (event.text === APPLAUD_KEY) {
if (applaudPlaying) { if (reactionsBegun.indexOf("applaud") > -1) {
toggleApplaud(); toggleReaction("applaud");
} }
} else if (event.text === POINT_KEY) { } else if (event.text === POINT_KEY) {
MyAvatar.endReaction("point"); if (reactionsBegun.indexOf("point") > -1) {
toggleReaction("point");
}
} }
} }
} }