diff options
Diffstat (limited to 'linden/indra/newview/llspatialpartition.h')
-rw-r--r-- | linden/indra/newview/llspatialpartition.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/linden/indra/newview/llspatialpartition.h b/linden/indra/newview/llspatialpartition.h index bd09da2..20cb061 100644 --- a/linden/indra/newview/llspatialpartition.h +++ b/linden/indra/newview/llspatialpartition.h | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2003&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2003&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2003-2008, Linden Research, Inc. | 7 | * Copyright (c) 2003-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
@@ -52,6 +52,7 @@ class LLSpatialBridge; | |||
52 | class LLSpatialGroup; | 52 | class LLSpatialGroup; |
53 | 53 | ||
54 | S32 AABBSphereIntersect(const LLVector3& min, const LLVector3& max, const LLVector3 &origin, const F32 &rad); | 54 | S32 AABBSphereIntersect(const LLVector3& min, const LLVector3& max, const LLVector3 &origin, const F32 &rad); |
55 | S32 AABBSphereIntersectR2(const LLVector3& min, const LLVector3& max, const LLVector3 &origin, const F32 &radius_squared); | ||
55 | 56 | ||
56 | class LLDrawInfo : public LLRefCount | 57 | class LLDrawInfo : public LLRefCount |
57 | { | 58 | { |
@@ -301,6 +302,7 @@ public: | |||
301 | BOOL remove(LLDrawable *drawablep, LLSpatialGroup *curp); | 302 | BOOL remove(LLDrawable *drawablep, LLSpatialGroup *curp); |
302 | 303 | ||
303 | LLDrawable* lineSegmentIntersect(const LLVector3& start, const LLVector3& end, | 304 | LLDrawable* lineSegmentIntersect(const LLVector3& start, const LLVector3& end, |
305 | BOOL pick_transparent, | ||
304 | S32* face_hit, // return the face hit | 306 | S32* face_hit, // return the face hit |
305 | LLVector3* intersection = NULL, // return the intersection point | 307 | LLVector3* intersection = NULL, // return the intersection point |
306 | LLVector2* tex_coord = NULL, // return the texture coordinates of the intersection point | 308 | LLVector2* tex_coord = NULL, // return the texture coordinates of the intersection point |
@@ -482,6 +484,12 @@ protected: | |||
482 | U32 mRenderPass; | 484 | U32 mRenderPass; |
483 | }; | 485 | }; |
484 | 486 | ||
487 | class LLHUDParticlePartition : public LLParticlePartition | ||
488 | { | ||
489 | public: | ||
490 | LLHUDParticlePartition(); | ||
491 | }; | ||
492 | |||
485 | //spatial partition for grass (implemented in LLVOGrass.cpp) | 493 | //spatial partition for grass (implemented in LLVOGrass.cpp) |
486 | class LLGrassPartition : public LLParticlePartition | 494 | class LLGrassPartition : public LLParticlePartition |
487 | { | 495 | { |