Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-18 03:36:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5817 from sethalves/hand-controller-adjustment

Browse source 
if the intersection distance is small, use grab-mode rather than distant-grab-mode
This commit is contained in:
Philip Rosedale 2015-09-15 18:41:42 -07:00
commit 2846381396
1 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
examples/controllers/handControllerGrab.js
View file

@ -97,8 +97,8 @@ function controller(side, triggerAction, pullAction, hand) {
controller.prototype.updateLine = function() {
if (this.pointer != null) {
if (Entities.getEntityProperties(this.pointer).id != this.poitner) {
this.pointer == null;
if (Entities.getEntityProperties(this.pointer).id != this.pointer) {
this.pointer = null;
}
}
@ -118,7 +118,6 @@ controller.prototype.updateLine = function() {
});
}
var handPosition = this.getHandPosition();
var direction = Quat.getUp(this.getHandRotation());
@ -172,14 +171,26 @@ controller.prototype.checkForIntersections = function(origin, direction) {
if (intersection.intersects && intersection.properties.collisionsWillMove === 1) {
var handPosition = Controller.getSpatialControlPosition(this.palm);
this.distanceToEntity = Vec3.distance(handPosition, intersection.properties.position);
Entities.editEntity(this.pointer, {
linePoints: [
ZERO_VEC,
Vec3.multiply(direction, this.distanceToEntity)
]
});
this.grabbedEntity = intersection.entityID;
return true;
var intersectionDistance = Vec3.distance(handPosition, intersection.intersection);
if (intersectionDistance < 0.6) {
//We are grabbing an entity, so let it know we've grabbed it
this.grabbedEntity = intersection.entityID;
this.activateEntity(this.grabbedEntity);
this.hidePointer();
this.shouldDisplayLine = false;
this.grabEntity();
return true;
} else {
Entities.editEntity(this.pointer, {
linePoints: [
ZERO_VEC,
Vec3.multiply(direction, this.distanceToEntity)
]
});
this.grabbedEntity = intersection.entityID;
return true;
}
}
return false;
}