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

Jeck - WResourceManager / Cache should now be leak free. Demo mode still crashes around EnstackBlocker.

Browse Source
This commit is contained in:
wagic.jeck
2009-09-18 01:20:46 +00:00
parent 6abd3cc160
commit 8ba34dafca
16 changed files with 794 additions and 594 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/bin/daily_build/template.exe
BIN
View File
Binary file not shown.
projects/mtg/include/GuiCombat.h
+1 -1
View File
@@ -13,7 +13,7 @@ class GuiCombat : public GuiLayer
GameObserver* go; GameObserver* go;
DamagerDamaged* active; DamagerDamaged* active;
AttackerDamaged* activeAtk; AttackerDamaged* activeAtk;
static JQuad* ok_quad; static JTexture* ok_tex;
Pos ok, enemy_avatar; Pos ok, enemy_avatar;
vector<AttackerDamaged*> attackers; vector<AttackerDamaged*> attackers;
DamagerDamaged* current; DamagerDamaged* current;
projects/mtg/include/ShopItem.h
+1
View File
@@ -20,6 +20,7 @@ class hgeDistortionMesh;
class ShopItem:public JGuiObject{ class ShopItem:public JGuiObject{
private: private:
bool mHasFocus; bool mHasFocus;
bool mRelease;
JLBFont *mFont; JLBFont *mFont;
string mText; string mText;
float xy[8]; float xy[8];
projects/mtg/include/WCachedResource.h
+42 -15
View File
@@ -18,24 +18,47 @@ public:
virtual void Nullify()=0; //For when our size is 0, so we don't free anything by mistake. virtual void Nullify()=0; //For when our size is 0, so we don't free anything by mistake.
virtual unsigned long size()=0; //Size of cached item in bytes. virtual unsigned long size()=0; //Size of cached item in bytes.
virtual void Refresh(string filename)=0; //Basically calls Attempt(filename) and remaps in situ.
virtual bool isGood()=0; //Return true if this has data. virtual bool isGood()=0; //Return true if this has data.
virtual bool Attempt(string filename, int submode, int & error)=0; //Returns true if we've loaded our data and isGood(). virtual bool isLocked(); //Is the resource locked?
virtual void lock(); //Lock it.
virtual void unlock(bool force = false); //Unlock it. Forcing a lock will also remove "permanent" status.
protected:
bool isLocked(); //Is the resource locked?
bool isPermanent(); //Is the resource permanent? bool isPermanent(); //Is the resource permanent?
void lock(); //Lock it.
void deadbolt(); //Make it permanent. void deadbolt(); //Make it permanent.
void unlock(bool force = false); //Unlock it. Forcing a lock will also remove "permanent" status.
void hit(); //Update resource's last used time. void hit(); //Update resource's last used time.
protected:
int loadedMode; //What submode settings were we loaded with? (For refresh) int loadedMode; //What submode settings were we loaded with? (For refresh)
unsigned int lastTime; //When was the last time we were hit? unsigned int lastTime; //When was the last time we were hit?
unsigned char locks; //Remember to unlock when we're done using locked stuff, or else this'll be useless. unsigned char locks; //Remember to unlock when we're done using locked stuff, or else this'll be useless.
}; };
class WCachedTexture: public WResource{ class WCachedResource: public WResource {
public:
friend class WResourceManager;
template<class cacheItem,class cacheActual> friend class WCache;
virtual void Refresh(string filename)=0; //Basically calls Attempt(filename) and remaps in situ.
virtual bool Attempt(string filename, int submode, int & error)=0; //Returns true if we've loaded our data and isGood().
};
class WTrackedQuad: public WResource {
public:
WTrackedQuad(string _resname);
~WTrackedQuad();
void Nullify();
unsigned long size();
bool isGood();
string resname;
JQuad * quad;
#ifdef DEBUG_CACHE
static int totalTracked;
#endif
};
class WCachedTexture: public WCachedResource{
public: public:
friend class WResourceManager; friend class WResourceManager;
template<class cacheItem,class cacheActual> friend class WCache; template<class cacheItem,class cacheActual> friend class WCache;
@@ -44,23 +67,28 @@ public:
void Refresh(string filename); void Refresh(string filename);
unsigned long size(); unsigned long size();
bool isGood(); bool isGood();
bool isLocked();
bool Attempt(string filename, int submode, int & error); bool Attempt(string filename, int submode, int & error);
bool compare(JTexture * t) {return (t == texture);}; bool compare(JTexture * t) {return (t == texture);};
void Nullify(); void Nullify();
JTexture * Actual(); //Return this texture as is. Does not make a new one. JTexture * Actual(); //Return this texture as is. Does not make a new one.
JQuad * GetQuad(string resname); JQuad * GetQuad(string resname);
JQuad * GetQuad(float offX=0.0f, float offY=0.0f, float width=0.0f, float height=0.0f,string resname=""); //Get us a new/existing quad.
WTrackedQuad* GetTrackedQuad(float offX=0.0f, float offY=0.0f, float width=0.0f, float height=0.0f,string resname=""); //Get us a new/existing quad.
JQuad * GetQuad(float offX=0.0f, float offY=0.0f, float width=0.0f, float height=0.0f,string resname=""); //Alias to GetTrackedQuad.
JQuad * GetCard(float offX=0.0f, float offY=0.0f, float width=0.0f, float height=0.0f,string resname=""); //Same as above, but centered when new. JQuad * GetCard(float offX=0.0f, float offY=0.0f, float width=0.0f, float height=0.0f,string resname=""); //Same as above, but centered when new.
bool ReleaseQuad(JQuad* quad); //We're done with this quad, so delete and stop tracking. True if existed. bool ReleaseQuad(JQuad* quad); //We're done with this quad, so delete and stop tracking. True if existed.
protected: protected:
JTexture * texture; JTexture * texture;
bool bVRAM; bool bVRAM;
map<JQuad*,string> trackedQuads; vector<WTrackedQuad*> trackedQuads;
}; };
class WCachedParticles: public WResource{ class WCachedParticles: public WCachedResource{
public: public:
friend class WResourceManager; friend class WResourceManager;
template<class cacheItem,class cacheActual> friend class WCache; template<class cacheItem,class cacheActual> friend class WCache;
@@ -79,13 +107,12 @@ protected:
hgeParticleSystemInfo * particles; hgeParticleSystemInfo * particles;
}; };
class WCachedSample: public WResource{ class WCachedSample: public WCachedResource{
public: public:
friend class WResourceManager; friend class WResourceManager;
template<class cacheItem,class cacheActual> friend class WCache; template<class cacheItem,class cacheActual> friend class WCache;
WCachedSample(); WCachedSample();
~WCachedSample(); ~WCachedSample();
void Nullify(); void Nullify();
bool compare(JSample * s) {return (s == sample);}; bool compare(JSample * s) {return (s == sample);};
unsigned long size(); unsigned long size();
@@ -98,4 +125,4 @@ protected:
JSample * sample; JSample * sample;
}; };
#endif #endif
projects/mtg/include/WResourceManager.h
+16 -6
View File
@@ -7,17 +7,28 @@
#include "MTGCard.h" #include "MTGCard.h"
#include "WCachedResource.h" #include "WCachedResource.h"
//Hard Limits. //Soft limits.
#define HUGE_CACHE_LIMIT 10000000
#define HUGE_CACHE_ITEMS 400
#define LARGE_CACHE_LIMIT 5000000 #define LARGE_CACHE_LIMIT 5000000
#define SMALL_CACHE_LIMIT 2000000 #define LARGE_CACHE_ITEMS 300
#define MAX_CACHE_OBJECTS 200
#define SMALL_CACHE_LIMIT 1000000
#define SMALL_CACHE_ITEMS 200
//Hard Limits.
#define MAX_CACHE_OBJECTS 400
#define MAX_CACHE_ATTEMPTS 10 #define MAX_CACHE_ATTEMPTS 10
#define MAX_CACHE_MISSES 200 #define MAX_CACHE_MISSES 200
#define MAX_CACHED_SAMPLES 0
enum ENUM_WRES_INFO{ enum ENUM_WRES_INFO{
WRES_UNLOCKED = 0, //Resource is unlocked. WRES_UNLOCKED = 0, //Resource is unlocked.
WRES_MAX_LOCK = 250, //Maximum number of locks for a resource. WRES_MAX_LOCK = 250, //Maximum number of locks for a resource.
WRES_PERMANENT = 251, //Resource is permanent (ie, managed) WRES_PERMANENT = 251, //Resource is permanent (ie, managed)
WRES_UNDERLOCKED = 252, //Resource was released too many times.
}; };
enum ENUM_RETRIEVE_STYLE{ enum ENUM_RETRIEVE_STYLE{
@@ -166,8 +177,7 @@ public:
//Wrapped from JSoundSystem. TODO: Privatize. //Wrapped from JSoundSystem. TODO: Privatize.
JMusic * ssLoadMusic(const char *fileName); JMusic * ssLoadMusic(const char *fileName);
void LargeCache(); void CacheForState(int state);
void SmallCache();
void DebugRender(); void DebugRender();
@@ -183,7 +193,7 @@ private:
WCache<WCachedTexture,JTexture> textureWCache; WCache<WCachedTexture,JTexture> textureWCache;
WCache<WCachedSample,JSample> sampleWCache; WCache<WCachedSample,JSample> sampleWCache;
WCache<WCachedParticles,hgeParticleSystemInfo> psiWCache; WCache<WCachedParticles,hgeParticleSystemInfo> psiWCache;
vector<WManagedQuad> managedQuads; vector<WManagedQuad*> managedQuads;
//Statistics of record. //Statistics of record.
unsigned int lastTime; unsigned int lastTime;
projects/mtg/src/GameApp.cpp
+8
View File
@@ -248,6 +248,14 @@ void GameApp::Update()
mCurrentState->End(); mCurrentState->End();
mCurrentState = mNextState; mCurrentState = mNextState;
//Automate cache resizing.
for(int x=0;x<MAX_STATE;x++){
if(mNextState == mGameStates[x]){
resources.CacheForState(x);
break;
}
}
#if defined (WIN32) || defined (LINUX) #if defined (WIN32) || defined (LINUX)
projects/mtg/src/GameStateDuel.cpp
-4
View File
@@ -42,7 +42,6 @@ GameStateDuel::GameStateDuel(GameApp* parent): GameState(parent) {
deck[i]=NULL; deck[i]=NULL;
mPlayers[i]=NULL; mPlayers[i]=NULL;
} }
resources.LargeCache();
premadeDeck = false; premadeDeck = false;
game = NULL; game = NULL;
deckmenu = NULL; deckmenu = NULL;
@@ -63,7 +62,6 @@ GameStateDuel::~GameStateDuel() {
void GameStateDuel::Start() void GameStateDuel::Start()
{ {
JRenderer * renderer = JRenderer::GetInstance(); JRenderer * renderer = JRenderer::GetInstance();
resources.SmallCache();
renderer->ResetPrivateVRAM(); renderer->ResetPrivateVRAM();
renderer->EnableVSync(true); renderer->EnableVSync(true);
@@ -73,7 +71,6 @@ void GameStateDuel::Start()
testSuite = NEW TestSuite(RESPATH"/test/_tests.txt",mParent->collection); testSuite = NEW TestSuite(RESPATH"/test/_tests.txt",mParent->collection);
#endif #endif
mGamePhase = DUEL_STATE_CHOOSE_DECK1; mGamePhase = DUEL_STATE_CHOOSE_DECK1;
credits = NEW Credits(); credits = NEW Credits();
mFont = resources.GetJLBFont(Constants::MENU_FONT); mFont = resources.GetJLBFont(Constants::MENU_FONT);
@@ -218,7 +215,6 @@ void GameStateDuel::End()
#if defined (WIN32) || defined (LINUX) #if defined (WIN32) || defined (LINUX)
OutputDebugString("Ending GamestateDuel\n"); OutputDebugString("Ending GamestateDuel\n");
#endif #endif
resources.SmallCache();
SAFE_DELETE(deckmenu); SAFE_DELETE(deckmenu);
JRenderer::GetInstance()->EnableVSync(false); JRenderer::GetInstance()->EnableVSync(false);
if (mPlayers[0] && mPlayers[1]) mPlayers[0]->End(); if (mPlayers[0] && mPlayers[1]) mPlayers[0]->End();
projects/mtg/src/GameStateShop.cpp
+1
View File
@@ -119,6 +119,7 @@ void GameStateShop::load(){
void GameStateShop::End() void GameStateShop::End()
{ {
JRenderer::GetInstance()->EnableVSync(false); JRenderer::GetInstance()->EnableVSync(false);
resources.Release(mBg);
resources.Release(bgTexture); resources.Release(bgTexture);
SAFE_DELETE(shop); SAFE_DELETE(shop);
SAFE_DELETE(menu); SAFE_DELETE(menu);
projects/mtg/src/GuiCombat.cpp
+10 -7
View File
@@ -12,24 +12,23 @@ struct Left : public Exp { static inline bool test(DamagerDamaged* ref, DamagerD
struct Right : public Exp { static inline bool test(DamagerDamaged* ref, DamagerDamaged* test) struct Right : public Exp { static inline bool test(DamagerDamaged* ref, DamagerDamaged* test)
{ return ref->y == test->y && ref->x < test->x && test->show; } }; { return ref->y == test->y && ref->x < test->x && test->show; } };
JQuad* GuiCombat::ok_quad = NULL; JTexture* GuiCombat::ok_tex = NULL;
GuiCombat::GuiCombat(GameObserver* go) : GuiLayer(), go(go), active(false), activeAtk(NULL), GuiCombat::GuiCombat(GameObserver* go) : GuiLayer(), go(go), active(false), activeAtk(NULL),
ok(SCREEN_WIDTH - MARGIN, 210, 1, 0, 255), ok(SCREEN_WIDTH - MARGIN, 210, 1, 0, 255),
enemy_avatar(SCREEN_WIDTH - MARGIN, TOP_LINE, 2, 0, 255), enemy_avatar(SCREEN_WIDTH - MARGIN, TOP_LINE, 2, 0, 255),
cursor_pos(NONE), step(DAMAGE) cursor_pos(NONE), step(DAMAGE)
{ {
if(NULL == ok_quad) if(NULL == ok_tex)
{ {
ok_quad = resources.RetrieveQuad("Ok.png"); ok_tex = resources.RetrieveTexture("Ok.png",RETRIEVE_LOCK);
if (ok_quad) ok_quad->SetHotSpot(28, 22);
} }
} }
GuiCombat::~GuiCombat() GuiCombat::~GuiCombat()
{ {
if(ok_quad) if(ok_tex)
resources.Release(ok_quad); resources.Release(ok_tex);
for (inner_iterator it = attackers.begin(); it != attackers.end(); ++it) for (inner_iterator it = attackers.begin(); it != attackers.end(); ++it)
{ {
@@ -277,7 +276,11 @@ void GuiCombat::Render()
} }
} }
} }
if (ok_quad) ok.Render(ok_quad); if (ok_tex) {
JQuad *ok_quad = resources.RetrieveTempQuad("Ok.png");
ok_quad->SetHotSpot(28, 22);
ok.Render(ok_quad);
}
renderer->DrawLine(0, SCREEN_HEIGHT / 2 + 10, SCREEN_WIDTH, SCREEN_HEIGHT / 2 + 10, ARGB(255, 255, 64, 0)); renderer->DrawLine(0, SCREEN_HEIGHT / 2 + 10, SCREEN_WIDTH, SCREEN_HEIGHT / 2 + 10, ARGB(255, 255, 64, 0));
if (FIRST_STRIKE == step) if (FIRST_STRIKE == step)
{ {
projects/mtg/src/GuiMana.cpp
+6 -4
View File
@@ -41,6 +41,8 @@ ManaIcon::ManaIcon(int color, float x, float y) : Pos(x, y, 0.5, 0.0, 255), f(-1
if(!psi){ if(!psi){
psi = NEW hgeParticleSystemInfo(); psi = NEW hgeParticleSystemInfo();
if(!psi)
return;
hgeParticleSystemInfo * defaults = resources.RetrievePSI("mana.psi",mq); hgeParticleSystemInfo * defaults = resources.RetrievePSI("mana.psi",mq);
if(defaults){ if(defaults){
memcpy(psi,defaults,sizeof(hgeParticleSystemInfo)); memcpy(psi,defaults,sizeof(hgeParticleSystemInfo));
@@ -50,7 +52,7 @@ ManaIcon::ManaIcon(int color, float x, float y) : Pos(x, y, 0.5, 0.0, 255), f(-1
//Default values for particle system! Cribbed from mana.psi //Default values for particle system! Cribbed from mana.psi
//Really, we should just be loading that and then changing colors... //Really, we should just be loading that and then changing colors...
/*psi->nEmission = 114; psi->nEmission = 114;
psi->fLifetime = -1; psi->fLifetime = -1;
psi->fParticleLifeMin = 1.1507937; psi->fParticleLifeMin = 1.1507937;
psi->fParticleLifeMax = 1.4682540; psi->fParticleLifeMax = 1.4682540;
@@ -60,7 +62,7 @@ ManaIcon::ManaIcon(int color, float x, float y) : Pos(x, y, 0.5, 0.0, 255), f(-1
psi->fSizeVar = 0.25396827; psi->fSizeVar = 0.25396827;
psi->fSpinStart = -5.5555553; psi->fSpinStart = -5.5555553;
psi->fAlphaVar = 0.77777779; psi->fAlphaVar = 0.77777779;
psi->sprite = mq;*/ psi->sprite = mq;
} }
switch(color){ switch(color){
@@ -91,7 +93,7 @@ ManaIcon::ManaIcon(int color, float x, float y) : Pos(x, y, 0.5, 0.0, 255), f(-1
} }
particleSys = NEW hgeParticleSystem(psi); particleSys = NEW hgeParticleSystem(psi);
SAFE_DELETE(psi); //Not handled by cache, so kill it here. SAFE_DELETE(psi); //This version of psi is not handled by cache, so kill it here.
} }
else else
particleSys = NEW hgeParticleSystem(psi); //Cache will clean psi up later. particleSys = NEW hgeParticleSystem(psi); //Cache will clean psi up later.
@@ -212,7 +214,7 @@ void GuiMana::Update(float dt)
if (it != manas.end()) if (it != manas.end())
{ {
for (vector<ManaIcon*>::iterator q = it; q != manas.end(); ++q) for (vector<ManaIcon*>::iterator q = it; q != manas.end(); ++q)
SAFE_DELETE(*q); SAFE_DELETE(*q);
manas.erase(it, manas.end()); manas.erase(it, manas.end());
} }
} }
projects/mtg/src/GuiPlay.cpp
+2 -1
View File
@@ -76,7 +76,8 @@ void GuiPlay::BattleField::EnstackAttacker(CardView* card)
void GuiPlay::BattleField::EnstackBlocker(CardView* card) void GuiPlay::BattleField::EnstackBlocker(CardView* card)
{ {
GameObserver* game = GameObserver::GetInstance(); GameObserver* game = GameObserver::GetInstance();
if (card->card && card->card->defenser && card->card->defenser->view) card->x = card->card->defenser->view->x; if (card->card && card->card->defenser && card->card->defenser->view)
card->x = card->card->defenser->view->x;
card->y = baseY + (game->players[0] == card->card->controller() ? 20 + y : -20 - y); card->y = baseY + (game->players[0] == card->card->controller() ? 20 + y : -20 - y);
} }
void GuiPlay::BattleField::Update(float dt) void GuiPlay::BattleField::Update(float dt)
projects/mtg/src/Player.cpp
+3 -1
View File
@@ -26,6 +26,8 @@ Player::~Player(){
SAFE_DELETE(manaPool); SAFE_DELETE(manaPool);
resources.Release(mAvatar); resources.Release(mAvatar);
resources.Release(mAvatarTex); resources.Release(mAvatarTex);
mAvatar = NULL;
mAvatarTex = NULL;
} }
const string Player::getDisplayName() const { const string Player::getDisplayName() const {
@@ -59,7 +61,7 @@ Player * Player::opponent(){
HumanPlayer::HumanPlayer(MTGPlayerCards * deck, string file, string fileSmall) : Player(deck, file, fileSmall) { HumanPlayer::HumanPlayer(MTGPlayerCards * deck, string file, string fileSmall) : Player(deck, file, fileSmall) {
mAvatarTex = resources.RetrieveTexture("avatar.jpg",RETRIEVE_VRAM,TEXTURE_SUB_AVATAR); mAvatarTex = resources.RetrieveTexture("avatar.jpg",RETRIEVE_VRAM,TEXTURE_SUB_AVATAR);
if (mAvatarTex) if (mAvatarTex)
mAvatar = resources.RetrieveQuad("avatar.jpg",0,0,35,50,"playerAvatar",RETRIEVE_NORMAL,TEXTURE_SUB_AVATAR); mAvatar = resources.RetrieveQuad("avatar.jpg",0,0,35,50,"playerAvatar",RETRIEVE_VRAM,TEXTURE_SUB_AVATAR);
else else
mAvatar = NULL; mAvatar = NULL;
} }
projects/mtg/src/ShopItem.cpp
+466 -458
View File
@@ -1,458 +1,466 @@
#include "../include/config.h" #include "../include/config.h"
#include "../include/ShopItem.h" #include "../include/ShopItem.h"
#include "../include/GameStateShop.h" #include "../include/GameStateShop.h"
#include "../include/CardGui.h" #include "../include/CardGui.h"
#include "../include/WResourceManager.h" #include "../include/WResourceManager.h"
#include "../include/Translate.h" #include "../include/Translate.h"
#include <hge/hgedistort.h> #include <hge/hgedistort.h>
float ShopItems::_x1[] = { 79, 20, 27,103,154,187,102,145,199,133,183}; float ShopItems::_x1[] = { 79, 20, 27,103,154,187,102,145,199,133,183};
float ShopItems::_y1[] = {150,193,222,167,164,156,195,190,176,220,220}; float ShopItems::_y1[] = {150,193,222,167,164,156,195,190,176,220,220};
float ShopItems::_x2[] = {103, 49, 73,135,183,213,138,181,231,171,225}; float ShopItems::_x2[] = {103, 49, 73,135,183,213,138,181,231,171,225};
float ShopItems::_y2[] = {155,180,218,166,166,154,195,186,177,225,216}; float ShopItems::_y2[] = {155,180,218,166,166,154,195,186,177,225,216};
float ShopItems::_x3[] = { 48, 60, 10, 96,139,190, 81,146,189, 98,191}; float ShopItems::_x3[] = { 48, 60, 10, 96,139,190, 81,146,189, 98,191};
float ShopItems::_y3[] = {163,202,255,183,180,170,219,212,195,250,251}; float ShopItems::_y3[] = {163,202,255,183,180,170,219,212,195,250,251};
float ShopItems::_x4[] = { 74, 88, 64,131,171,221,123,187,225,141,237}; float ShopItems::_x4[] = { 74, 88, 64,131,171,221,123,187,225,141,237};
float ShopItems::_y4[] = {167,187,248,182,182,168,219,208,196,258,245}; float ShopItems::_y4[] = {167,187,248,182,182,168,219,208,196,258,245};
ShopItem::ShopItem(int id, JLBFont *font, char* text, JQuad * _quad,JQuad * _thumb, float _xy[], bool hasFocus, int _price): JGuiObject(id), mFont(font), mText(text), quad(_quad), thumb(_thumb), price(_price) ShopItem::ShopItem(int id, JLBFont *font, char* text, JQuad * _quad,JQuad * _thumb, float _xy[], bool hasFocus, int _price): JGuiObject(id), mFont(font), mText(text), quad(_quad), thumb(_thumb), price(_price)
{ {
for (int i = 0; i < 8; ++i){ for (int i = 0; i < 8; ++i){
xy[i] = _xy[i]; xy[i] = _xy[i];
} }
quantity = 10; quantity = 10;
card = NULL; card = NULL;
mHasFocus = hasFocus; mHasFocus = hasFocus;
mRelease = false;
mScale = 1.0f;
mTargetScale = 1.0f; mScale = 1.0f;
mTargetScale = 1.0f;
mesh=NEW hgeDistortionMesh(2,2);
mesh->SetTexture(thumb->mTex); mesh=NEW hgeDistortionMesh(2,2);
float x0,y0,w0,h0; mesh->SetTexture(thumb->mTex);
thumb->GetTextureRect(&x0,&y0,&w0,&h0); float x0,y0,w0,h0;
mesh->SetTextureRect(x0,y0,w0,h0); thumb->GetTextureRect(&x0,&y0,&w0,&h0);
mesh->Clear(ARGB(0xFF,0xFF,0xFF,0xFF)); mesh->SetTextureRect(x0,y0,w0,h0);
mesh->SetDisplacement(0, 0, xy[0],xy[1], HGEDISP_NODE); mesh->Clear(ARGB(0xFF,0xFF,0xFF,0xFF));
mesh->SetDisplacement(1, 0, xy[2] - w0,xy[3], HGEDISP_NODE); mesh->SetDisplacement(0, 0, xy[0],xy[1], HGEDISP_NODE);
mesh->SetDisplacement(0, 1,xy[4],xy[5]-h0, HGEDISP_NODE); mesh->SetDisplacement(1, 0, xy[2] - w0,xy[3], HGEDISP_NODE);
mesh->SetDisplacement(1, 1, xy[6]-w0,xy[7]-h0, HGEDISP_NODE); mesh->SetDisplacement(0, 1,xy[4],xy[5]-h0, HGEDISP_NODE);
mesh->SetColor(1,1,ARGB(255,100,100,100)); mesh->SetDisplacement(1, 1, xy[6]-w0,xy[7]-h0, HGEDISP_NODE);
mesh->SetColor(0,1,ARGB(255,100,100,100)); mesh->SetColor(1,1,ARGB(255,100,100,100));
mesh->SetColor(1,0,ARGB(255,100,100,100)); mesh->SetColor(0,1,ARGB(255,100,100,100));
mesh->SetColor(0,0,ARGB(255,200,200,200)); mesh->SetColor(1,0,ARGB(255,100,100,100));
if (hasFocus) mesh->SetColor(0,0,ARGB(255,200,200,200));
Entering(); if (hasFocus)
} Entering();
}
ShopItem::ShopItem(int id, JLBFont *font, int _cardid, float _xy[], bool hasFocus, MTGAllCards * collection, int _price, DeckDataWrapper * ddw): JGuiObject(id), mFont(font), price(_price){
for (int i = 0; i < 8; ++i){ ShopItem::ShopItem(int id, JLBFont *font, int _cardid, float _xy[], bool hasFocus, MTGAllCards * collection, int _price, DeckDataWrapper * ddw): JGuiObject(id), mFont(font), price(_price){
xy[i] = _xy[i]; for (int i = 0; i < 8; ++i){
} xy[i] = _xy[i];
mHasFocus = hasFocus; }
mScale = 1.0f; mHasFocus = hasFocus;
mTargetScale = 1.0f; mRelease = false;
mScale = 1.0f;
if (hasFocus) mTargetScale = 1.0f;
Entering();
if (hasFocus)
card = collection->getCardById(_cardid); Entering();
updateCount(ddw);
card = collection->getCardById(_cardid);
quantity = 1 + (rand() % 4); updateCount(ddw);
if (card->getRarity() == Constants::RARITY_L) quantity = 50;
quad = NULL; quantity = 1 + (rand() % 4);
if (card->getRarity() == Constants::RARITY_L) quantity = 50;
thumb = resources.RetrieveCard(card,CACHE_THUMB); quad = NULL;
if (!thumb) thumb = CardGui::alternateThumbQuad(card); thumb = resources.RetrieveCard(card,RETRIEVE_LOCK,TEXTURE_SUB_THUMB);
if (thumb){ if (!thumb)
mesh=NEW hgeDistortionMesh(2,2); thumb = CardGui::alternateThumbQuad(card);
mesh->SetTexture(thumb->mTex); else
float x0,y0,w0,h0; mRelease = true;
thumb->GetTextureRect(&x0,&y0,&w0,&h0);
mesh->SetTextureRect(x0,y0,w0,h0); if (thumb){
mesh->Clear(ARGB(0xFF,0xFF,0xFF,0xFF)); mesh=NEW hgeDistortionMesh(2,2);
mesh->SetDisplacement(0, 0, xy[0],xy[1], HGEDISP_NODE); mesh->SetTexture(thumb->mTex);
mesh->SetDisplacement(1, 0, xy[2] - w0,xy[3], HGEDISP_NODE); float x0,y0,w0,h0;
mesh->SetDisplacement(0, 1,xy[4],xy[5]-h0, HGEDISP_NODE); thumb->GetTextureRect(&x0,&y0,&w0,&h0);
mesh->SetDisplacement(1, 1, xy[6]-w0,xy[7]-h0, HGEDISP_NODE); mesh->SetTextureRect(x0,y0,w0,h0);
mesh->SetColor(1,1,ARGB(255,100,100,100)); mesh->Clear(ARGB(0xFF,0xFF,0xFF,0xFF));
mesh->SetColor(0,1,ARGB(255,100,100,100)); mesh->SetDisplacement(0, 0, xy[0],xy[1], HGEDISP_NODE);
mesh->SetColor(1,0,ARGB(255,100,100,100)); mesh->SetDisplacement(1, 0, xy[2] - w0,xy[3], HGEDISP_NODE);
mesh->SetColor(0,0,ARGB(255,200,200,200)); mesh->SetDisplacement(0, 1,xy[4],xy[5]-h0, HGEDISP_NODE);
}else{ mesh->SetDisplacement(1, 1, xy[6]-w0,xy[7]-h0, HGEDISP_NODE);
mesh = NULL; mesh->SetColor(1,1,ARGB(255,100,100,100));
} mesh->SetColor(0,1,ARGB(255,100,100,100));
} mesh->SetColor(1,0,ARGB(255,100,100,100));
mesh->SetColor(0,0,ARGB(255,200,200,200));
}else{
int ShopItem::updateCount(DeckDataWrapper * ddw){ mesh = NULL;
if (!card) return 0; }
nameCount = ddw->countByName(card); }
return nameCount;
}
int ShopItem::updateCount(DeckDataWrapper * ddw){
ShopItem::~ShopItem(){ if (!card) return 0;
OutputDebugString("delete shopitem\n"); nameCount = ddw->countByName(card);
SAFE_DELETE(mesh); return nameCount;
} }
const char * ShopItem::getText(){ ShopItem::~ShopItem(){
return mText.c_str(); OutputDebugString("delete shopitem\n");
} if(mRelease){
resources.Release(thumb);
}
void ShopItem::Render(){ SAFE_DELETE(mesh);
if (mHasFocus){ }
mFont->SetColor(ARGB(255,255,255,0));
}else{ const char * ShopItem::getText(){
mFont->SetColor(ARGB(255,255,255,255)); return mText.c_str();
} }
if (!quantity){
mFont->SetColor(ARGB(255,128,128,128));
} void ShopItem::Render(){
if (mHasFocus){
if (card){ mFont->SetColor(ARGB(255,255,255,0));
if (nameCount){ }else{
char buffer[512]; mFont->SetColor(ARGB(255,255,255,255));
sprintf(buffer, "%s (%i)", _(card->name).c_str(), nameCount ); }
mText = buffer; if (!quantity){
}else{ mFont->SetColor(ARGB(255,128,128,128));
mText = _(card->name).c_str(); }
}
} if (card){
if (nameCount){
JRenderer * renderer = JRenderer::GetInstance(); char buffer[512];
//float x0 = mX; sprintf(buffer, "%s (%i)", _(card->name).c_str(), nameCount );
//float y0 = mY - (mScale > 1 ? 4 : 0); mText = buffer;
/* if (GetId()%2){ }else{
float xs[] = {mX, mX, mX+230,mX+230}; mText = _(card->name).c_str();
float ys[] = {mY-5+17,mY-5+19,mY-5+35,mY-5} ; }
}
renderer->FillPolygon(xs,ys,4,ARGB(200,0,0,0));
x0 = mX + 230 -30; JRenderer * renderer = JRenderer::GetInstance();
mFont->DrawString(mText.c_str(), x0, mY + 8,JGETEXT_RIGHT); //float x0 = mX;
//float y0 = mY - (mScale > 1 ? 4 : 0);
}else{ /* if (GetId()%2){
float xs[] = {mX-5, mX-5, mX-5+230,mX-5+230,}; float xs[] = {mX, mX, mX+230,mX+230};
float ys[] = {mY-5,mY-5+35,mY-5+17,mY-5+19} ; float ys[] = {mY-5+17,mY-5+19,mY-5+35,mY-5} ;
renderer->FillPolygon(xs,ys,4,ARGB(128,0,0,0));
mFont->DrawString(mText.c_str(), mX + 30, mY + 8); renderer->FillPolygon(xs,ys,4,ARGB(200,0,0,0));
}*/ x0 = mX + 230 -30;
//renderer->FillRect(mX-5, mY-5,230,35, ); mFont->DrawString(mText.c_str(), x0, mY + 8,JGETEXT_RIGHT);
}else{
if (mesh){ float xs[] = {mX-5, mX-5, mX-5+230,mX-5+230,};
mesh->Render(0,0); float ys[] = {mY-5,mY-5+35,mY-5+17,mY-5+19} ;
//renderer->RenderQuad(thumb,x0,y0,0,mScale * 0.45,mScale * 0.45); renderer->FillPolygon(xs,ys,4,ARGB(128,0,0,0));
}else{ mFont->DrawString(mText.c_str(), mX + 30, mY + 8);
//NOTHING }*/
} //renderer->FillRect(mX-5, mY-5,230,35, );
if (mHasFocus){
if (card) quad = resources.RetrieveCard(card);
if (quad){ if (mesh){
quad->SetColor(ARGB(255,255,255,255)); mesh->Render(0,0);
renderer->RenderQuad(quad,SCREEN_WIDTH - 105,SCREEN_HEIGHT/2 - 5,0, 0.9f,0.9f); //renderer->RenderQuad(thumb,x0,y0,0,mScale * 0.45,mScale * 0.45);
}else{ }else{
if (card) CardGui::alternateRender(card,Pos(SCREEN_WIDTH - 105,SCREEN_HEIGHT/2 - 5,0.9f* 285/250, 0,255)); //NOTHING
}
} if (mHasFocus){
mFont->DrawString(mText.c_str(), SCREEN_WIDTH/2 - 50, SCREEN_HEIGHT - 16,JGETEXT_CENTER); if (card) quad = resources.RetrieveCard(card);
} if (quad){
} quad->SetColor(ARGB(255,255,255,255));
renderer->RenderQuad(quad,SCREEN_WIDTH - 105,SCREEN_HEIGHT/2 - 5,0, 0.9f,0.9f);
void ShopItem::Update(float dt) }else{
{ if (card) CardGui::alternateRender(card,Pos(SCREEN_WIDTH - 105,SCREEN_HEIGHT/2 - 5,0.9f* 285/250, 0,255));
if (mScale < mTargetScale){
mScale += 8.0f*dt; }
if (mScale > mTargetScale) mFont->DrawString(mText.c_str(), SCREEN_WIDTH/2 - 50, SCREEN_HEIGHT - 16,JGETEXT_CENTER);
mScale = mTargetScale; }
}else if (mScale > mTargetScale){ }
mScale -= 8.0f*dt;
if (mScale < mTargetScale) void ShopItem::Update(float dt)
mScale = mTargetScale; {
} if (mScale < mTargetScale){
} mScale += 8.0f*dt;
if (mScale > mTargetScale)
mScale = mTargetScale;
}else if (mScale > mTargetScale){
mScale -= 8.0f*dt;
void ShopItem::Entering() if (mScale < mTargetScale)
{ mScale = mTargetScale;
for (int i = 0; i < 2; ++i){ }
for (int j = 0; j < 2; ++j){ }
mesh->SetColor(i,j,ARGB(255,255,255,255));
}
}
void ShopItem::Entering()
mHasFocus = true; {
mTargetScale = 1.2f; for (int i = 0; i < 2; ++i){
} for (int j = 0; j < 2; ++j){
mesh->SetColor(i,j,ARGB(255,255,255,255));
}
bool ShopItem::Leaving(u32 key) }
{
mesh->SetColor(1,1,ARGB(255,100,100,100));
mesh->SetColor(0,1,ARGB(255,100,100,100)); mHasFocus = true;
mesh->SetColor(1,0,ARGB(255,100,100,100)); mTargetScale = 1.2f;
mesh->SetColor(0,0,ARGB(255,200,200,200)); }
mHasFocus = false;
mTargetScale = 1.0f; bool ShopItem::Leaving(u32 key)
return true; {
} mesh->SetColor(1,1,ARGB(255,100,100,100));
mesh->SetColor(0,1,ARGB(255,100,100,100));
mesh->SetColor(1,0,ARGB(255,100,100,100));
bool ShopItem::ButtonPressed() mesh->SetColor(0,0,ARGB(255,200,200,200));
{
return (quantity >0); mHasFocus = false;
} mTargetScale = 1.0f;
return true;
}
ShopItems::ShopItems(int id, JGuiListener* listener, JLBFont* font, int x, int y, MTGAllCards * _collection, int _setIds[]): JGuiController(id, listener), mX(x), mY(y), mFont(font), collection(_collection){
mHeight = 0;
showPriceDialog = -1; bool ShopItem::ButtonPressed()
dialog = NULL; {
pricelist = NEW PriceList(RESPATH"/settings/prices.dat",_collection); return (quantity >0);
playerdata = NEW PlayerData(_collection); }
display = NULL;
for (int i=0; i < SHOP_BOOSTERS; i++){
setIds[i] = _setIds[i]; ShopItems::ShopItems(int id, JGuiListener* listener, JLBFont* font, int x, int y, MTGAllCards * _collection, int _setIds[]): JGuiController(id, listener), mX(x), mY(y), mFont(font), collection(_collection){
}; mHeight = 0;
myCollection = NEW DeckDataWrapper(NEW MTGDeck(options.profileFile(PLAYER_COLLECTION).c_str(), _collection)); showPriceDialog = -1;
showCardList = true; dialog = NULL;
} pricelist = NEW PriceList(RESPATH"/settings/prices.dat",_collection);
playerdata = NEW PlayerData(_collection);
display = NULL;
for (int i=0; i < SHOP_BOOSTERS; i++){
void ShopItems::Add(int cardid){ setIds[i] = _setIds[i];
int rnd = (rand() % 20); };
int price = pricelist->getPrice(cardid); myCollection = NEW DeckDataWrapper(NEW MTGDeck(options.profileFile(PLAYER_COLLECTION).c_str(), _collection));
price = price + price * (rnd -10)/100; showCardList = true;
float xy[] = {_x1[mCount],_y1[mCount],_x2[mCount],_y2[mCount],_x3[mCount],_y3[mCount],_x4[mCount],_y4[mCount]}; }
JGuiController::Add(NEW ShopItem(mCount, mFont, cardid, xy, (mCount == 0),collection, price,myCollection));
mHeight += 22;
}
void ShopItems::Add(int cardid){
void ShopItems::Add(char * text, JQuad * quad,JQuad * thumb, int price){ int rnd = (rand() % 20);
float xy[] = {_x1[mCount],_y1[mCount],_x2[mCount],_y2[mCount],_x3[mCount],_y3[mCount],_x4[mCount],_y4[mCount]}; int price = pricelist->getPrice(cardid);
JGuiController::Add(NEW ShopItem(mCount, mFont, text, quad, thumb, xy, (mCount == 0), price)); price = price + price * (rnd -10)/100;
mHeight += 22; float xy[] = {_x1[mCount],_y1[mCount],_x2[mCount],_y2[mCount],_x3[mCount],_y3[mCount],_x4[mCount],_y4[mCount]};
} JGuiController::Add(NEW ShopItem(mCount, mFont, cardid, xy, (mCount == 0),collection, price,myCollection));
mHeight += 22;
void ShopItems::Update(float dt){ }
if (display){
while (u32 key = JGE::GetInstance()->ReadButton()) display->CheckUserInput(key); void ShopItems::Add(char * text, JQuad * quad,JQuad * thumb, int price){
if (display) display->Update(dt); float xy[] = {_x1[mCount],_y1[mCount],_x2[mCount],_y2[mCount],_x3[mCount],_y3[mCount],_x4[mCount],_y4[mCount]};
}else{ JGuiController::Add(NEW ShopItem(mCount, mFont, text, quad, thumb, xy, (mCount == 0), price));
if (showPriceDialog!=-1){ mHeight += 22;
ShopItem * item = ((ShopItem *)mObjects[showPriceDialog]); }
int price = item->price;
char buffer[4096]; void ShopItems::Update(float dt){
sprintf(buffer,"%s : %i credits",item->getText(),price); if (display){
if(!dialog){ while (u32 key = JGE::GetInstance()->ReadButton()) display->CheckUserInput(key);
dialog = NEW SimpleMenu(1,this,resources.GetJLBFont(Constants::MENU_FONT),SCREEN_WIDTH-300,SCREEN_HEIGHT/2,buffer); if (display) display->Update(dt);
dialog->Add(1,"Yes"); }else{
dialog->Add(2,"No"); if (showPriceDialog!=-1){
} ShopItem * item = ((ShopItem *)mObjects[showPriceDialog]);
else{ int price = item->price;
dialog->Update(dt); char buffer[4096];
} sprintf(buffer,"%s : %i credits",item->getText(),price);
}else{ if(!dialog){
u32 buttons[] = {PSP_CTRL_LEFT,PSP_CTRL_DOWN,PSP_CTRL_RIGHT,PSP_CTRL_UP,PSP_CTRL_CIRCLE}; dialog = NEW SimpleMenu(1,this,resources.GetJLBFont(Constants::MENU_FONT),SCREEN_WIDTH-300,SCREEN_HEIGHT/2,buffer);
for (int i = 0; i < 5; ++i){ dialog->Add(1,"Yes");
if (JGE::GetInstance()->GetButtonClick(buttons[i])){ dialog->Add(2,"No");
showCardList = false; }
} else{
} dialog->Update(dt);
if (JGE::GetInstance()->GetButtonClick(PSP_CTRL_TRIANGLE)){ }
showCardList = !showCardList; }else{
} u32 buttons[] = {PSP_CTRL_LEFT,PSP_CTRL_DOWN,PSP_CTRL_RIGHT,PSP_CTRL_UP,PSP_CTRL_CIRCLE};
SAFE_DELETE(dialog); for (int i = 0; i < 5; ++i){
JGuiController::Update(dt); if (JGE::GetInstance()->GetButtonClick(buttons[i])){
} showCardList = false;
}
} }
if (JGE::GetInstance()->GetButtonClick(PSP_CTRL_TRIANGLE)){
} showCardList = !showCardList;
}
SAFE_DELETE(dialog);
void ShopItems::Render(){ JGuiController::Update(dt);
JGuiController::Render(); }
if (showPriceDialog==-1){
}
}else{
if(dialog){ }
dialog->Render();
}
} void ShopItems::Render(){
char credits[512]; JGuiController::Render();
sprintf(credits,_("credits: %i").c_str(), playerdata->credits); if (showPriceDialog==-1){
mFont->SetColor(ARGB(200,0,0,0));
mFont->DrawString(credits, 5, SCREEN_HEIGHT - 13); }else{
mFont->SetColor(ARGB(255,255,255,255)); if(dialog){
mFont->DrawString(credits, 5, SCREEN_HEIGHT - 15); dialog->Render();
if (display) display->Render(); }
}
if (showCardList){ char credits[512];
JRenderer * r = JRenderer::GetInstance(); sprintf(credits,_("credits: %i").c_str(), playerdata->credits);
r->FillRoundRect(290,5, 160, mCount * 20 + 15,5,ARGB(200,0,0,0)); mFont->SetColor(ARGB(200,0,0,0));
mFont->DrawString(credits, 5, SCREEN_HEIGHT - 13);
for (int i = 0; i< mCount; ++i){ mFont->SetColor(ARGB(255,255,255,255));
if (!mObjects[i]) continue; mFont->DrawString(credits, 5, SCREEN_HEIGHT - 15);
ShopItem * s = (ShopItem *)(mObjects[i]); if (display) display->Render();
if (i == mCurr) mFont->SetColor(ARGB(255,255,255,0));
else mFont->SetColor(ARGB(255,255,255,255)); if (showCardList){
char buffer[512]; JRenderer * r = JRenderer::GetInstance();
sprintf(buffer, "%s", s->getText()); r->FillRoundRect(290,5, 160, mCount * 20 + 15,5,ARGB(200,0,0,0));
float x = 300;
float y = 10 + 20*i; for (int i = 0; i< mCount; ++i){
mFont->DrawString(buffer,x,y); if (!mObjects[i]) continue;
} ShopItem * s = (ShopItem *)(mObjects[i]);
} if (i == mCurr) mFont->SetColor(ARGB(255,255,255,0));
} else mFont->SetColor(ARGB(255,255,255,255));
char buffer[512];
void ShopItems::pricedialog(int id, int mode){ sprintf(buffer, "%s", s->getText());
if (mode){ float x = 300;
showPriceDialog = id; float y = 10 + 20*i;
}else{ mFont->DrawString(buffer,x,y);
showPriceDialog = -1; }
} }
} }
void ShopItems::ButtonPressed(int controllerId, int controlId){ void ShopItems::pricedialog(int id, int mode){
if (controllerId == 12){ if (mode){
safeDeleteDisplay(); showPriceDialog = id;
return; }else{
} showPriceDialog = -1;
}
ShopItem * item = ((ShopItem *)mObjects[showPriceDialog]); }
int price = item->price;
switch(controlId){ void ShopItems::ButtonPressed(int controllerId, int controlId){
case 1: if (controllerId == 12){
if (playerdata->credits >= price){ safeDeleteDisplay();
playerdata->credits -= price; return;
if (item->card){ }
int rnd = (rand() % 25);
price = price + (rnd * price)/100; ShopItem * item = ((ShopItem *)mObjects[showPriceDialog]);
pricelist->setPrice(item->card->getMTGId(),price); int price = item->price;
playerdata->collection->add(item->card); switch(controlId){
item->quantity--; case 1:
myCollection->Add(item->card); if (playerdata->credits >= price){
item->nameCount++; playerdata->credits -= price;
item->price = price; if (item->card){
}else{ int rnd = (rand() % 25);
safeDeleteDisplay(); price = price + (rnd * price)/100;
display = NEW CardDisplay(12,NULL, SCREEN_WIDTH - 200, SCREEN_HEIGHT/2,this,NULL,5); pricelist->setPrice(item->card->getMTGId(),price);
playerdata->collection->add(item->card);
MTGDeck * tempDeck = NEW MTGDeck(playerdata->collection->database); item->quantity--;
int rare_or_mythic = Constants::RARITY_R; myCollection->Add(item->card);
int rnd = rand() % 8; item->nameCount++;
if (rnd == 0) rare_or_mythic = Constants::RARITY_M; item->price = price;
int sets[] = {setIds[showPriceDialog]}; }else{
safeDeleteDisplay();
tempDeck->addRandomCards(1, sets,1,rare_or_mythic); display = NEW CardDisplay(12,NULL, SCREEN_WIDTH - 200, SCREEN_HEIGHT/2,this,NULL,5);
tempDeck->addRandomCards(3, sets,1,Constants::RARITY_U);
tempDeck->addRandomCards(11, sets,1,Constants::RARITY_C); MTGDeck * tempDeck = NEW MTGDeck(playerdata->collection->database);
int rare_or_mythic = Constants::RARITY_R;
//Check for duplicates. Does not guarentee none, just makes them extremely unlikely. int rnd = rand() % 8;
//Code is kind of inefficient, but shouldn't be used often enough to matter. if (rnd == 0) rare_or_mythic = Constants::RARITY_M;
int loops=0; int sets[] = {setIds[showPriceDialog]};
for(map<int,int>::iterator it = tempDeck->cards.begin();it!= tempDeck->cards.end() && loops < 15;it++,loops++){
int dupes = it->second - 1; tempDeck->addRandomCards(1, sets,1,rare_or_mythic);
if(dupes <= 0) tempDeck->addRandomCards(3, sets,1,Constants::RARITY_U);
continue; tempDeck->addRandomCards(11, sets,1,Constants::RARITY_C);
for(int x=0;x<dupes;x++) //Check for duplicates. Does not guarentee none, just makes them extremely unlikely.
tempDeck->remove(it->first); //Code is kind of inefficient, but shouldn't be used often enough to matter.
int loops=0;
int rarity = (int) tempDeck->database->getCardById(it->first)->getRarity(); for(map<int,int>::iterator it = tempDeck->cards.begin();it!= tempDeck->cards.end() && loops < 15;it++,loops++){
tempDeck->addRandomCards(dupes,&rarity); int dupes = it->second - 1;
it = tempDeck->cards.begin(); if(dupes <= 0)
} continue;
playerdata->collection->add(tempDeck); for(int x=0;x<dupes;x++)
myCollection->Add(tempDeck); tempDeck->remove(it->first);
for (int j = 0; j < mCount; j++){ int rarity = (int) tempDeck->database->getCardById(it->first)->getRarity();
ShopItem * si = ((ShopItem *)mObjects[j]); tempDeck->addRandomCards(dupes,&rarity);
si->updateCount(myCollection); it = tempDeck->cards.begin();
} }
int i = 0; playerdata->collection->add(tempDeck);
for (map<int,int>::iterator it = tempDeck->cards.begin(); it!=tempDeck->cards.end(); it++){ myCollection->Add(tempDeck);
MTGCard * c = tempDeck->getCardById(it->first);
for (int j = 0; j < it->second; j++){ for (int j = 0; j < mCount; j++){
MTGCardInstance * card = NEW MTGCardInstance(c, NULL); ShopItem * si = ((ShopItem *)mObjects[j]);
displayCards[i] = card; si->updateCount(myCollection);
display->AddCard(card); }
i++;
} int i = 0;
} for (map<int,int>::iterator it = tempDeck->cards.begin(); it!=tempDeck->cards.end(); it++){
delete tempDeck; MTGCard * c = tempDeck->getCardById(it->first);
} for (int j = 0; j < it->second; j++){
showPriceDialog = -1; MTGCardInstance * card = NEW MTGCardInstance(c, NULL);
}else{ displayCards[i] = card;
//error not enough money display->AddCard(card);
} i++;
break; }
case 2: }
if (item->card){ delete tempDeck;
int rnd = (rand() % 25); }
price = price - (rnd * price)/100; showPriceDialog = -1;
pricelist->setPrice(item->card->getMTGId(),price); }else{
} //error not enough money
showPriceDialog = -1; }
break; break;
} case 2:
} if (item->card){
int rnd = (rand() % 25);
price = price - (rnd * price)/100;
void ShopItems::safeDeleteDisplay(){ pricelist->setPrice(item->card->getMTGId(),price);
if (!display) return; }
for (int i = 0; i < display->mCount; i++){ showPriceDialog = -1;
delete displayCards[i]; break;
} }
SAFE_DELETE(display); }
}
void ShopItems::saveAll(){ void ShopItems::safeDeleteDisplay(){
savePriceList(); if (!display) return;
playerdata->save(); for (int i = 0; i < display->mCount; i++){
} delete displayCards[i];
}
void ShopItems::savePriceList(){ SAFE_DELETE(display);
pricelist->save(); }
}
void ShopItems::saveAll(){
ShopItems::~ShopItems(){ savePriceList();
SAFE_DELETE(pricelist); playerdata->save();
SAFE_DELETE(playerdata); }
SAFE_DELETE(dialog);
safeDeleteDisplay(); void ShopItems::savePriceList(){
SAFE_DELETE(myCollection); pricelist->save();
} }
ostream& ShopItem::toString(ostream& out) const ShopItems::~ShopItems(){
{ SAFE_DELETE(pricelist);
return out << "ShopItem ::: mHasFocus : " << mHasFocus SAFE_DELETE(playerdata);
<< " ; mFont : " << mFont SAFE_DELETE(dialog);
<< " ; mText : " << mText safeDeleteDisplay();
<< " ; quad : " << quad SAFE_DELETE(myCollection);
<< " ; thumb : " << thumb }
<< " ; mScale : " << mScale
<< " ; mTargetScale : " << mTargetScale ostream& ShopItem::toString(ostream& out) const
<< " ; nameCount : " << nameCount {
<< " ; quantity : " << quantity return out << "ShopItem ::: mHasFocus : " << mHasFocus
<< " ; card : " << card << " ; mFont : " << mFont
<< " ; price : " << price; << " ; mText : " << mText
} << " ; quad : " << quad
<< " ; thumb : " << thumb
<< " ; mScale : " << mScale
<< " ; mTargetScale : " << mTargetScale
<< " ; nameCount : " << nameCount
<< " ; quantity : " << quantity
<< " ; card : " << card
<< " ; price : " << price;
}
projects/mtg/src/TestSuiteAI.cpp
+1 -1
View File
@@ -15,7 +15,7 @@ TestSuiteAI::TestSuiteAI(TestSuite * _suite, int playerId):AIPlayer(_suite->buil
mAvatarTex = resources.RetrieveTexture("baka.jpg",RETRIEVE_VRAM,TEXTURE_SUB_AVATAR); mAvatarTex = resources.RetrieveTexture("baka.jpg",RETRIEVE_VRAM,TEXTURE_SUB_AVATAR);
if(mAvatarTex) if(mAvatarTex)
mAvatar = resources.RetrieveQuad("baka.jpg", 0, 0, 35, 50,"bakaAvatar",RETRIEVE_NORMAL,TEXTURE_SUB_AVATAR); mAvatar = resources.RetrieveQuad("baka.jpg", 0, 0, 35, 50,"bakaAvatar",RETRIEVE_VRAM,TEXTURE_SUB_AVATAR);
else else
mAvatar = NULL; mAvatar = NULL;
projects/mtg/src/WCachedResource.cpp
+134 -36
View File
@@ -9,8 +9,10 @@
#include "../include/GameOptions.h" #include "../include/GameOptions.h"
#include "../include/WResourceManager.h" #include "../include/WResourceManager.h"
//WResource //WResource
WResource::~WResource(){ WResource::~WResource(){
OutputDebugString("~WResource()\n");
return; return;
} }
WResource::WResource(){ WResource::WResource(){
@@ -40,8 +42,17 @@ void WResource::lock(){
void WResource::unlock(bool force){ void WResource::unlock(bool force){
if(force) if(force)
locks = 0; locks = 0;
else if(locks > WRES_UNLOCKED && locks <= WRES_MAX_LOCK) else if(locks > WRES_UNLOCKED){
locks--; if(locks <= WRES_MAX_LOCK)
locks--;
}
else
#ifdef DEBUG_CACHE
locks = WRES_UNDERLOCKED;
#else
locks = 0;
#endif
} }
void WResource::hit(){ void WResource::hit(){
@@ -66,12 +77,12 @@ WCachedTexture::~WCachedTexture(){
if(!trackedQuads.size()) if(!trackedQuads.size())
return; return;
map<JQuad*,string>::iterator it, nit; vector<WTrackedQuad*>::iterator it;
WTrackedQuad * tq = NULL;
for(it=trackedQuads.begin();it!=trackedQuads.end();it=nit){ for(it=trackedQuads.begin();it!=trackedQuads.end();it++){
nit = it; tq = (*it);
nit++; SAFE_DELETE(tq);
trackedQuads.erase(it);
} }
trackedQuads.clear(); trackedQuads.clear();
} }
@@ -79,29 +90,57 @@ WCachedTexture::~WCachedTexture(){
JTexture * WCachedTexture::Actual(){ JTexture * WCachedTexture::Actual(){
return texture; return texture;
} }
bool WCachedTexture::isLocked(){
if(locks != WRES_UNLOCKED)
return true;
for(vector<WTrackedQuad*>::iterator it=trackedQuads.begin();it!=trackedQuads.end();it++){
if((*it)->isLocked())
return true;
}
return false;
}
bool WCachedTexture::ReleaseQuad(JQuad* quad){ bool WCachedTexture::ReleaseQuad(JQuad* quad){
#ifdef DEBUG_CACHE #ifdef DEBUG_CACHE
OutputDebugString("Quad released.\n"); char buf[512];
#endif
for(map<JQuad*,string>::iterator i = trackedQuads.begin();i!=trackedQuads.end();i++){ sprintf(buf,"ReleaseQuad: %d.\n", (int) quad);
if(i->first == quad ){ OutputDebugString(buf);
unlock(); #endif
trackedQuads.erase(i); if(quad == NULL)
return true; return false;
WTrackedQuad * tq = NULL;
vector<WTrackedQuad*>::iterator nit;
for(vector<WTrackedQuad*>::iterator it = trackedQuads.begin();it!=trackedQuads.end();it=nit){
nit = it;
nit++;
if((*it) && (*it)->quad == quad ){
tq = (*it);
tq->unlock();
if(!tq->isLocked()){
SAFE_DELETE(tq);
trackedQuads.erase(it);
}
return true; //Returns true when found.
} }
} }
return false; return false;
} }
JQuad * WCachedTexture::GetQuad(float offX, float offY, float width, float height,string resname){ WTrackedQuad * WCachedTexture::GetTrackedQuad(float offX, float offY, float width, float height,string resname){
if(texture == NULL) if(texture == NULL)
return NULL; return NULL;
JQuad * jq = NULL; bool allocated = false;
WTrackedQuad * tq = NULL;
JQuad * quad = NULL;
map<JQuad*,string>::iterator it; vector<WTrackedQuad*>::iterator it;
std::transform(resname.begin(),resname.end(),resname.begin(),::tolower); std::transform(resname.begin(),resname.end(),resname.begin(),::tolower);
if(width == 0.0f || width > texture->mWidth) if(width == 0.0f || width > texture->mWidth)
@@ -109,40 +148,67 @@ JQuad * WCachedTexture::GetQuad(float offX, float offY, float width, float heigh
if(height == 0.0f || height > texture->mHeight) if(height == 0.0f || height > texture->mHeight)
height = texture->mHeight; height = texture->mHeight;
for(it = trackedQuads.begin();it!=trackedQuads.end();it++){ for(it = trackedQuads.begin();it!=trackedQuads.end();it++){
if(it->second == resname){ if((*it) && (*it)->resname == resname){
jq = it->first; tq = (*it);
break;
} }
} }
if(jq == NULL){ if(tq == NULL){
jq = NEW JQuad(texture,offX,offY,width,height); allocated = true;
if(!jq) { tq = NEW WTrackedQuad(resname);
}
if(tq == NULL)
return NULL;
quad = tq->quad;
if(quad == NULL){
quad = NEW JQuad(texture,offX,offY,width,height);
if(!quad) {
//Probably out of memory. Try again. //Probably out of memory. Try again.
resources.Cleanup(); resources.Cleanup();
jq = NEW JQuad(texture,offX,offY,width,height); quad = NEW JQuad(texture,offX,offY,width,height);
} }
if(!jq) if(!quad){
if(allocated && tq)
SAFE_DELETE(tq);
return NULL; //Probably a crash. return NULL; //Probably a crash.
}
trackedQuads[jq] = resname; tq->quad = quad;
return jq; trackedQuads.push_back(tq);
}else{ return tq;
}
else{
//Update JQ's values to what we called this with. //Update JQ's values to what we called this with.
jq->SetTextureRect(offX,offY,width,height); quad->SetTextureRect(offX,offY,width,height);
return jq; return tq;
} }
return NULL; return NULL;
} }
JQuad * WCachedTexture::GetQuad(float offX, float offY, float width, float height,string resname){
WTrackedQuad * tq = GetTrackedQuad(offX,offY,width,height,resname);
if(tq)
return tq->quad;
return NULL;
}
JQuad * WCachedTexture::GetQuad(string resname){ JQuad * WCachedTexture::GetQuad(string resname){
map<JQuad*,string>::iterator it; vector<WTrackedQuad*>::iterator it;
std::transform(resname.begin(),resname.end(),resname.begin(),::tolower); std::transform(resname.begin(),resname.end(),resname.begin(),::tolower);
for(it = trackedQuads.begin();it!=trackedQuads.end();it++){ for(it = trackedQuads.begin();it!=trackedQuads.end();it++){
if(it->second == resname){ if((*it) && (*it)->resname == resname){
return it->first; return (*it)->quad;
} }
} }
@@ -181,9 +247,9 @@ void WCachedTexture::Refresh(string filename){
else else
SAFE_DELETE(old); SAFE_DELETE(old);
for(map<JQuad*,string>::iterator it=trackedQuads.begin();it!=trackedQuads.end();it++){ for(vector<WTrackedQuad*>::iterator it=trackedQuads.begin();it!=trackedQuads.end();it++){
if(it->first) if((*it) && (*it)->quad)
it->first->mTex = texture; (*it)->quad->mTex = texture;
} }
} }
@@ -385,3 +451,35 @@ void WCachedParticles::Nullify(){
if(particles) if(particles)
particles = NULL; particles = NULL;
} }
//WTrackedQuad
void WTrackedQuad::Nullify() {
quad = NULL;
}
#if defined DEBUG_CACHE
int WTrackedQuad::totalTracked = 0;
#endif
unsigned long WTrackedQuad::size() {
return sizeof(JQuad);
}
bool WTrackedQuad::isGood(){
return (quad != NULL);
}
WTrackedQuad::WTrackedQuad(string _resname) {
#if defined DEBUG_CACHE
OutputDebugString("WTrackedQuad().\n");
totalTracked++;
#endif
quad = NULL; resname = _resname;
}
WTrackedQuad::~WTrackedQuad() {
#if defined DEBUG_CACHE
char buf[512];
totalTracked--;
sprintf(buf,"~WTrackedQuad() {%d}. %d left.\n", (int) quad,totalTracked);
OutputDebugString(buf);
#endif
if(quad) SAFE_DELETE(quad);
}
projects/mtg/src/WResourceManager.cpp
+103 -60
View File
@@ -41,9 +41,9 @@ void WResourceManager::DebugRender(){
if(textureWCache.totalSize > textureWCache.cacheSize) if(textureWCache.totalSize > textureWCache.cacheSize)
man = textureWCache.totalSize - textureWCache.cacheSize; man = textureWCache.totalSize - textureWCache.cacheSize;
sprintf(buf,"Textures %u+%u (of %u) items (%u misses), Pixels: %lu+%lu (of %lu)", sprintf(buf,"Textures %u+%u (of %u) items (%u misses), Pixels: %lu (of %lu) + %lu",
textureWCache.cacheItems, textureWCache.managed.size(),textureWCache.maxCached, textureWCache.cacheItems, textureWCache.managed.size(),textureWCache.maxCached,
misses,textureWCache.cacheSize,man,textureWCache.maxCacheSize); misses,textureWCache.cacheSize,textureWCache.maxCacheSize,man);
font->DrawString(buf, 10,5); font->DrawString(buf, 10,5);
@@ -54,6 +54,7 @@ void WResourceManager::DebugRender(){
#ifdef DEBUG_CACHE #ifdef DEBUG_CACHE
if(debugMessage.size()) if(debugMessage.size())
font->DrawString(debugMessage.c_str(), SCREEN_WIDTH-10,SCREEN_HEIGHT-25,JGETEXT_RIGHT); font->DrawString(debugMessage.c_str(), SCREEN_WIDTH-10,SCREEN_HEIGHT-25,JGETEXT_RIGHT);
#endif #endif
} }
@@ -154,13 +155,19 @@ WResourceManager::WResourceManager(){
mFontMap.clear(); mFontMap.clear();
psiWCache.Resize(SMALL_CACHE_LIMIT,6); //Plenty of room for mana symbols, or whatever. psiWCache.Resize(SMALL_CACHE_LIMIT,6); //Plenty of room for mana symbols, or whatever.
sampleWCache.Resize(SMALL_CACHE_LIMIT,0); //This guy only exists so we can track misses. sampleWCache.Resize(SMALL_CACHE_LIMIT,MAX_CACHED_SAMPLES);
textureWCache.Resize(LARGE_CACHE_LIMIT,MAX_CACHE_OBJECTS); textureWCache.Resize(LARGE_CACHE_LIMIT,MAX_CACHE_OBJECTS);
lastTime = 0; lastTime = 0;
} }
WResourceManager::~WResourceManager(){ WResourceManager::~WResourceManager(){
LOG("==Destroying WResourceManager=="); LOG("==Destroying WResourceManager==");
RemoveAll(); RemoveAll();
for(vector<WManagedQuad*>::iterator it=managedQuads.begin();it!=managedQuads.end();it++){
WManagedQuad* wm = *it;
SAFE_DELETE(wm);
}
managedQuads.clear();
LOG("==Successfully Destroyed WResourceManager=="); LOG("==Successfully Destroyed WResourceManager==");
} }
@@ -172,23 +179,13 @@ JQuad * WResourceManager::RetrieveCard(MTGCard * card, int style, int submode){
string filename = card->getSetName(); string filename = card->getSetName();
filename += "/"; filename += "/";
filename += card->getImageName(); filename += card->getImageName();
WCachedTexture * res = NULL; JQuad * jq = RetrieveQuad(filename,0,0,0,0,filename,style,submode|TEXTURE_SUB_5551);
//Aliases. if(jq){
if(style == RETRIEVE_VRAM){ jq->SetHotSpot(jq->mTex->mWidth / 2, jq->mTex->mHeight / 2);
submode = submode | TEXTURE_SUB_VRAM; return jq;
style = RETRIEVE_LOCK;
}
else if(style == RETRIEVE_THUMB){
submode = submode | TEXTURE_SUB_THUMB;
style = RETRIEVE_NORMAL;
} }
res = textureWCache.Retrieve(filename,style,submode|TEXTURE_SUB_5551); //Force RGBA5650. JPG doesn't support transparency anyways.
if(res) //A non-null result will always be good.
return res->GetCard();
return NULL; return NULL;
} }
@@ -199,10 +196,10 @@ int WResourceManager::CreateQuad(const string &quadName, const string &textureNa
string resname = quadName; string resname = quadName;
std::transform(resname.begin(),resname.end(),resname.begin(),::tolower); std::transform(resname.begin(),resname.end(),resname.begin(),::tolower);
vector<WManagedQuad>::iterator it; vector<WManagedQuad*>::iterator it;
int pos = 0; int pos = 0;
for(it = managedQuads.begin();it!=managedQuads.end();it++,pos++){ for(it = managedQuads.begin();it!=managedQuads.end();it++,pos++){
if(it->resname == resname) if((*it)->resname == resname)
return pos; return pos;
} }
@@ -213,12 +210,14 @@ int WResourceManager::CreateQuad(const string &quadName, const string &textureNa
return INVALID_ID; return INVALID_ID;
if(jtex){ if(jtex){
JQuad * jq = jtex->GetQuad(x,y,width,height,quadName); WTrackedQuad * tq = jtex->GetTrackedQuad(x,y,width,height,quadName);
if(jq){ if(tq){
WManagedQuad mq; tq->deadbolt();
mq.resname = resname; WManagedQuad * mq;
mq.texture = jtex; mq = NEW WManagedQuad();
mq->resname = resname;
mq->texture = jtex;
managedQuads.push_back(mq); managedQuads.push_back(mq);
} }
@@ -232,9 +231,9 @@ JQuad * WResourceManager::GetQuad(const string &quadName){
string lookup = quadName; string lookup = quadName;
std::transform(lookup.begin(),lookup.end(),lookup.begin(),::tolower); std::transform(lookup.begin(),lookup.end(),lookup.begin(),::tolower);
for(vector<WManagedQuad>::iterator it=managedQuads.begin();it!=managedQuads.end();it++){ for(vector<WManagedQuad*>::iterator it=managedQuads.begin();it!=managedQuads.end();it++){
if(it->resname == lookup) if((*it)->resname == lookup)
return it->texture->GetQuad(lookup); return (*it)->texture->GetQuad(lookup);
} }
return NULL; return NULL;
@@ -244,11 +243,11 @@ JQuad * WResourceManager::GetQuad(int id){
if(id < 0 || id >= (int) managedQuads.size()) if(id < 0 || id >= (int) managedQuads.size())
return NULL; return NULL;
WCachedTexture * jtex = managedQuads[id].texture; WCachedTexture * jtex = managedQuads[id]->texture;
if(!jtex) if(!jtex)
return NULL; return NULL;
return jtex->GetQuad(managedQuads[id].resname); return jtex->GetQuad(managedQuads[id]->resname);
} }
JQuad * WResourceManager::RetrieveTempQuad(string filename){ JQuad * WResourceManager::RetrieveTempQuad(string filename){
@@ -265,12 +264,28 @@ JQuad * WResourceManager::RetrieveQuad(string filename, float offX, float offY,
return jq; return jq;
} }
//Aliases.
if(style == RETRIEVE_VRAM){
submode = submode | TEXTURE_SUB_VRAM;
style = RETRIEVE_LOCK;
}
else if(style == RETRIEVE_THUMB){
submode = submode | TEXTURE_SUB_THUMB;
style = RETRIEVE_NORMAL;
}
//Resname defaults to filename. //Resname defaults to filename.
if(!resname.size()) if(!resname.size())
resname = filename; resname = filename;
//No quad, but we have a managed texture for this! //No quad, but we have a managed texture for this!
WCachedTexture * jtex = textureWCache.Retrieve(filename,style,submode); WCachedTexture * jtex = NULL;
if(style == RETRIEVE_MANAGE)
jtex = textureWCache.Retrieve(filename,RETRIEVE_MANAGE,submode);
else if(style == RETRIEVE_EXISTING)
jtex = textureWCache.Retrieve(filename,RETRIEVE_EXISTING,submode);
else
jtex = textureWCache.Retrieve(filename,RETRIEVE_NORMAL,submode);
//Somehow, jtex wasn't promoted. //Somehow, jtex wasn't promoted.
if(style == RETRIEVE_MANAGE && jtex && !jtex->isPermanent()) if(style == RETRIEVE_MANAGE && jtex && !jtex->isPermanent())
@@ -278,16 +293,26 @@ JQuad * WResourceManager::RetrieveQuad(string filename, float offX, float offY,
//Make this quad, overwriting any similarly resname'd quads. //Make this quad, overwriting any similarly resname'd quads.
if(jtex){ if(jtex){
jq = jtex->GetQuad(offX,offY,width,height,resname); WTrackedQuad * tq = jtex->GetTrackedQuad(offX,offY,width,height,resname);
if(tq == NULL)
return NULL;
if(style == RETRIEVE_MANAGE && resname != ""){ if(style == RETRIEVE_MANAGE && resname != ""){
WManagedQuad mq; WManagedQuad * mq = NEW WManagedQuad();
mq.resname = resname; mq->resname = resname;
mq.texture = jtex; mq->texture = jtex;
managedQuads.push_back(mq); managedQuads.push_back(mq);
} }
return jq; if(style == RETRIEVE_LOCK)
tq->lock();
else if(style == RETRIEVE_UNLOCK)
tq->unlock();
else if(style == RETRIEVE_MANAGE)
tq->deadbolt();
return tq->quad;
} }
//Texture doesn't exist, so no quad. //Texture doesn't exist, so no quad.
@@ -310,8 +335,9 @@ void WResourceManager::Release(JQuad * quad){
break; break;
} }
if(it != textureWCache.cache.end() && it->second) //Releasing a quad doesn't release the associated texture-- it might be needed later.
textureWCache.RemoveItem(it->second,false); //won't remove locked. //if(it != textureWCache.cache.end() && it->second)
// textureWCache.RemoveItem(it->second,false); //won't remove locked.
} }
void WResourceManager::ClearMisses(){ void WResourceManager::ClearMisses(){
@@ -444,6 +470,7 @@ hgeParticleSystemInfo * WResourceManager::RetrievePSI(string filename, JQuad * t
JSample * WResourceManager::RetrieveSample(string filename, int style, int submode){ JSample * WResourceManager::RetrieveSample(string filename, int style, int submode){
//Check cache. This just tracks misses. //Check cache. This just tracks misses.
return NULL;
WCachedSample * tc = NULL; WCachedSample * tc = NULL;
tc = sampleWCache.Get(filename,submode); tc = sampleWCache.Get(filename,submode);
@@ -747,23 +774,32 @@ int WResourceManager::LoadJLBFont(const string &fontName, int height){
else else
return itr->second; return itr->second;
} }
void WResourceManager::LargeCache(){ void WResourceManager::CacheForState(int state){
#if (defined WIN32 || defined LINUX) && !defined DEBUG_CACHE #if (defined WIN32 || defined LINUX) && !defined DEBUG_CACHE
textureWCache.Resize(HUGE_CACHE_LIMIT,HUGE_CACHE_ITEMS);
return; return;
#else #else
//Does not check option so we can use large cache during switch(state){
//deck editor, when it's pretty much always safe. //Default is not to change cache sizes.
textureWCache.Resize(LARGE_CACHE_LIMIT,MAX_CACHE_OBJECTS); case GAME_STATE_MENU:
textureWCache.Cleanup(); case GAME_STATE_OPTIONS:
#endif break;
} //Duels use a smaller cache, so there's more room for game stuff.
void WResourceManager::SmallCache(){ case GAME_STATE_DUEL:
#if (defined WIN32 || defined LINUX) && !defined DEBUG_CACHE textureWCache.Resize(SMALL_CACHE_LIMIT,SMALL_CACHE_ITEMS);
return; sampleWCache.Resize(SMALL_CACHE_LIMIT,MAX_CACHED_SAMPLES);
#else Cleanup();
if(options[Options::CACHESIZE].number == 0){ break;
textureWCache.Resize(SMALL_CACHE_LIMIT,MAX_CACHE_OBJECTS); //Deck editor and shop are entirely cache safe, so give it near infinite resources.
textureWCache.Cleanup();} case GAME_STATE_SHOP:
case GAME_STATE_DECK_VIEWER:
textureWCache.Resize(HUGE_CACHE_LIMIT,HUGE_CACHE_ITEMS);
break;
//Anything unknown, use large cache.
default:
textureWCache.Resize(LARGE_CACHE_LIMIT,LARGE_CACHE_ITEMS);
break;
}
#endif #endif
} }
@@ -949,8 +985,6 @@ void WCache<cacheItem, cacheActual>::Resize(unsigned long size, int items){
} }
template <class cacheItem, class cacheActual> template <class cacheItem, class cacheActual>
cacheItem* WCache<cacheItem, cacheActual>::AttemptNew(string filename, int submode){ cacheItem* WCache<cacheItem, cacheActual>::AttemptNew(string filename, int submode){
// Cleanup();
if(submode & CACHE_EXISTING){ //Should never get this far. if(submode & CACHE_EXISTING){ //Should never get this far.
mError = CACHE_ERROR_NOT_CACHED; mError = CACHE_ERROR_NOT_CACHED;
return NULL; return NULL;
@@ -962,7 +996,7 @@ cacheItem* WCache<cacheItem, cacheActual>::AttemptNew(string filename, int submo
if(item == NULL || !item->Attempt(filename,submode,mError)){ if(item == NULL || !item->Attempt(filename,submode,mError)){
//No such file. Fail. //No such file. Fail.
if(mError == CACHE_ERROR_404){ if(item && mError == CACHE_ERROR_404){
Delete(item); Delete(item);
return NULL; return NULL;
} }
@@ -1001,8 +1035,10 @@ cacheItem* WCache<cacheItem, cacheActual>::AttemptNew(string filename, int submo
} }
else else
mError = CACHE_ERROR_NONE; mError = CACHE_ERROR_NONE;
item->lock();
Cleanup(); Cleanup();
item->unlock();
return item; return item;
} }
@@ -1189,6 +1225,9 @@ cacheItem * WCache<cacheItem, cacheActual>::Get(string id, int style, int submod
cacheSize += isize; cacheSize += isize;
} }
item->lock();
Cleanup(); //Strictly enforce limits.
item->unlock();
return item; return item;
} }
@@ -1297,7 +1336,7 @@ bool WCache<cacheItem, cacheActual>::RemoveMiss(string id){
template <class cacheItem, class cacheActual> template <class cacheItem, class cacheActual>
bool WCache<cacheItem, cacheActual>::RemoveItem(cacheItem * item, bool force){ bool WCache<cacheItem, cacheActual>::RemoveItem(cacheItem * item, bool force){
typename map<string,cacheItem*>::iterator it = cache.end(); typename map<string,cacheItem*>::iterator it;
if(item == NULL) if(item == NULL)
return false; //Use RemoveMiss to remove cache misses, not this. return false; //Use RemoveMiss to remove cache misses, not this.
@@ -1351,7 +1390,11 @@ template <class cacheItem, class cacheActual>
bool WCache<cacheItem, cacheActual>::Delete(cacheItem * item){ bool WCache<cacheItem, cacheActual>::Delete(cacheItem * item){
if(!item) if(!item)
return false; return false;
#ifdef DEBUG_CACHE
char buf[512];
sprintf(buf,"Cache: Delete [%d]\n",(int)item);
//OutputDebugString(buf);
#endif
if(maxCached == 0) if(maxCached == 0)
item->Nullify(); item->Nullify();
@@ -1391,4 +1434,4 @@ bool WCache<cacheItem, cacheActual>::Release(cacheActual* actual){
//Released! //Released!
cache.erase(it); cache.erase(it);
return true; return true;
} }