Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 12:54:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

try calling updateMotionBehaviorFromMenu

Browse source
This commit is contained in:
Seth Alves 2015-09-29 13:40:54 -07:00
parent 49da3c5034
commit f7b34f63c1
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/controllers/handControllerGrab.js
View file

@ -247,6 +247,8 @@ function MyController(hand, triggerAction) {
this.previousAvCollision = Menu.isOptionChecked("Enable avatar collisions"); this.previousAvCollision = Menu.isOptionChecked("Enable avatar collisions");
Menu.setIsOptionChecked("Enable avatar collisions", false); Menu.setIsOptionChecked("Enable avatar collisions", false);
MyAvatar.updateMotionBehaviorFromMenu();
var handControllerPosition = Controller.getSpatialControlPosition(this.palm); var handControllerPosition = Controller.getSpatialControlPosition(this.palm);
var handRotation = Quat.multiply(MyAvatar.orientation, Controller.getSpatialControlRawRotation(this.palm)); var handRotation = Quat.multiply(MyAvatar.orientation, Controller.getSpatialControlRawRotation(this.palm));
@ -330,6 +332,7 @@ function MyController(hand, triggerAction) {
this.previousAvCollision = Menu.isOptionChecked("Enable avatar collisions"); this.previousAvCollision = Menu.isOptionChecked("Enable avatar collisions");
Menu.setIsOptionChecked("Enable avatar collisions", false); Menu.setIsOptionChecked("Enable avatar collisions", false);
MyAvatar.updateMotionBehaviorFromMenu();
if (!this.triggerSmoothedSqueezed()) { if (!this.triggerSmoothedSqueezed()) {
this.state = STATE_RELEASE; this.state = STATE_RELEASE;
@ -501,6 +504,7 @@ function MyController(hand, triggerAction) {
this.release = function() { this.release = function() {
Menu.setIsOptionChecked("Enable avatar collisions", this.previousAvCollision); Menu.setIsOptionChecked("Enable avatar collisions", this.previousAvCollision);
MyAvatar.updateMotionBehaviorFromMenu();
this.lineOff(); this.lineOff();

2
interface/src/avatar/MyAvatar.h
View file

@ -193,7 +193,7 @@ public slots:
glm::vec3 getThrust() { return _thrust; }; glm::vec3 getThrust() { return _thrust; };
void setThrust(glm::vec3 newThrust) { _thrust = newThrust; } void setThrust(glm::vec3 newThrust) { _thrust = newThrust; }
void updateMotionBehaviorFromMenu(); Q_INVOKABLE void updateMotionBehaviorFromMenu();
glm::vec3 getLeftPalmPosition(); glm::vec3 getLeftPalmPosition();
glm::vec3 getLeftPalmVelocity(); glm::vec3 getLeftPalmVelocity();