Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 16:55:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4159 from Atlante45/master

Browse source 
Request blocking calls
This commit is contained in:
Philip Rosedale 2015-01-23 16:08:23 -08:00
commit ba65112463
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;
}
if (!this.grabbing) {
var intersection = Entities.findRayIntersection({
var intersection = Entities.findRayIntersectionBlocking({
origin: this.palmPosition,
direction: this.front
});
@ -304,7 +304,7 @@ function controller(wichSide) {
if (this.grabbing) {
if (!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,
direction: this.front
}).entityID;
@ -475,7 +475,7 @@ function controller(wichSide) {
Vec3.print("Looking at: ", this.palmPosition);
var pickRay = { origin: this.palmPosition,
direction: Vec3.normalize(Vec3.subtract(this.tipPosition, this.palmPosition)) };
var foundIntersection = Entities.findRayIntersection(pickRay);
var foundIntersection = Entities.findRayIntersectionBlocking(pickRay);
if(!foundIntersection.accurate) {
print("No accurate intersection");