Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-22 21:28:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Tidying

Browse source
This commit is contained in:
David Rowe 2018-08-10 13:25:41 +12:00
parent bc456ae5c8
commit 3732de51a3
1 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
scripts/system/tabletRezzer.js
View file

@ -55,7 +55,7 @@
DEGREES_180 = 180, DEGREES_180 = 180,
MIN_HAND_CAMERA_ANGLE_COS = Math.cos(Math.PI * MIN_HAND_CAMERA_ANGLE / DEGREES_180), MIN_HAND_CAMERA_ANGLE_COS = Math.cos(Math.PI * MIN_HAND_CAMERA_ANGLE / DEGREES_180),
updateTimer = null, updateTimer = null,
UPDATE_INTERVAL = 250, UPDATE_INTERVAL = 300,
HIFI_OBJECT_MANIPULATION_CHANNEL = "Hifi-Object-Manipulation", HIFI_OBJECT_MANIPULATION_CHANNEL = "Hifi-Object-Manipulation",
avatarScale = 1, avatarScale = 1,
@ -223,10 +223,6 @@
} }
} }
function updateState() {
STATE_MACHINE[STATE_STRINGS[rezzerState]].update();
}
// #endregion // #endregion
// #region Events ========================================================================================================== // #region Events ==========================================================================================================
@ -360,22 +356,20 @@
} }
function tearDown() { function tearDown() {
setState(PROXY_HIDDEN); // Or just tear right down? Perhaps so. if (updateTimer !== null) {
Script.clearTimeout(updateTimer);
updateTimer = null;
}
setState(PROXY_HIDDEN);
HMD.displayModeChanged.disconnect(onMountedChanged);
HMD.mountedChanged.disconnect(onMountedChanged);
Messages.messageReceived.disconnect(onMessageReceived); Messages.messageReceived.disconnect(onMessageReceived);
Messages.unsubscribe(HIFI_OBJECT_MANIPULATION_CHANNEL); Messages.unsubscribe(HIFI_OBJECT_MANIPULATION_CHANNEL);
MyAvatar.scaleChanged.disconnect(onScaleChanged); MyAvatar.scaleChanged.disconnect(onScaleChanged);
HMD.displayModeChanged.disconnect(onMountedChanged);
HMD.mountedChanged.disconnect(onMountedChanged);
if (updateTimer !== null) {
Script.clearTimeout(updateTimer);
updateTimer = null;
}
if (proxyOverlay !== null) {
Overlays.deleteOverlay(proxyOverlay);
}
} }
setUp(); setUp();