From aff465b17bef372f877275aa82561fb4ac0df841 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Sat, 4 May 2013 07:59:45 -0700 Subject: [PATCH] Missed a spot with the conversion from pointers to references. --- libraries/voxels/src/ViewFrustum.cpp | 6 +++--- libraries/voxels/src/ViewFrustum.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/voxels/src/ViewFrustum.cpp b/libraries/voxels/src/ViewFrustum.cpp index 4f725ff1b4..999c1c3efd 100644 --- a/libraries/voxels/src/ViewFrustum.cpp +++ b/libraries/voxels/src/ViewFrustum.cpp @@ -225,7 +225,7 @@ int ViewFrustum::boxInFrustum(const AABox& box) const { return(result); } -void ViewFrustum::computePickRay(float x, float y, glm::vec3* origin, glm::vec3* direction) const { - *origin = _nearTopLeft + x*(_nearTopRight - _nearTopLeft) + y*(_nearBottomLeft - _nearTopLeft); - *direction = glm::normalize(*origin - _position); +void ViewFrustum::computePickRay(float x, float y, glm::vec3& origin, glm::vec3& direction) const { + origin = _nearTopLeft + x*(_nearTopRight - _nearTopLeft) + y*(_nearBottomLeft - _nearTopLeft); + direction = glm::normalize(origin - _position); } diff --git a/libraries/voxels/src/ViewFrustum.h b/libraries/voxels/src/ViewFrustum.h index feb1ecc8c6..291697f2b9 100644 --- a/libraries/voxels/src/ViewFrustum.h +++ b/libraries/voxels/src/ViewFrustum.h @@ -98,7 +98,7 @@ public: int sphereInFrustum(const glm::vec3& center, float radius) const; int boxInFrustum(const AABox& box) const; - void computePickRay(float x, float y, glm::vec3* origin, glm::vec3* direction) const; + void computePickRay(float x, float y, glm::vec3& origin, glm::vec3& direction) const; };