Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 07:58:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #7669 from sethalves/not-away-if-walking

Browse source 
clear away-ness if the avatar walks a certain distance
This commit is contained in:
Brad Hefta-Gaub 2016-04-15 10:25:40 -07:00
commit 6a12425a2a
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
examples/away.js
View file

@ -23,6 +23,7 @@ var OVERLAY_DATA = {
color: {red: 255, green: 255, blue: 255}, color: {red: 255, green: 255, blue: 255},
alpha: 1 alpha: 1
}; };
var AVATAR_MOVE_FOR_ACTIVE_DISTANCE = 0.8; // meters -- no longer away if avatar moves this far while away
var lastOverlayPosition = { x: 0, y: 0, z: 0}; var lastOverlayPosition = { x: 0, y: 0, z: 0};
var OVERLAY_DATA_HMD = { var OVERLAY_DATA_HMD = {
@ -150,11 +151,18 @@ function maybeMoveOverlay() {
} }
} }
function ifAvatarMovedGoActive() {
if (Vec3.distance(MyAvatar.position, avatarPosition) > AVATAR_MOVE_FOR_ACTIVE_DISTANCE) {
goActive();
}
}
// MAIN CONTROL // MAIN CONTROL
var wasMuted, isAway; var wasMuted, isAway;
var wasOverlaysVisible = Menu.isOptionChecked("Overlays"); var wasOverlaysVisible = Menu.isOptionChecked("Overlays");
var eventMappingName = "io.highfidelity.away"; // goActive on hand controller button events, too. var eventMappingName = "io.highfidelity.away"; // goActive on hand controller button events, too.
var eventMapping = Controller.newMapping(eventMappingName); var eventMapping = Controller.newMapping(eventMappingName);
var avatarPosition = MyAvatar.position;
// backward compatible version of getting HMD.mounted, so it works in old clients // backward compatible version of getting HMD.mounted, so it works in old clients
function safeGetHMDMounted() { function safeGetHMDMounted() {
@ -169,6 +177,7 @@ function goAway() {
if (isAway) { if (isAway) {
return; return;
} }
isAway = true; isAway = true;
print('going "away"'); print('going "away"');
wasMuted = AudioDevice.getMuted(); wasMuted = AudioDevice.getMuted();
@ -191,6 +200,9 @@ function goAway() {
Reticle.visible = false; Reticle.visible = false;
} }
wasHmdMounted = safeGetHMDMounted(); // always remember the correct state wasHmdMounted = safeGetHMDMounted(); // always remember the correct state
avatarPosition = MyAvatar.position;
Script.update.connect(ifAvatarMovedGoActive);
} }
function goActive() { function goActive() {
@ -216,6 +228,8 @@ function goActive() {
Reticle.position = HMD.getHUDLookAtPosition2D(); Reticle.position = HMD.getHUDLookAtPosition2D();
} }
wasHmdMounted = safeGetHMDMounted(); // always remember the correct state wasHmdMounted = safeGetHMDMounted(); // always remember the correct state
Script.update.disconnect(ifAvatarMovedGoActive);
} }
function maybeGoActive(event) { function maybeGoActive(event) {