Jeck - Cache and resource manager merged, streamlined.
This is pretty major, so there'll probably be something wrong with it... even though I did spend a few hours looking.
NOTES:
* If you've Retrieved it, don't delete it--- Use resources.Release(Whatever).
Textures automatically release subordinate quads.
* Most of the time, use resources.RetrieveQuad to grab a quad. Should handle everything for you.
RetrieveQuad will load the required texture, if needed.
Only managed resources have a resource name ("back", "simon", etc).
Managed resources can be retrieved with GetTexture/GetQuad/GetWhatever.
Non managed quads lookup by position/dimensions, defaulting to the whole texture.
* Use resources.RetrieveTexture only when you need to do something special to it.
Calling retrieve texture with RETRIEVE_MANAGE will permanently add a texture to the manager
RETRIEVE_LOCK and RETRIEVE_VRAM will lock a texture. It will not leave the cache until
Release(JTexture*) is called, or as a last resort during cache overflow.
* Try to only store (as a class member) pointers to textures retrieved with RETRIEVE_MANAGE.
All others may become invalid, although locked textures do have a high degree of stability. It's
pretty safe to store a locked texture if you're not going to load much between uses.
There's a lot going on here, so I might have missed something... but it runs through the test suite alright.
TODO:
* When called without any arguments, RetrieveQuad sometimes leaves a thin border around the image.
This can be bypassed by specifying a quad one or two pixels less than the image size. Why?
* I've had a crash while runing the Demo mode, something to do with receiveEventMinus?
This hasn't exactly reproduced on a clean SVN copy, (being a hang, rather than a crash) so
I've probably done something to worsen the problem somehow? I'll look into it tomorrow.
* Clean up lock/unlock system, memory usage. Streamline interface, consider phasing out calls using GetWhatever() format.
This commit is contained in:
@@ -26,8 +26,6 @@ using namespace std;
|
||||
#define INVALID_ID -1
|
||||
|
||||
class JRenderer;
|
||||
class JParticleEffect;
|
||||
class JMotionEmitter;
|
||||
class JSample;
|
||||
class JMusic;
|
||||
class JTexture;
|
||||
@@ -38,33 +36,30 @@ class JResourceManager
|
||||
{
|
||||
public:
|
||||
JResourceManager();
|
||||
~JResourceManager();
|
||||
virtual ~JResourceManager();
|
||||
|
||||
//void SetResourceRoot(const string& resourceRoot);
|
||||
bool LoadResource(const string& resourceName);
|
||||
|
||||
void RemoveAll();
|
||||
void RemoveGraphics();
|
||||
void RemoveSound();
|
||||
void RemoveFont();
|
||||
|
||||
int CreateTexture(const string &textureName);
|
||||
virtual int CreateTexture(const string &textureName);
|
||||
JTexture* GetTexture(const string &textureName);
|
||||
JTexture* GetTexture(int id);
|
||||
|
||||
int CreateQuad(const string &quadName, const string &textureName, float x, float y, float width, float height);
|
||||
virtual int CreateQuad(const string &quadName, const string &textureName, float x, float y, float width, float height);
|
||||
JQuad* GetQuad(const string &quadName);
|
||||
JQuad* GetQuad(int id);
|
||||
|
||||
int LoadJLBFont(const string &fontName, int height);
|
||||
virtual int LoadJLBFont(const string &fontName, int height);
|
||||
JLBFont* GetJLBFont(const string &fontName);
|
||||
JLBFont* GetJLBFont(int id);
|
||||
|
||||
int LoadMusic(const string &musicName);
|
||||
virtual int LoadMusic(const string &musicName);
|
||||
JMusic* GetMusic(const string &musicName);
|
||||
JMusic* GetMusic(int id);
|
||||
|
||||
int LoadSample(const string &sampleName);
|
||||
virtual int LoadSample(const string &sampleName);
|
||||
JSample* GetSample(const string &sampleName);
|
||||
JSample* GetSample(int id);
|
||||
|
||||
@@ -76,7 +71,7 @@ public:
|
||||
// JMotionEmitter* GetMotionEmitter(const string &emitterName);
|
||||
// JMotionEmitter* GetMotionEmitter(int id);
|
||||
|
||||
private:
|
||||
protected:
|
||||
|
||||
//JRenderer *mRenderer;
|
||||
|
||||
|
||||
@@ -16,6 +16,13 @@
|
||||
#include "../include/JLBFont.h"
|
||||
#include "tinyxml/tinyxml.h"
|
||||
|
||||
#if defined (_DEBUG) && defined (WIN32)
|
||||
#include "crtdbg.h"
|
||||
#define NEW new(_NORMAL_BLOCK, __FILE__, __LINE__)
|
||||
#else
|
||||
#define NEW new
|
||||
#endif
|
||||
|
||||
JResourceManager::JResourceManager()
|
||||
{
|
||||
//mResourceRoot = "Res/"; // default root folder
|
||||
@@ -299,7 +306,7 @@ int JResourceManager::CreateQuad(const string &quadName, const string &textureNa
|
||||
printf("creating quad:%s\n", quadName.c_str());
|
||||
|
||||
int id = mQuadList.size();
|
||||
mQuadList.push_back(new JQuad(tex, x, y, width, height));
|
||||
mQuadList.push_back(NEW JQuad(tex, x, y, width, height));
|
||||
|
||||
mQuadMap[quadName] = id;
|
||||
|
||||
@@ -343,7 +350,7 @@ int JResourceManager::LoadJLBFont(const string &fontName, int height)
|
||||
|
||||
int id = mFontList.size();
|
||||
///////////////////////////////////////
|
||||
mFontList.push_back(new JLBFont(path.c_str(), height, true));
|
||||
mFontList.push_back(NEW JLBFont(path.c_str(), height, true));
|
||||
|
||||
mFontMap[fontName] = id;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user