Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 23:16:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

formatting

Browse source
This commit is contained in:
Seth Alves 2015-09-18 15:58:47 -07:00
parent 5367de35c1
commit 5db3af3f4c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/controllers/handControllerGrab.js
View file

@ -257,7 +257,7 @@ function controller(hand, triggerAction) {
var handPosition = this.getHandPosition(); var handPosition = this.getHandPosition();
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));
var grabbedProperties = Entities.getEntityProperties(this.grabbedEntity, ["position","rotation"]); var grabbedProperties = Entities.getEntityProperties(this.grabbedEntity, ["position", "rotation"]);
this.lineOn(handPosition, Vec3.subtract(grabbedProperties.position, handPosition), INTERSECT_COLOR); this.lineOn(handPosition, Vec3.subtract(grabbedProperties.position, handPosition), INTERSECT_COLOR);
@ -408,7 +408,7 @@ function controller(hand, triggerAction) {
}; };
setEntityCustomData(GRAB_USER_DATA_KEY, this.grabbedEntity, data); setEntityCustomData(GRAB_USER_DATA_KEY, this.grabbedEntity, data);
} }
this.deactivateEntity = function(entity) { this.deactivateEntity = function(entity) {
var data = { var data = {
activated: false, activated: false,