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

Override all roles instead of just fly

Browse source
This commit is contained in:
Atlante45 2017-03-01 17:49:52 -08:00
parent 546f32431d
commit 34889d38c9
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scripts/tutorials/entity_scripts/sit.js
View file

@ -2,7 +2,7 @@
Script.include("/~/system/libraries/utils.js"); Script.include("/~/system/libraries/utils.js");
var SETTING_KEY = "com.highfidelity.avatar.isSitting"; var SETTING_KEY = "com.highfidelity.avatar.isSitting";
var ROLE = "fly"; var ROLES = MyAvatar.getAnimationRoles();
var ANIMATION_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/clement/production/animations/sitting_idle.fbx"; var ANIMATION_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/clement/production/animations/sitting_idle.fbx";
var ANIMATION_FPS = 30; var ANIMATION_FPS = 30;
var ANIMATION_FIRST_FRAME = 1; var ANIMATION_FIRST_FRAME = 1;
@ -85,7 +85,9 @@
if (previousValue === "") { if (previousValue === "") {
MyAvatar.characterControllerEnabled = false; MyAvatar.characterControllerEnabled = false;
MyAvatar.hmdLeanRecenterEnabled = false; MyAvatar.hmdLeanRecenterEnabled = false;
MyAvatar.overrideRoleAnimation(ROLE, ANIMATION_URL, ANIMATION_FPS, true, ANIMATION_FIRST_FRAME, ANIMATION_LAST_FRAME); for (i in ROLES) {
MyAvatar.overrideRoleAnimation(ROLES[i], ANIMATION_URL, ANIMATION_FPS, true, ANIMATION_FIRST_FRAME, ANIMATION_LAST_FRAME);
}
MyAvatar.resetSensorsAndBody(); MyAvatar.resetSensorsAndBody();
} }
@ -110,8 +112,10 @@
this.sitUp = function() { this.sitUp = function() {
this.setSeatUser(null); this.setSeatUser(null);
if (Settings.getValue(SETTING_KEY) === this.entityID) { if (Settings.getValue(SETTING_KEY) === this.entityID) {
MyAvatar.restoreRoleAnimation(ROLE); for (i in ROLES) {
MyAvatar.restoreRoleAnimation(ROLES[i]);
}
MyAvatar.characterControllerEnabled = true; MyAvatar.characterControllerEnabled = true;
MyAvatar.hmdLeanRecenterEnabled = true; MyAvatar.hmdLeanRecenterEnabled = true;