diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2022-11-02 12:20:05 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2022-11-02 12:20:05 -0400 |
| commit | 7b35b7baea861ae58cd01826bb57fe995dc8aa52 (patch) | |
| tree | d73198b7a3f55a3644f8b0faf60a0283d5a81f17 /indra/llmath/llvolumeoctree.h | |
| parent | 13456d01a71b873ed59e3839f817434357fc8da5 (diff) | |
| parent | 15b5dedb2dc139c85461e7c867164b65cc6fc628 (diff) | |
DRTVWR-575: Merge branch 'master' into fix-monterey
Diffstat (limited to 'indra/llmath/llvolumeoctree.h')
| -rw-r--r-- | indra/llmath/llvolumeoctree.h | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/indra/llmath/llvolumeoctree.h b/indra/llmath/llvolumeoctree.h index b2bc440368..d65bca5e52 100644 --- a/indra/llmath/llvolumeoctree.h +++ b/indra/llmath/llvolumeoctree.h @@ -77,11 +77,11 @@ public: }; -class alignas(16) LLVolumeOctreeListener : public LLOctreeListener<LLVolumeTriangle> +class alignas(16) LLVolumeOctreeListener : public LLOctreeListener<LLVolumeTriangle, LLVolumeTriangle*> { LL_ALIGN_NEW public: - LLVolumeOctreeListener(LLOctreeNode<LLVolumeTriangle>* node); + LLVolumeOctreeListener(LLOctreeNode<LLVolumeTriangle, LLVolumeTriangle*>* node); ~LLVolumeOctreeListener(); LLVolumeOctreeListener(const LLVolumeOctreeListener& rhs) @@ -96,11 +96,9 @@ public: } //LISTENER FUNCTIONS - virtual void handleChildAddition(const LLOctreeNode<LLVolumeTriangle>* parent, - LLOctreeNode<LLVolumeTriangle>* child); + virtual void handleChildAddition(const LLOctreeNode<LLVolumeTriangle, LLVolumeTriangle*>* parent, LLOctreeNode<LLVolumeTriangle, LLVolumeTriangle*>* child); virtual void handleStateChange(const LLTreeNode<LLVolumeTriangle>* node) { } - virtual void handleChildRemoval(const LLOctreeNode<LLVolumeTriangle>* parent, - const LLOctreeNode<LLVolumeTriangle>* child) { } + virtual void handleChildRemoval(const LLOctreeNode<LLVolumeTriangle, LLVolumeTriangle*>* parent, const LLOctreeNode<LLVolumeTriangle, LLVolumeTriangle*>* child) { } virtual void handleInsertion(const LLTreeNode<LLVolumeTriangle>* node, LLVolumeTriangle* tri) { } virtual void handleRemoval(const LLTreeNode<LLVolumeTriangle>* node, LLVolumeTriangle* tri) { } virtual void handleDestruction(const LLTreeNode<LLVolumeTriangle>* node) { } @@ -111,7 +109,7 @@ public: LL_ALIGN_16(LLVector4a mExtents[2]); // extents (min, max) of this node and all its children }; -class LLOctreeTriangleRayIntersect : public LLOctreeTraveler<LLVolumeTriangle> +class LLOctreeTriangleRayIntersect : public LLOctreeTraveler<LLVolumeTriangle, LLVolumeTriangle*> { public: const LLVolumeFace* mFace; @@ -129,14 +127,14 @@ public: const LLVolumeFace* face, F32* closest_t, LLVector4a* intersection,LLVector2* tex_coord, LLVector4a* normal, LLVector4a* tangent); - void traverse(const LLOctreeNode<LLVolumeTriangle>* node); + void traverse(const LLOctreeNode<LLVolumeTriangle, LLVolumeTriangle*>* node); - virtual void visit(const LLOctreeNode<LLVolumeTriangle>* node); + virtual void visit(const LLOctreeNode<LLVolumeTriangle, LLVolumeTriangle*>* node); }; -class LLVolumeOctreeValidate : public LLOctreeTraveler<LLVolumeTriangle> +class LLVolumeOctreeValidate : public LLOctreeTraveler<LLVolumeTriangle, LLVolumeTriangle*> { - virtual void visit(const LLOctreeNode<LLVolumeTriangle>* branch); + virtual void visit(const LLOctreeNode<LLVolumeTriangle, LLVolumeTriangle*>* branch); }; #endif |