luanti-org/irrlicht-archive
Archived
1
0
Fork 0
Code Activity

Fix uninitialized variable in CTriangleSelector and code cleanup

Browse Source 
CTriangleSelector constructor with IAnimatedMeshSceneNode parameter didn't initialize MeshBuffer.
Not used internally, so no big problem, but it got passed back to users in some cases
Replaced SCollisionTriangleRange, by CTriangleSelector::SBufferTriangleRange. Was a bad idea to use a struct which is for something else just because some member were the same (my fault, sorry).
Also started unifying the case of using ranges vs not using them. 
Can maybe even get rid of the non-ranges case in future. Or unify the duplicated code for getting triangles at least.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6579 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2023-12-13 16:10:50 +00:00
parent 70b2e3a255
commit 8372a70f21
4 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/Irrlicht/CTriangleSelector.h
View File

@@ -91,14 +91,34 @@ protected:
//! since the last time it was updated.
virtual void update(void) const;
irr::core::array<SCollisionTriangleRange> BufferRanges;
struct SBufferTriangleRange
{
SBufferTriangleRange()
: RangeStart(0), RangeSize(0), MeshBuffer(0), MaterialIndex(0)
{}
//! First index in Triangles array
irr::u32 RangeStart;
//! Number of elements in Triangles array
irr::u32 RangeSize;
//! Meshbuffer from which the triangles are from
//! Is 0 when we use a single range for all buffers
const IMeshBuffer* MeshBuffer;
//! Index of selected material in the SceneNode.
//! Only valid when MeshBuffer is also set, otherwise 0
irr::u32 MaterialIndex;
};
SBufferTriangleRange SingleBufferRange; // When avoiding extra heap allocations
irr::core::array<SBufferTriangleRange> BufferRanges;
ISceneNode* SceneNode;
mutable core::array<core::triangle3df> Triangles; // (mutable for CTriangleBBSelector)
mutable core::aabbox3df BoundingBox; // Allows for trivial rejection
const IMeshBuffer* MeshBuffer; // non-zero when the selector is for a single meshbuffer
irr::u32 MaterialIndex; // Only set when MeshBuffer is non-zero
IAnimatedMeshSceneNode* AnimatedNode;
mutable u32 LastMeshFrame;
};