Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Erwan

Browse Source 
- Put back delayed loading functionality for the Deck editor
This commit is contained in:
wagic.the.homebrew@gmail.com
2009-09-09 13:51:29 +00:00
parent 91a9387e33
commit c0be024093
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/include/WResourceManager.h
+1
View File
@@ -80,6 +80,7 @@ public:
WResourceManager(); WResourceManager();
~WResourceManager(); ~WResourceManager();
bool isCardInCache(MTGCard * card, int type = CACHE_CARD);
JQuad * RetrieveCard(MTGCard * card, int type = CACHE_CARD, int style = RETRIEVE_NORMAL); JQuad * RetrieveCard(MTGCard * card, int type = CACHE_CARD, int style = RETRIEVE_NORMAL);
JSample * RetrieveSample(string filename, int style = RETRIEVE_NORMAL); JSample * RetrieveSample(string filename, int style = RETRIEVE_NORMAL);
JTexture * RetrieveTexture(string filename, int style = RETRIEVE_NORMAL); JTexture * RetrieveTexture(string filename, int style = RETRIEVE_NORMAL);
projects/mtg/src/GameStateDeckViewer.cpp
+4
View File
@@ -546,7 +546,11 @@ void GameStateDeckViewer::renderCard(int id, float rotation){
JQuad * quad = backQuad; JQuad * quad = backQuad;
int showName = 1; int showName = 1;
if (resources.RetrieveCard(card,CACHE_CARD,RETRIEVE_EXISTING) || last_user_activity > (abs(2-id) + 1)* NO_USER_ACTIVITY_SHOWCARD_DELAY){
quad = resources.RetrieveCard(card); quad = resources.RetrieveCard(card);
showName = 0;
}
if (quad){ if (quad){
showName = 0; showName = 0;
projects/mtg/src/WResourceManager.cpp
+3
View File
@@ -299,6 +299,9 @@ WCachedTexture * WResourceManager:: getCachedCard(MTGCard * card, int type, bool
if(miss != textureCache.end() && miss->second == NULL) if(miss != textureCache.end() && miss->second == NULL)
return NULL; //We've found a cache miss, so return null. return NULL; //We've found a cache miss, so return null.
if(miss == textureCache.end() && !makenew)
return NULL; //cache empty and don't want to create
WCachedTexture * ctex = textureCache[filename]; WCachedTexture * ctex = textureCache[filename];
//Failed to find it in cache! //Failed to find it in cache!
if(!ctex && makenew){ if(!ctex && makenew){