Replace use of assert() for OGRE_ASSERT_MEDIUM

OGRECave · Sep 21, 2024 · 1270639 · 1270639
1 parent 0aceb99
commit 1270639
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 13 deletions.
diff --git a/OgreMain/include/Animation/OgreBone.h b/OgreMain/include/Animation/OgreBone.h
@@ -281,9 +281,7 @@ namespace Ogre
         */
         FORCEINLINE const SimpleMatrixAf4x3 &_getLocalSpaceTransform() const
         {
-#if OGRE_DEBUG_MODE >= OGRE_DEBUG_MEDIUM
-            assert( !mCachedTransformOutOfDate );
-#endif
+            OGRE_ASSERT_MEDIUM( !mCachedTransformOutOfDate );
             return mTransform.mDerivedTransform[mTransform.mIndex];
         }
 

diff --git a/OgreMain/include/OgreNode.h b/OgreMain/include/OgreNode.h
@@ -677,9 +677,7 @@ namespace Ogre
         */
         virtual_l2 FORCEINLINE const Matrix4 &_getFullTransform() const
         {
-#if OGRE_DEBUG_MODE >= OGRE_DEBUG_MEDIUM
-            assert( !mCachedTransformOutOfDate );
-#endif
+            OGRE_ASSERT_MEDIUM( !mCachedTransformOutOfDate );
             return mTransform.mDerivedTransform[mTransform.mIndex];
         }
 

diff --git a/OgreMain/src/Animation/OgreBone.cpp b/OgreMain/src/Animation/OgreBone.cpp
@@ -251,9 +251,7 @@ namespace Ogre
     //-----------------------------------------------------------------------
     Matrix4 Bone::_getDerivedTransform() const
     {
-#if OGRE_DEBUG_MODE >= OGRE_DEBUG_MEDIUM
-        assert( !mCachedTransformOutOfDate );
-#endif
+        OGRE_ASSERT_MEDIUM( !mCachedTransformOutOfDate );
         OGRE_ALIGNED_DECL( Matrix4, localSpaceBone, OGRE_SIMD_ALIGNMENT );
         OGRE_ALIGNED_DECL( Matrix4, parentNodeTransform, OGRE_SIMD_ALIGNMENT );
 

diff --git a/OgreMain/src/Animation/OgreTagPoint.cpp b/OgreMain/src/Animation/OgreTagPoint.cpp
@@ -99,9 +99,7 @@ namespace Ogre
     //-----------------------------------------------------------------------
     Matrix3 TagPoint::_getDerivedOrientationMatrix() const
     {
-#if OGRE_DEBUG_MODE >= OGRE_DEBUG_MEDIUM
-        assert( !mCachedTransformOutOfDate );
-#endif
+        OGRE_ASSERT_MEDIUM( !mCachedTransformOutOfDate );
         Matrix3 retVal;
         mTransform.mDerivedTransform[mTransform.mIndex].extract3x3Matrix( retVal );
         return retVal;

diff --git a/OgreMain/src/OgreNode.cpp b/OgreMain/src/OgreNode.cpp
@@ -255,7 +255,7 @@ namespace Ogre
     //-----------------------------------------------------------------------
     /*const Matrix4& Node::_getFullTransform() const
     {
-        assert( !mCachedTransformOutOfDate );
+        OGRE_ASSERT_MEDIUM( !mCachedTransformOutOfDate );
         return mTransform.mDerivedTransform[mTransform.mIndex];
     }*/
     //-----------------------------------------------------------------------