diff --git a/irr/include/SkinnedMesh.h b/irr/include/SkinnedMesh.h index c3ecfc68a..c4bc3ae23 100644 --- a/irr/include/SkinnedMesh.h +++ b/irr/include/SkinnedMesh.h @@ -99,7 +99,7 @@ public: //! returns an axis aligned bounding box const core::aabbox3d &getBoundingBox() const override { // assert(false); // TODO refactor IMesh so that we don't have to implement this - return StaticBoundingBox; + return StaticPartsBoundingBox; } //! set user axis aligned bounding box @@ -398,7 +398,7 @@ protected: std::vector> Vertices_Moved; //! Bounding box of just the static parts of the mesh - core::aabbox3d StaticBoundingBox{{0, 0, 0}}; + core::aabbox3d StaticPartsBoundingBox{{0, 0, 0}}; f32 EndFrame; f32 FramesPerSecond; diff --git a/irr/src/SkinnedMesh.cpp b/irr/src/SkinnedMesh.cpp index 8b3fba427..3df925357 100644 --- a/irr/src/SkinnedMesh.cpp +++ b/irr/src/SkinnedMesh.cpp @@ -74,7 +74,7 @@ core::aabbox3df SkinnedMesh::calculateBoundingBox( const std::vector &global_transforms) { assert(global_transforms.size() == AllJoints.size()); - core::aabbox3df result = StaticBoundingBox; + core::aabbox3df result = StaticPartsBoundingBox; // skeletal animation for (u16 i = 0; i < AllJoints.size(); ++i) { auto box = AllJoints[i]->LocalBoundingBox; @@ -364,9 +364,9 @@ void SkinnedMesh::calculateStaticBoundingBox() if (!animated[mb][v]) { auto pos = getMeshBuffer(mb)->getVertexBuffer()->getPosition(v); if (!first) { - StaticBoundingBox.addInternalPoint(pos); + StaticPartsBoundingBox.addInternalPoint(pos); } else { - StaticBoundingBox.reset(pos); + StaticPartsBoundingBox.reset(pos); first = false; } }