diff options
| author | Karl Steifvater <qarl@lindenlab.com> | 2008-07-22 20:12:37 +0000 |
|---|---|---|
| committer | Karl Steifvater <qarl@lindenlab.com> | 2008-07-22 20:12:37 +0000 |
| commit | df4f20d4f51e41355e876f734527b4245543415c (patch) | |
| tree | 36aaf66ddb96b27fb9701764153cd7d17add275a /indra/newview/llspatialpartition.h | |
| parent | 0c0391cc7114bd2e9e4462c40e88814326f61bc2 (diff) | |
merge uv-picking branch.
svn merge -r92602:92632 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-4
Diffstat (limited to 'indra/newview/llspatialpartition.h')
| -rw-r--r-- | indra/newview/llspatialpartition.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llspatialpartition.h b/indra/newview/llspatialpartition.h index 7e872915b9..d9a81d8b9e 100644 --- a/indra/newview/llspatialpartition.h +++ b/indra/newview/llspatialpartition.h @@ -300,7 +300,14 @@ public: LLSpatialGroup *put(LLDrawable *drawablep, BOOL was_visible = FALSE); BOOL remove(LLDrawable *drawablep, LLSpatialGroup *curp); - LLDrawable* pickDrawable(const LLVector3& start, const LLVector3& end, LLVector3& collision); + LLDrawable* lineSegmentIntersect(const LLVector3& start, const LLVector3& end, + S32* face_hit, // return the face hit + LLVector3* intersection = NULL, // return the intersection point + LLVector2* tex_coord = NULL, // return the texture coordinates of the intersection point + LLVector3* normal = NULL, // return the surface normal at the intersection point + LLVector3* bi_normal = NULL // return the surface bi-normal at the intersection point + ); + // If the drawable moves, move it here. virtual void move(LLDrawable *drawablep, LLSpatialGroup *curp, BOOL immediate = FALSE); |