diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-06-19 14:06:06 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-06-19 14:06:06 -0700 |
| commit | 7da4c651911743707c0cc7cd4bebdcefb52eb379 (patch) | |
| tree | 6f99d83a2b2bf3de810dd5a1191a47f7cc53ac9d /indra/llmath/llvolumeoctree.h | |
| parent | f1e594feceb8ab284e023e164d5410cd53a656cb (diff) | |
| parent | 2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff) | |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/llmath/llvolumeoctree.h')
| -rwxr-xr-x | indra/llmath/llvolumeoctree.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llmath/llvolumeoctree.h b/indra/llmath/llvolumeoctree.h index 9ae34a0c4e..80d6ced36d 100755 --- a/indra/llmath/llvolumeoctree.h +++ b/indra/llmath/llvolumeoctree.h @@ -137,16 +137,16 @@ public: LLVector4a mStart; LLVector4a mDir; LLVector4a mEnd; - LLVector3* mIntersection; + LLVector4a* mIntersection; LLVector2* mTexCoord; - LLVector3* mNormal; - LLVector3* mBinormal; + LLVector4a* mNormal; + LLVector4a* mTangent; F32* mClosestT; bool mHitFace; LLOctreeTriangleRayIntersect(const LLVector4a& start, const LLVector4a& dir, const LLVolumeFace* face, F32* closest_t, - LLVector3* intersection,LLVector2* tex_coord, LLVector3* normal, LLVector3* bi_normal); + LLVector4a* intersection,LLVector2* tex_coord, LLVector4a* normal, LLVector4a* tangent); void traverse(const LLOctreeNode<LLVolumeTriangle>* node); |