From 9033242584dc373b39f9b04987e0981ddfede837 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Wed, 15 Feb 2017 18:10:33 -0800 Subject: [PATCH] More sit script work --- scripts/tutorials/entity_scripts/sit.js | 59 ++++++++++++++++++------- 1 file changed, 43 insertions(+), 16 deletions(-) diff --git a/scripts/tutorials/entity_scripts/sit.js b/scripts/tutorials/entity_scripts/sit.js index e8e31c5f14..a091f4bba0 100644 --- a/scripts/tutorials/entity_scripts/sit.js +++ b/scripts/tutorials/entity_scripts/sit.js @@ -1,9 +1,11 @@ (function() { + var ROLE = "fly"; var ANIMATION_URL = "C:/Users/Clement/hifi/build/interface/RelWithDebInfo/resources/avatar/animations/sitting_idle.fbx"; var ANIMATION_FPS = 30; var ANIMATION_FIRST_FRAME = 1; var ANIMATION_LAST_FRAME = 10; var RELEASE_KEYS = ['w', 'a', 's', 'd', 'UP', 'LEFT', 'DOWN', 'RIGHT']; + var RELEASE_TIME = 500; this.entityID = null; this.timestamp = null; @@ -12,53 +14,78 @@ this.entityID = entityID; } + this.update = function(dt) { + if (MyAvatar.getParentID() === this.entityID) { + var properties = Entities.getEntityProperties(this.entityID, ["position"]); + if (Vec3.distance(MyAvatar.position, properties.position) > 0.2) { + this.sitUp(this.entityID); + } + } + } + this.keyPressed = function(event) { + print("press"); if (RELEASE_KEYS.indexOf(event.text) !== -1) { this.timestamp = Date.now(); } } this.keyReleased = function(event) { + print("release"); if (RELEASE_KEYS.indexOf(event.text) !== -1) { - print('Time: ' + (Date.now() - this.timestamp).getMilliseconds()); - if ((Date.now() - this.timestamp).getMilliseconds() >= 500) { + print('Time: ' + (Date.now() - this.timestamp)); + if (Date.now() - this.timestamp > RELEASE_TIME) { this.sitUp(); } - this.timestamp = null; + this.timestamp = null; } } - this.sitDown = function(entityID) { + this.sitDown = function() { print("sitDown"); - MyAvatar.overrideAnimation(ANIMATION_URL, ANIMATION_FPS, true, ANIMATION_FIRST_FRAME, ANIMATION_LAST_FRAME); - MyAvatar.setParentID(entityID); + MyAvatar.overrideRoleAnimation(ROLE, ANIMATION_URL, ANIMATION_FPS, true, ANIMATION_FIRST_FRAME, ANIMATION_LAST_FRAME); + MyAvatar.setParentID(this.entityID); MyAvatar.characterControllerEnabled = false; + MyAvatar.hmdLeanRecenterEnabled = false; - var properties = Entities.getEntityProperties(entityID, ["position", "rotation"]); + var properties = Entities.getEntityProperties(this.entityID, ["position", "rotation"]); var index = MyAvatar.getJointIndex("Hips"); print("Data: " + index + " " + JSON.stringify(properties)); print(MyAvatar.pinJoint(index, properties.position, properties.rotation)); - // Controller.keyPressEvent.connect(this, this.keyPressed); - // Controller.keyReleaseEvent.connect(this, this.keyReleased); + + Script.update.connect(this, this.update); + Controller.keyPressEvent.connect(this, this.keyPressed); + Controller.keyReleaseEvent.connect(this, this.keyReleased); + for (var i in RELEASE_KEYS) { + Controller.captureKeyEvents({ text: RELEASE_KEYS[i] }); + } } this.sitUp = function() { print("sitUp"); - MyAvatar.restoreAnimation(); + MyAvatar.restoreRoleAnimation(ROLE); MyAvatar.setParentID(""); MyAvatar.characterControllerEnabled = true; + MyAvatar.hmdLeanRecenterEnabled = true; var index = MyAvatar.getJointIndex("Hips"); print(MyAvatar.clearPinOnJoint(index)); - // Controller.keyPressEvent.disconnect(this, this.keyPressed); - // Controller.keyReleaseEvent.disconnect(this, this.keyReleased); + + Script.update.disconnect(this, this.update); + Controller.keyPressEvent.disconnect(this, this.keyPressed); + Controller.keyReleaseEvent.disconnect(this, this.keyReleased); + for (var i in RELEASE_KEYS) { + Controller.releaseKeyEvents({ text: RELEASE_KEYS[i] }); + } } - this.clickDownOnEntity = function (entityID) { - Vec3.print("pos:", MyAvatar.position); - if (MyAvatar.getParentID() !== entityID) { - this.sitDown(entityID); + this.clickDownOnEntity = function () { + if (MyAvatar.getParentID() !== this.entityID) { + this.sitDown(); } else { this.sitUp(); } } + this.sit = function () { + this.sitDown(); + } });