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

Merge branch 'master' of https://github.com/highfidelity/hifi into fixGlitches

Browse source
This commit is contained in:
ZappoMan 2015-01-23 16:23:56 -08:00
commit de75eec877
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
examples/controllers/hydra/hydraGrab.js
View file

@ -274,7 +274,7 @@ function controller(wichSide) {
this.glowedIntersectingModel.isKnownID = false; this.glowedIntersectingModel.isKnownID = false;
} }
if (!this.grabbing) { if (!this.grabbing) {
var intersection = Entities.findRayIntersection({ var intersection = Entities.findRayIntersectionBlocking({
origin: this.palmPosition, origin: this.palmPosition,
direction: this.front direction: this.front
}); });
@ -304,7 +304,7 @@ function controller(wichSide) {
if (this.grabbing) { if (this.grabbing) {
if (!this.entityID.isKnownID) { if (!this.entityID.isKnownID) {
print("Unknown grabbed ID " + this.entityID.id + ", isKnown: " + this.entityID.isKnownID); print("Unknown grabbed ID " + this.entityID.id + ", isKnown: " + this.entityID.isKnownID);
this.entityID = Entities.findRayIntersection({ this.entityID = Entities.findRayIntersectionBlocking({
origin: this.palmPosition, origin: this.palmPosition,
direction: this.front direction: this.front
}).entityID; }).entityID;
@ -475,7 +475,7 @@ function controller(wichSide) {
Vec3.print("Looking at: ", this.palmPosition); Vec3.print("Looking at: ", this.palmPosition);
var pickRay = { origin: this.palmPosition, var pickRay = { origin: this.palmPosition,
direction: Vec3.normalize(Vec3.subtract(this.tipPosition, this.palmPosition)) }; direction: Vec3.normalize(Vec3.subtract(this.tipPosition, this.palmPosition)) };
var foundIntersection = Entities.findRayIntersection(pickRay); var foundIntersection = Entities.findRayIntersectionBlocking(pickRay);
if(!foundIntersection.accurate) { if(!foundIntersection.accurate) {
print("No accurate intersection"); print("No accurate intersection");