First attempt to reduce load time of player deck selection screens.

This change makes use of caching the DeckStats and DeckStatsWrappers into singleton caches that get flushed when you quit the game. The initial load time will be significant as lazy loading has not been coded yet for the ai decks. TODO: lazy load the player and ai decks as they appear on the screen. Currently, each screen loads all decks.
2011-01-27 16:13:40 +00:00
parent e87f5edaf5
commit ce7745bfa6
10 changed files with 213 additions and 101 deletions
--- a/projects/mtg/src/DeckManager.cpp
+++ b/projects/mtg/src/DeckManager.cpp
@@ -1,60 +1,132 @@
-#include "PrecompiledHeader.h"
-
-#include "DeckManager.h"
-#include "Player.h"
-#include <JRenderer.h>
-
-void DeckManager::updateMetaDataList(vector<DeckMetaData *> * refList, bool isAI)
-{
-    if (refList)
-    {
-        vector<DeckMetaData *> * inputList = isAI ? &aiDeckOrderList : &playerDeckOrderList;
-        inputList->clear();
-        inputList->assign(refList->begin(), refList -> end());
-    }
-}
-
-vector<DeckMetaData *> * DeckManager::getPlayerDeckOrderList()
-{
-    return &playerDeckOrderList;
-}
-
-vector<DeckMetaData *> * DeckManager::getAIDeckOrderList()
-{
-    return &aiDeckOrderList;
-}
-
-DeckManager * DeckManager::mInstance = NULL;
-bool DeckManager::instanceFlag = false;
-
-void DeckManager::EndInstance()
-{
-    if (mInstance)
-    {
-        mInstance->aiDeckOrderList.clear();
-        mInstance->playerDeckOrderList.clear();
-        SAFE_DELETE( mInstance );
-    }
-}
-
-DeckManager* DeckManager::GetInstance()
-{
-    if (!instanceFlag)
-    {
-        mInstance = NEW DeckManager();
-        instanceFlag = true;
-    }
-
-    return mInstance;
-}
-
-//  p1 is assumed to be the player you want stats for
-//  p2 is the opponent
-int DeckManager::getDifficultyRating(Player *statsPlayer, Player *player)
-{
-    DeckMetaDataList * metas = DeckMetaDataList::decksMetaData;
-
-    DeckMetaData *meta = metas->get(player->deckFile, statsPlayer);
-
-    return meta->getDifficulty();
-}
+#include "PrecompiledHeader.h"
+
+#include "DeckManager.h"
+#include "Player.h"
+#include <JRenderer.h>
+
+void DeckManager::updateMetaDataList(vector<DeckMetaData *> * refList, bool isAI)
+{
+    if (refList)
+    {
+        vector<DeckMetaData *> * inputList = isAI ? &aiDeckOrderList : &playerDeckOrderList;
+        inputList->clear();
+        inputList->assign(refList->begin(), refList -> end());
+    }
+}
+
+vector<DeckMetaData *> * DeckManager::getPlayerDeckOrderList()
+{
+    return &playerDeckOrderList;
+}
+
+vector<DeckMetaData *> * DeckManager::getAIDeckOrderList()
+{
+    return &aiDeckOrderList;
+}
+
+DeckMetaData * DeckManager::getDeckMetaDataById( int deckId, bool isAI )
+{
+
+    DeckMetaData* currentDeck = NULL;
+    vector<DeckMetaData *>::iterator currentPos, end;
+    if ( isAI )
+    {
+        currentPos = aiDeckOrderList.begin();
+        end = aiDeckOrderList.end();
+    }
+    else
+    {
+        currentPos = playerDeckOrderList.begin();
+        end = playerDeckOrderList.end();    
+    }
+
+
+    for (; currentPos != end; ++currentPos) 
+    {
+        currentDeck = *currentPos;
+        if (currentDeck->getDeckId() == deckId )
+            return currentDeck;
+    }
+    return NULL;
+}
+
+StatsWrapper * DeckManager::getExtendedStatsForDeckId( int deckId, MTGAllCards *collection, bool isAI )
+{
+    DeckMetaData *selectedDeck = getDeckMetaDataById( deckId, isAI );
+    return getExtendedDeckStats( selectedDeck, collection, isAI);
+}
+
+
+StatsWrapper * DeckManager::getExtendedDeckStats( DeckMetaData *selectedDeck, MTGAllCards *collection, bool isAI )
+{
+    StatsWrapper * stats = NULL;
+    map<string, StatsWrapper *> *statsMap = NULL;
+
+    string deckName = selectedDeck->getFilename();
+    int deckId = selectedDeck->getDeckId();
+
+    if (isAI)
+        statsMap = &aiDeckStatsMap;
+    else
+        statsMap = &playerDeckStatsMap;    
+
+    if (statsMap->empty() || (statsMap->find(deckName) == statsMap->end()))
+    {
+        stats = NEW StatsWrapper(deckId);
+        stats->updateStats( deckName, collection);
+        statsMap->insert( make_pair( deckName, stats));
+    }
+    stats = statsMap->find(deckName) ->second;
+
+    return stats;
+}
+
+
+DeckManager * DeckManager::mInstance = NULL;
+bool DeckManager::instanceFlag = false;
+
+void DeckManager::EndInstance()
+{
+    if (mInstance)
+    {
+        mInstance->aiDeckOrderList.clear();
+        mInstance->playerDeckOrderList.clear();
+        map<string, StatsWrapper *>::iterator it;
+        for (it = mInstance->aiDeckStatsMap.begin(); it != mInstance->aiDeckStatsMap.end(); it++){
+            SAFE_DELETE(it->second);
+        }
+        for (it = mInstance->playerDeckStatsMap.begin(); it != mInstance->playerDeckStatsMap.end(); it++){
+            SAFE_DELETE(it->second);
+        }
+        mInstance->aiDeckStatsMap.clear();
+        mInstance->playerDeckStatsMap.clear();
+        SAFE_DELETE( mInstance );
+    }
+}
+
+DeckManager* DeckManager::GetInstance()
+{
+    if (!instanceFlag)
+    {
+        mInstance = NEW DeckManager();
+        instanceFlag = true;
+    }
+
+    return mInstance;
+}
+
+//  p1 is assumed to be the player you want stats for
+//  p2 is the opponent
+int DeckManager::getDifficultyRating(Player *statsPlayer, Player *player)
+{
+    DeckMetaDataList * metas = DeckMetaDataList::decksMetaData;
+
+    DeckMetaData *meta = metas->get(player->deckFile, statsPlayer);
+
+    return meta->getDifficulty();
+}
+
+DeckManager::~DeckManager()
+{
+    instanceFlag = false;
+}