Code design improvement in CIFPAnimations::DeleteAnimations

codenulls · codenulls · commit a7b1011aa506 · 2018-03-29T15:20:51.000+05:00
diff --git a/Client/game_sa/CAnimBlendSequenceSA.h b/Client/game_sa/CAnimBlendSequenceSA.h
@@ -35,16 +35,17 @@ class CAnimBlendSequenceSAInterface
 class CAnimBlendSequenceSA : public CAnimBlendSequence
 {
 public:
-                                            CAnimBlendSequenceSA   ( CAnimBlendSequenceSAInterface * pInterface ) { m_pInterface = pInterface; }
-    void                                    Initialize             ( void );
-    void                                    SetName                ( const char * szName );
-    void                                    SetBoneTag             ( int32_t i32BoneID );
-    void                                    SetKeyFrames           ( size_t cKeyFrames, bool bRoot, bool bCompressed, void * pKeyFrames );
-    uint32_t                                GetHash                ( void ) { return m_pInterface->m_hash; }
-    uint16_t                                GetBoneTag             ( void ) { return m_pInterface->m_boneId; }
-    void *                                  GetKeyFrames           ( void ) { return m_pInterface->pKeyFrames; }
-    unsigned short                          GetKeyFramesCount      ( void ) { return m_pInterface->sNumKeyFrames; }
-    CAnimBlendSequenceSAInterface *         GetInterface           ( void ) { return m_pInterface; }
+                                            CAnimBlendSequenceSA       ( CAnimBlendSequenceSAInterface * pInterface ) { m_pInterface = pInterface; }
+    void                                    Initialize                 ( void );
+    void                                    SetName                    ( const char * szName );
+    void                                    SetBoneTag                 ( int32_t i32BoneID );
+    void                                    SetKeyFrames               ( size_t cKeyFrames, bool bRoot, bool bCompressed, void * pKeyFrames );
+    uint32_t                                GetHash                    ( void ) { return m_pInterface->m_hash; }
+    uint16_t                                GetBoneTag                 ( void ) { return m_pInterface->m_boneId; }
+    void *                                  GetKeyFrames               ( void ) { return m_pInterface->pKeyFrames; }
+    unsigned short                          GetKeyFramesCount          ( void ) { return m_pInterface->sNumKeyFrames; }
+    bool                                    IsBigChunkForAllSequences  ( void ) { return ( ( m_pInterface->sFlags >> 3) & 1 ); }
+    CAnimBlendSequenceSAInterface *         GetInterface               ( void ) { return m_pInterface; }
 
 protected:
     CAnimBlendSequenceSAInterface *        m_pInterface;
diff --git a/Client/mods/deathmatch/logic/CClientIFP.cpp b/Client/mods/deathmatch/logic/CClientIFP.cpp
@@ -54,7 +54,7 @@ bool CClientIFP::LoadIFPFile ( const char * szFilePath )
         }
 
         // We are unloading the data because we don't need to read it anymore. 
-        // This function does not unload IFP, to unload ifp call unloadIFP function
+        // This function does not unload IFP, to unload ifp, use destroyElement from lua
         UnloadFile ( );
     }
     else
@@ -407,13 +407,13 @@ void CClientIFP::ReadKr00FramesAsCompressed (  BYTE * pKeyFrames, int32_t TotalF
     }
 }
 
-void CClientIFP::ReadKr00CompressedFrames (  BYTE * pKeyFrames, int32_t TotalFrames )
+inline void CClientIFP::ReadKr00CompressedFrames (  BYTE * pKeyFrames, int32_t TotalFrames )
 {
     size_t iSizeInBytes = sizeof ( IFP_Compressed_KR00 ) * TotalFrames;
     ReadBytes ( pKeyFrames, iSizeInBytes );
 }
 
-void CClientIFP::ReadKrt0CompressedFrames (  BYTE * pKeyFrames, int32_t TotalFrames )
+inline void CClientIFP::ReadKrt0CompressedFrames (  BYTE * pKeyFrames, int32_t TotalFrames )
 {
     size_t iSizeInBytes = sizeof ( IFP_Compressed_KRT0 ) * TotalFrames;
     ReadBytes ( pKeyFrames, iSizeInBytes );
diff --git a/Client/mods/deathmatch/logic/CClientIFP.h b/Client/mods/deathmatch/logic/CClientIFP.h
@@ -230,8 +230,8 @@ class CClientIFP: public CClientEntity, CFileReader
     void                            ReadKrtsFramesAsCompressed   (  BYTE * pKeyFrames, int32_t TotalFrames );
     void                            ReadKrt0FramesAsCompressed   (  BYTE * pKeyFrames, int32_t TotalFrames );
     void                            ReadKr00FramesAsCompressed   (  BYTE * pKeyFrames, int32_t TotalFrames );
-    void                            ReadKr00CompressedFrames     (  BYTE * pKeyFrames, int32_t TotalFrames );
-    void                            ReadKrt0CompressedFrames     (  BYTE * pKeyFrames, int32_t TotalFrames );
+    inline void                     ReadKr00CompressedFrames     (  BYTE * pKeyFrames, int32_t TotalFrames );
+    inline void                     ReadKrt0CompressedFrames     (  BYTE * pKeyFrames, int32_t TotalFrames );
 
     void                            InitializeAnimationHierarchy ( std::unique_ptr < CAnimBlendHierarchy > & pAnimationHierarchy, const char * szAnimationName, const int32_t iSequences );
     void                            InitializeAnimationSequence  ( std::unique_ptr < CAnimBlendSequence > & pAnimationSequence, const char * szName, const int32_t iBoneID );
diff --git a/Client/mods/deathmatch/logic/CIFPAnimations.cpp b/Client/mods/deathmatch/logic/CIFPAnimations.cpp
@@ -8,42 +8,37 @@ CIFPAnimations::CIFPAnimations ( void )
 
 CIFPAnimations::~CIFPAnimations ( void )
 {
-    printf("~CIFPAnimations(): CIFPAnimations destoryed\n");
+    printf("~CIFPAnimations(): Going to call DeleteAnimations\n");
     DeleteAnimations ( );
 }
 
 void CIFPAnimations::DeleteAnimations ( void )
 {
     CAnimManager * pAnimManager = g_pGame->GetAnimManager ( );
-    for ( size_t i = 0; i < vecAnimations.size(); i++ )
-    {
-        IFP_Animation * ifpAnimation = &vecAnimations[i];
-        
-        pAnimManager->RemoveFromUncompressedCache ( &ifpAnimation->Hierarchy );
-
-        for (unsigned short SequenceIndex = 0; SequenceIndex < ifpAnimation->Hierarchy.usNumSequences; SequenceIndex++)
+    for ( auto it = vecAnimations.begin(); it != vecAnimations.end(); ++it ) 
+    {    
+        auto pAnimationHierarchy = pAnimManager->GetCustomAnimBlendHierarchy ( &it->Hierarchy );
+        for (unsigned short SequenceIndex = 0; SequenceIndex < pAnimationHierarchy->GetNumSequences ( ); SequenceIndex++)
         {
-            auto pSequence = (CAnimBlendSequenceSAInterface*)((BYTE*)ifpAnimation->Hierarchy.pSequences + (sizeof(CAnimBlendSequenceSAInterface) * SequenceIndex));
-
-            if ( !( (pSequence->sFlags >> 3) & 1 ) ) // If ( !OneBigChunkForAllSequences )
+            pAnimManager->RemoveFromUncompressedCache ( pAnimationHierarchy->GetInterface ( ) );
+            auto pAnimationSequence = pAnimManager->GetCustomAnimBlendSequence ( pAnimationHierarchy->GetSequence ( SequenceIndex ) );
+            void * pKeyFrames = pAnimationSequence->GetKeyFrames ( );
+            if ( !pAnimationSequence->IsBigChunkForAllSequences ( ) )
             {
-                pAnimManager->FreeKeyFramesMemory ( pSequence->pKeyFrames ); //*(void **)(pThis + 8)); //pSequence->m_pFrames );
+               pAnimManager->FreeKeyFramesMemory ( pKeyFrames ); 
             }
             else
             {
                 if ( SequenceIndex == 0 )
                 { 
                     // All frames of all sequences are allocated on one memory block, so free that one
                     // and break the loop 
-                    pAnimManager->FreeKeyFramesMemory ( pSequence->pKeyFrames );
+                    pAnimManager->FreeKeyFramesMemory ( pKeyFrames ); 
                     break;
                 }
             }
-  
         }
-        delete ifpAnimation->pSequencesMemory;  
+        delete it->pSequencesMemory;  
     }
-
     printf("CIFPAnimations::DeleteAnimations: IFP Animations have been unloaded successfully!\n");
-
 }
diff --git a/Client/sdk/game/CAnimBlendSequence.h b/Client/sdk/game/CAnimBlendSequence.h
@@ -15,15 +15,16 @@
 class CAnimBlendSequence
 {
 public:
-    virtual void                                Initialize         ( void ) = 0;
-    virtual void                                SetName            ( const char * szName ) = 0;
-    virtual void                                SetBoneTag         ( int32_t i32BoneID ) = 0;
-    virtual void                                SetKeyFrames       ( size_t cKeyFrames, bool bRoot, bool bCompressed, void * pKeyFrames ) = 0;
-    virtual uint32_t                            GetHash            ( void ) = 0;
-    virtual uint16_t                            GetBoneTag         ( void ) = 0;
-    virtual void *                              GetKeyFrames       ( void ) = 0;
-    virtual unsigned short                      GetKeyFramesCount  ( void ) = 0;
-    virtual CAnimBlendSequenceSAInterface *     GetInterface       ( void ) = 0;
+    virtual void                                Initialize                 ( void ) = 0;
+    virtual void                                SetName                    ( const char * szName ) = 0;
+    virtual void                                SetBoneTag                 ( int32_t i32BoneID ) = 0;
+    virtual void                                SetKeyFrames               ( size_t cKeyFrames, bool bRoot, bool bCompressed, void * pKeyFrames ) = 0;
+    virtual uint32_t                            GetHash                    ( void ) = 0;
+    virtual uint16_t                            GetBoneTag                 ( void ) = 0;
+    virtual void *                              GetKeyFrames               ( void ) = 0;
+    virtual unsigned short                      GetKeyFramesCount          ( void ) = 0;
+    virtual bool                                IsBigChunkForAllSequences  ( void ) = 0;
+    virtual CAnimBlendSequenceSAInterface *     GetInterface               ( void ) = 0;
 };
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ bool CClientIFP::LoadIFPFile ( const char * szFilePath )`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`// We are unloading the data because we don't need to read it anymore.`
`57`		`- // This function does not unload IFP, to unload ifp call unloadIFP function`
	`57`	`+ // This function does not unload IFP, to unload ifp, use destroyElement from lua`
`58`	`58`	`UnloadFile ( );`
`59`	`59`	`}`
`60`	`60`	`else`
`@@ -407,13 +407,13 @@ void CClientIFP::ReadKr00FramesAsCompressed ( BYTE * pKeyFrames, int32_t TotalF`
`407`	`407`	`}`
`408`	`408`	`}`
`409`	`409`
`410`		`-void CClientIFP::ReadKr00CompressedFrames ( BYTE * pKeyFrames, int32_t TotalFrames )`
	`410`	`+inline void CClientIFP::ReadKr00CompressedFrames ( BYTE * pKeyFrames, int32_t TotalFrames )`
`411`	`411`	`{`
`412`	`412`	`size_t iSizeInBytes = sizeof ( IFP_Compressed_KR00 ) * TotalFrames;`
`413`	`413`	`ReadBytes ( pKeyFrames, iSizeInBytes );`
`414`	`414`	`}`
`415`	`415`
`416`		`-void CClientIFP::ReadKrt0CompressedFrames ( BYTE * pKeyFrames, int32_t TotalFrames )`
	`416`	`+inline void CClientIFP::ReadKrt0CompressedFrames ( BYTE * pKeyFrames, int32_t TotalFrames )`
`417`	`417`	`{`
`418`	`418`	`size_t iSizeInBytes = sizeof ( IFP_Compressed_KRT0 ) * TotalFrames;`
`419`	`419`	`ReadBytes ( pKeyFrames, iSizeInBytes );`
Original file line number	Diff line number	Diff line change
`@@ -8,42 +8,37 @@ CIFPAnimations::CIFPAnimations ( void )`
`8`	`8`
`9`	`9`	`CIFPAnimations::~CIFPAnimations ( void )`
`10`	`10`	`{`
`11`		`- printf("~CIFPAnimations(): CIFPAnimations destoryed\n");`
	`11`	`+ printf("~CIFPAnimations(): Going to call DeleteAnimations\n");`
`12`	`12`	`DeleteAnimations ( );`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`void CIFPAnimations::DeleteAnimations ( void )`
`16`	`16`	`{`
`17`	`17`	`CAnimManager * pAnimManager = g_pGame->GetAnimManager ( );`
`18`		`- for ( size_t i = 0; i < vecAnimations.size(); i++ )`
`19`		`- {`
`20`		`- IFP_Animation * ifpAnimation = &vecAnimations[i];`
`21`		`-`
`22`		`- pAnimManager->RemoveFromUncompressedCache ( &ifpAnimation->Hierarchy );`
`23`		`-`
`24`		`- for (unsigned short SequenceIndex = 0; SequenceIndex < ifpAnimation->Hierarchy.usNumSequences; SequenceIndex++)`
	`18`	`+ for ( auto it = vecAnimations.begin(); it != vecAnimations.end(); ++it )`
	`19`	`+ {`
	`20`	`+ auto pAnimationHierarchy = pAnimManager->GetCustomAnimBlendHierarchy ( &it->Hierarchy );`
	`21`	`+ for (unsigned short SequenceIndex = 0; SequenceIndex < pAnimationHierarchy->GetNumSequences ( ); SequenceIndex++)`
`25`	`22`	`{`
`26`		`- auto pSequence = (CAnimBlendSequenceSAInterface)((BYTE)ifpAnimation->Hierarchy.pSequences + (sizeof(CAnimBlendSequenceSAInterface) * SequenceIndex));`
`27`		`-`
`28`		`- if ( !( (pSequence->sFlags >> 3) & 1 ) ) // If ( !OneBigChunkForAllSequences )`
	`23`	`+ pAnimManager->RemoveFromUncompressedCache ( pAnimationHierarchy->GetInterface ( ) );`
	`24`	`+ auto pAnimationSequence = pAnimManager->GetCustomAnimBlendSequence ( pAnimationHierarchy->GetSequence ( SequenceIndex ) );`
	`25`	`+ void * pKeyFrames = pAnimationSequence->GetKeyFrames ( );`
	`26`	`+ if ( !pAnimationSequence->IsBigChunkForAllSequences ( ) )`
`29`	`27`	`{`
`30`		`- pAnimManager->FreeKeyFramesMemory ( pSequence->pKeyFrames ); //(void *)(pThis + 8)); //pSequence->m_pFrames );`
	`28`	`+ pAnimManager->FreeKeyFramesMemory ( pKeyFrames );`
`31`	`29`	`}`
`32`	`30`	`else`
`33`	`31`	`{`
`34`	`32`	`if ( SequenceIndex == 0 )`
`35`	`33`	`{`
`36`	`34`	`// All frames of all sequences are allocated on one memory block, so free that one`
`37`	`35`	`// and break the loop`
`38`		`- pAnimManager->FreeKeyFramesMemory ( pSequence->pKeyFrames );`
	`36`	`+ pAnimManager->FreeKeyFramesMemory ( pKeyFrames );`
`39`	`37`	`break;`
`40`	`38`	`}`
`41`	`39`	`}`
`42`		`-`
`43`	`40`	`}`
`44`		`- delete ifpAnimation->pSequencesMemory;`
	`41`	`+ delete it->pSequencesMemory;`
`45`	`42`	`}`
`46`		`-`
`47`	`43`	`printf("CIFPAnimations::DeleteAnimations: IFP Animations have been unloaded successfully!\n");`
`48`		`-`
`49`	`44`	`}`