diff options
author | Tofu Buzzard <no-email> | 2011-02-01 09:45:28 -0800 |
---|---|---|
committer | Tofu Buzzard <no-email> | 2011-02-01 09:45:28 -0800 |
commit | ce90d8f8da4f0d2ca6b3aa3a96c0ce68a64bd495 (patch) | |
tree | d4d31830e96d75a8062074c3ce98b5884a0b47ba /indra/llmath/llvolumeoctree.h | |
parent | 3f139aa20ab0ebd983837c2d041ca53a0e7c5fb8 (diff) | |
parent | 7ddf7e17c01242901cef9219e27077e0d1243997 (diff) |
merge
Diffstat (limited to 'indra/llmath/llvolumeoctree.h')
-rw-r--r-- | indra/llmath/llvolumeoctree.h | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/indra/llmath/llvolumeoctree.h b/indra/llmath/llvolumeoctree.h index f696cbd976..688d91dc40 100644 --- a/indra/llmath/llvolumeoctree.h +++ b/indra/llmath/llvolumeoctree.h @@ -34,6 +34,41 @@ #include "llvolume.h" #include "llvector4a.h" +class LLVolumeTriangle : public LLRefCount +{ +public: + LLVolumeTriangle() + { + + } + + LLVolumeTriangle(const LLVolumeTriangle& rhs) + { + *this = rhs; + } + + const LLVolumeTriangle& operator=(const LLVolumeTriangle& rhs) + { + llerrs << "Illegal operation!" << llendl; + return *this; + } + + ~LLVolumeTriangle() + { + + } + + LLVector4a mPositionGroup; + + const LLVector4a* mV[3]; + U16 mIndex[3]; + + F32 mRadius; + + virtual const LLVector4a& getPositionGroup() const; + virtual const F32& getBinRadius() const; +}; + class LLVolumeOctreeListener : public LLOctreeListener<LLVolumeTriangle> { public: @@ -91,41 +126,6 @@ public: virtual void visit(const LLOctreeNode<LLVolumeTriangle>* node); }; -class LLVolumeTriangle : public LLRefCount -{ -public: - LLVolumeTriangle() - { - - } - - LLVolumeTriangle(const LLVolumeTriangle& rhs) - { - *this = rhs; - } - - const LLVolumeTriangle& operator=(const LLVolumeTriangle& rhs) - { - llerrs << "Illegal operation!" << llendl; - return *this; - } - - ~LLVolumeTriangle() - { - - } - - LLVector4a mPositionGroup; - - const LLVector4a* mV[3]; - U16 mIndex[3]; - - F32 mRadius; - - virtual const LLVector4a& getPositionGroup() const; - virtual const F32& getBinRadius() const; -}; - class LLVolumeOctreeValidate : public LLOctreeTraveler<LLVolumeTriangle> { virtual void visit(const LLOctreeNode<LLVolumeTriangle>* branch); |