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

Missed a spot with the conversion from pointers to references.

Browse source
This commit is contained in:
Andrzej Kapolka 2013-05-04 07:59:45 -07:00
parent 34565a4956
commit aff465b17b
2 changed files with 4 additions and 4 deletions
libraries/voxels/src
ViewFrustum.cppViewFrustum.h

6
libraries/voxels/src/ViewFrustum.cpp
View file

@ -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);
}

2
libraries/voxels/src/ViewFrustum.h
View file

@ -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;
};