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

Merge pull request #15061 from r3tk0n/away_bubble_protection

Browse source 
[MS#21495] Enable Bubble/Shield on Away
This commit is contained in:
Jason Najera 2019-03-01 11:17:48 -08:00 committed by GitHub
commit 6346df54af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
scripts/system/away.js
View file

@ -65,7 +65,7 @@ var eventMappingName = "io.highfidelity.away"; // goActive on hand controller bu
var eventMapping = Controller.newMapping(eventMappingName); var eventMapping = Controller.newMapping(eventMappingName);
var avatarPosition = MyAvatar.position; var avatarPosition = MyAvatar.position;
var wasHmdMounted = HMD.mounted; var wasHmdMounted = HMD.mounted;
var previousBubbleState = Users.getIgnoreRadiusEnabled();
// some intervals we may create/delete // some intervals we may create/delete
var avatarMovedInterval; var avatarMovedInterval;
@ -166,7 +166,12 @@ function goAway(fromStartup) {
avatarMovedInterval = Script.setInterval(ifAvatarMovedGoActive, BASIC_TIMER_INTERVAL); avatarMovedInterval = Script.setInterval(ifAvatarMovedGoActive, BASIC_TIMER_INTERVAL);
}, WAIT_FOR_MOVE_ON_STARTUP); }, WAIT_FOR_MOVE_ON_STARTUP);
} }
previousBubbleState = Users.getIgnoreRadiusEnabled();
if (!previousBubbleState) {
Users.toggleIgnoreRadius();
}
UserActivityLogger.bubbleToggled(Users.getIgnoreRadiusEnabled());
UserActivityLogger.toggledAway(true); UserActivityLogger.toggledAway(true);
MyAvatar.isAway = true; MyAvatar.isAway = true;
} }
@ -179,6 +184,11 @@ function goActive() {
UserActivityLogger.toggledAway(false); UserActivityLogger.toggledAway(false);
MyAvatar.isAway = false; MyAvatar.isAway = false;
if (Users.getIgnoreRadiusEnabled() !== previousBubbleState) {
Users.toggleIgnoreRadius();
UserActivityLogger.bubbleToggled(Users.getIgnoreRadiusEnabled());
}
if (!Window.hasFocus()) { if (!Window.hasFocus()) {
Window.setFocus(); Window.setFocus();
} }