Revert "Fix verbose string + refactorings"

This reverts commit 824db16a68.

code/PostProcessing/ImproveCacheLocality.cpp

@@ -3,7 +3,9 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2023, assimp team
+Copyright (c) 2006-2022, assimp team
+
+
 
 All rights reserved.
 
@@ -57,12 +59,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <stdio.h>
 #include <stack>
 
-namespace Assimp {
+using namespace Assimp;
 
 // ------------------------------------------------------------------------------------------------
 // Constructor to be privately used by Importer
-ImproveCacheLocalityProcess::ImproveCacheLocalityProcess() :
+ImproveCacheLocalityProcess::ImproveCacheLocalityProcess()
-        mConfigCacheDepth(PP_ICL_PTCACHE_SIZE) {
+: mConfigCacheDepth(PP_ICL_PTCACHE_SIZE) {
     // empty
 }
 
@@ -108,13 +110,36 @@ void ImproveCacheLocalityProcess::Execute(aiScene *pScene) {
 }
 
 // ------------------------------------------------------------------------------------------------
-static ai_real calculateInputACMR(aiMesh *pMesh, const aiFace *const pcEnd,
+// Improves the cache coherency of a specific mesh
-        unsigned int configCacheDepth, unsigned int meshNum) {
+ai_real ImproveCacheLocalityProcess::ProcessMesh( aiMesh* pMesh, unsigned int meshNum) {
-    ai_real fACMR = 0.0f;
+    // TODO: rewrite this to use std::vector or boost::shared_array
-    unsigned int *piFIFOStack = new unsigned int[configCacheDepth];
+    ai_assert(nullptr != pMesh);
-    memset(piFIFOStack, 0xff, configCacheDepth * sizeof(unsigned int));
+
+    // Check whether the input data is valid
+    // - there must be vertices and faces
+    // - all faces must be triangulated or we can't operate on them
+    if (!pMesh->HasFaces() || !pMesh->HasPositions())
+        return static_cast<ai_real>(0.f);
+
+    if (pMesh->mPrimitiveTypes != aiPrimitiveType_TRIANGLE) {
+        ASSIMP_LOG_ERROR("This algorithm works on triangle meshes only");
+        return static_cast<ai_real>(0.f);
+    }
+
+    if(pMesh->mNumVertices <= mConfigCacheDepth) {
+        return static_cast<ai_real>(0.f);
+    }
+
+    ai_real fACMR = 3.f;
+    const aiFace* const pcEnd = pMesh->mFaces+pMesh->mNumFaces;
+
+    // Input ACMR is for logging purposes only
+    if (!DefaultLogger::isNullLogger())     {
+
+        unsigned int* piFIFOStack = new unsigned int[mConfigCacheDepth];
+        memset(piFIFOStack,0xff,mConfigCacheDepth*sizeof(unsigned int));
         unsigned int* piCur = piFIFOStack;
-    const unsigned int *const piCurEnd = piFIFOStack + configCacheDepth;
+        const unsigned int* const piCurEnd = piFIFOStack + mConfigCacheDepth;
 
         // count the number of cache misses
         unsigned int iCacheMisses = 0;
@@ -149,53 +174,21 @@ static ai_real calculateInputACMR(aiMesh *pMesh, const aiFace *const pcEnd,
             ASSIMP_LOG_WARN(szBuff);
             return static_cast<ai_real>(0.f);
         }
-    return fACMR;
-}
-
-// ------------------------------------------------------------------------------------------------
-// Improves the cache coherency of a specific mesh
-ai_real ImproveCacheLocalityProcess::ProcessMesh(aiMesh *pMesh, unsigned int meshNum) {
-    // TODO: rewrite this to use std::vector or boost::shared_array
-    ai_assert(nullptr != pMesh);
-
-    // Check whether the input data is valid
-    // - there must be vertices and faces
-    // - all faces must be triangulated or we can't operate on them
-    if (!pMesh->HasFaces() || !pMesh->HasPositions())
-        return static_cast<ai_real>(0.f);
-
-    if (pMesh->mPrimitiveTypes != aiPrimitiveType_TRIANGLE) {
-        ASSIMP_LOG_ERROR("This algorithm works on triangle meshes only");
-        return static_cast<ai_real>(0.f);
-    }
-
-    if (pMesh->mNumVertices <= mConfigCacheDepth) {
-        return static_cast<ai_real>(0.f);
-    }
-
-    ai_real fACMR = 3.f;
-    const aiFace *const pcEnd = pMesh->mFaces + pMesh->mNumFaces;
-
-    // Input ACMR is for logging purposes only
-    if (!DefaultLogger::isNullLogger()) {
-        fACMR = calculateInputACMR(pMesh, pcEnd, mConfigCacheDepth, meshNum);
     }
 
     // first we need to build a vertex-triangle adjacency list
     VertexTriangleAdjacency adj(pMesh->mFaces,pMesh->mNumFaces, pMesh->mNumVertices,true);
 
     // build a list to store per-vertex caching time stamps
-    std::vector<unsigned int> piCachingStamps;
+    unsigned int* const piCachingStamps = new unsigned int[pMesh->mNumVertices];
-    piCachingStamps.resize(pMesh->mNumVertices);
+    memset(piCachingStamps,0x0,pMesh->mNumVertices*sizeof(unsigned int));
-    memset(&piCachingStamps[0], 0x0, pMesh->mNumVertices * sizeof(unsigned int));
 
     // allocate an empty output index buffer. We store the output indices in one large array.
     // Since the number of triangles won't change the input faces can be reused. This is how
     // we save thousands of redundant mini allocations for aiFace::mIndices
     const unsigned int iIdxCnt = pMesh->mNumFaces*3;
-    std::vector<unsigned int> piIBOutput;
+    unsigned int* const piIBOutput = new unsigned int[iIdxCnt];
-    piIBOutput.resize(iIdxCnt);
+    unsigned int* piCSIter = piIBOutput;
-    std::vector<unsigned int>::iterator piCSIter = piIBOutput.begin();
 
     // allocate the flag array to hold the information
     // whether a face has already been emitted or not
@@ -209,8 +202,7 @@ ai_real ImproveCacheLocalityProcess::ProcessMesh(aiMesh *pMesh, unsigned int mes
     const std::vector<unsigned int> piNumTriPtrNoModify(piNumTriPtr, piNumTriPtr + pMesh->mNumVertices);
 
     // get the largest number of referenced triangles and allocate the "candidate buffer"
-    unsigned int iMaxRefTris = 0;
+    unsigned int iMaxRefTris = 0; {
-    {
         const unsigned int* piCur = adj.mLiveTriangles;
         const unsigned int* const piCurEnd = adj.mLiveTriangles+pMesh->mNumVertices;
         for (;piCur != piCurEnd;++piCur) {
@@ -218,8 +210,7 @@ ai_real ImproveCacheLocalityProcess::ProcessMesh(aiMesh *pMesh, unsigned int mes
         }
     }
     ai_assert(iMaxRefTris > 0);
-    std::vector<unsigned int> piCandidates;
+    unsigned int* piCandidates = new unsigned int[iMaxRefTris*3];
-    piCandidates.resize(iMaxRefTris * 3);
     unsigned int iCacheMisses = 0;
 
     // ...................................................................................
@@ -259,7 +250,7 @@ ai_real ImproveCacheLocalityProcess::ProcessMesh(aiMesh *pMesh, unsigned int mes
 
         unsigned int icnt = piNumTriPtrNoModify[ivdx];
         unsigned int* piList = adj.GetAdjacentTriangles(ivdx);
-        std::vector<unsigned int>::iterator piCurCandidate = piCandidates.begin();
+        unsigned int* piCurCandidate = piCandidates;
 
         // get all triangles in the neighborhood
         for (unsigned int tri = 0; tri < icnt;++tri)    {
@@ -306,7 +297,7 @@ ai_real ImproveCacheLocalityProcess::ProcessMesh(aiMesh *pMesh, unsigned int mes
         // get next fanning vertex
         ivdx = -1;
         int max_priority = -1;
-        for (std::vector<unsigned int>::iterator piCur = piCandidates.begin(); piCur != piCurCandidate; ++piCur) {
+        for (unsigned int* piCur = piCandidates;piCur != piCurCandidate;++piCur)    {
             const unsigned int dp = *piCur;
 
             // must have live triangles
@@ -354,29 +345,29 @@ ai_real ImproveCacheLocalityProcess::ProcessMesh(aiMesh *pMesh, unsigned int mes
     }
     ai_real fACMR2 = 0.0f;
     if (!DefaultLogger::isNullLogger()) {
-        fACMR2 = static_cast<ai_real>(iCacheMisses / pMesh->mNumFaces);
+        fACMR2 = (float)iCacheMisses / pMesh->mNumFaces;
-        const ai_real averageACMR = ((fACMR - fACMR2) / fACMR) * 100.f;
+
         // very intense verbose logging ... prepare for much text if there are many meshes
         if ( DefaultLogger::get()->getLogSeverity() == Logger::VERBOSE) {
-            ASSIMP_LOG_VERBOSE_DEBUG("Mesh ", meshNum, "| ACMR in: ", fACMR, " out: ", fACMR2, " | average ACMR ", averageACMR);
+            ASSIMP_LOG_VERBOSE_DEBUG("Mesh %u | ACMR in: ", meshNum, " out: ", fACMR, " | ~", fACMR2, ((fACMR - fACMR2) / fACMR) * 100.f);
-        }
-        fACMR2 *= pMesh->mNumFaces;
         }
 
+        fACMR2 *= pMesh->mNumFaces;
+    }
     // sort the output index buffer back to the input array
-    piCSIter = piIBOutput.begin();
+    piCSIter = piIBOutput;
     for (aiFace* pcFace = pMesh->mFaces; pcFace != pcEnd;++pcFace)  {
         unsigned nind = pcFace->mNumIndices;
         unsigned * ind = pcFace->mIndices;
-        if (nind > 0)
+        if (nind > 0) ind[0] = *piCSIter++;
-            ind[0] = *piCSIter++;
+        if (nind > 1) ind[1] = *piCSIter++;
-        if (nind > 1)
+        if (nind > 2) ind[2] = *piCSIter++;
-            ind[1] = *piCSIter++;
-        if (nind > 2)
-            ind[2] = *piCSIter++;
     }
 
+    // delete temporary storage
+    delete[] piCachingStamps;
+    delete[] piIBOutput;
+    delete[] piCandidates;
+
     return fACMR2;
 }
-
-} // namespace Assimp

code/PostProcessing/ImproveCacheLocality.h

@@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2023, assimp team
+Copyright (c) 2006-2022, assimp team
+
 
 All rights reserved.
 

include/assimp/aabb.h

@@ -51,17 +51,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // ---------------------------------------------------------------------------
 /**
- *  @brief An axis-aligned bounding box.
+ *  An axis-aligned bounding box.
  */
 struct aiAABB {
-    /**
-     *  @brief The minimum edge position of the axis-aligned bounding-box.
-     */
     C_STRUCT aiVector3D mMin;
-
-    /**
-     *  @brief The maximum edge position of the axis-aligned bounding-box.
-     */
     C_STRUCT aiVector3D mMax;
 
 #ifdef __cplusplus

include/assimp/anim.h

@@ -78,6 +78,7 @@ struct aiVectorKey {
     }
 
     /// @brief  Construction from a given time and key value.
+
     aiVectorKey(double time, const aiVector3D &value) :
             mTime(time), mValue(value) {
         // empty