No code change just reformatting of header files.
finishing up my reformatting of the source from November/December following the guidelines that were posted. some extra things I added: * Any empty virtual declarations were kept to one line. * Enums were split up into separate lines to promote uniformity across all headers. ( each header file had a different style for enums)
This commit is contained in:
@@ -8,114 +8,132 @@
|
||||
#define INVALID_MTEX -1
|
||||
#endif
|
||||
|
||||
class WResource{
|
||||
class WResource
|
||||
{
|
||||
public:
|
||||
friend class WResourceManager;
|
||||
friend struct WCacheSort;
|
||||
template<class cacheItem,class cacheActual> friend class WCache;
|
||||
friend class WResourceManager;
|
||||
friend struct WCacheSort;
|
||||
template<class cacheItem, class cacheActual> friend class WCache;
|
||||
|
||||
WResource();
|
||||
virtual ~WResource();
|
||||
|
||||
virtual unsigned long size()=0; //Size of cached item in bytes.
|
||||
virtual bool isGood()=0; //Return true if this has data.
|
||||
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.
|
||||
WResource();
|
||||
virtual ~WResource();
|
||||
|
||||
bool isPermanent(); //Is the resource permanent?
|
||||
void deadbolt(); //Make it permanent.
|
||||
void hit(); //Update resource's last used time.
|
||||
virtual unsigned long size()=0; //Size of cached item in bytes.
|
||||
virtual bool isGood()=0; //Return true if this has data.
|
||||
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.
|
||||
|
||||
bool isPermanent(); //Is the resource permanent?
|
||||
void deadbolt(); //Make it permanent.
|
||||
void hit(); //Update resource's last used time.
|
||||
|
||||
protected:
|
||||
int loadedMode; //What submode settings were we loaded with? (For refresh)
|
||||
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.
|
||||
int loadedMode; //What submode settings were we loaded with? (For refresh)
|
||||
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.
|
||||
};
|
||||
|
||||
class WCachedResource: public WResource {
|
||||
class WCachedResource: public WResource
|
||||
{
|
||||
public:
|
||||
friend class WResourceManager;
|
||||
template<class cacheItem,class cacheActual> friend class WCache;
|
||||
friend class WResourceManager;
|
||||
template<class cacheItem, class cacheActual> friend class WCache;
|
||||
|
||||
virtual ~WCachedResource();
|
||||
virtual ~WCachedResource();
|
||||
|
||||
string mFilename;
|
||||
virtual void Refresh()=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().
|
||||
string mFilename;
|
||||
virtual void Refresh()=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 {
|
||||
class WTrackedQuad: public WResource
|
||||
{
|
||||
public:
|
||||
WTrackedQuad(string _resname);
|
||||
~WTrackedQuad();
|
||||
bool isGood();
|
||||
unsigned long size();
|
||||
string resname;
|
||||
JQuad * quad;
|
||||
WTrackedQuad(string _resname);
|
||||
~WTrackedQuad();
|
||||
bool isGood();
|
||||
unsigned long size();
|
||||
string resname;
|
||||
JQuad * quad;
|
||||
};
|
||||
|
||||
class WCachedTexture: public WCachedResource{
|
||||
class WCachedTexture: public WCachedResource
|
||||
{
|
||||
public:
|
||||
friend class WResourceManager;
|
||||
template<class cacheItem,class cacheActual> friend class WCache;
|
||||
WCachedTexture();
|
||||
~WCachedTexture();
|
||||
friend class WResourceManager;
|
||||
template<class cacheItem, class cacheActual> friend class WCache;
|
||||
WCachedTexture();
|
||||
~WCachedTexture();
|
||||
|
||||
void Refresh();
|
||||
unsigned long size();
|
||||
bool isGood();
|
||||
bool isLocked(); //Is the resource locked?
|
||||
bool Attempt(string filename, int submode, int & error);
|
||||
bool compare(JTexture * t) {return (t == texture);};
|
||||
JTexture * Actual(); //Return this texture as is. Does not make a new one.
|
||||
JQuad * GetQuad(string resname);
|
||||
|
||||
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.
|
||||
void Refresh();
|
||||
unsigned long size();
|
||||
bool isGood();
|
||||
bool isLocked(); //Is the resource locked?
|
||||
bool Attempt(string filename, int submode, int & error);
|
||||
bool compare(JTexture * t)
|
||||
{
|
||||
return (t == texture);
|
||||
}
|
||||
;
|
||||
JTexture * Actual(); //Return this texture as is. Does not make a new one.
|
||||
JQuad * GetQuad(string resname);
|
||||
|
||||
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.
|
||||
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.
|
||||
|
||||
bool ReleaseQuad(JQuad* quad); //We're done with this quad, so delete and stop tracking. True if existed.
|
||||
protected:
|
||||
JTexture * texture;
|
||||
vector<WTrackedQuad*> trackedQuads;
|
||||
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.
|
||||
|
||||
bool ReleaseQuad(JQuad* quad); //We're done with this quad, so delete and stop tracking. True if existed.
|
||||
protected:
|
||||
JTexture * texture;
|
||||
vector<WTrackedQuad*> trackedQuads;
|
||||
};
|
||||
|
||||
class WCachedParticles: public WCachedResource{
|
||||
class WCachedParticles: public WCachedResource
|
||||
{
|
||||
public:
|
||||
friend class WResourceManager;
|
||||
template<class cacheItem,class cacheActual> friend class WCache;
|
||||
WCachedParticles();
|
||||
~WCachedParticles();
|
||||
void Refresh();
|
||||
unsigned long size();
|
||||
|
||||
bool isGood();
|
||||
bool Attempt(string filename, int submode, int & error);
|
||||
bool compare(hgeParticleSystemInfo * p) {return (p == particles);};
|
||||
friend class WResourceManager;
|
||||
template<class cacheItem, class cacheActual> friend class WCache;
|
||||
WCachedParticles();
|
||||
~WCachedParticles();
|
||||
void Refresh();
|
||||
unsigned long size();
|
||||
|
||||
hgeParticleSystemInfo * Actual();
|
||||
protected:
|
||||
hgeParticleSystemInfo * particles;
|
||||
bool isGood();
|
||||
bool Attempt(string filename, int submode, int & error);
|
||||
bool compare(hgeParticleSystemInfo * p)
|
||||
{
|
||||
return (p == particles);
|
||||
}
|
||||
;
|
||||
|
||||
hgeParticleSystemInfo * Actual();
|
||||
protected:
|
||||
hgeParticleSystemInfo * particles;
|
||||
};
|
||||
|
||||
class WCachedSample: public WCachedResource{
|
||||
class WCachedSample: public WCachedResource
|
||||
{
|
||||
public:
|
||||
friend class WResourceManager;
|
||||
template<class cacheItem,class cacheActual> friend class WCache;
|
||||
WCachedSample();
|
||||
~WCachedSample();
|
||||
bool compare(JSample * s) {return (s == sample);};
|
||||
unsigned long size();
|
||||
bool isGood();
|
||||
void Refresh();
|
||||
bool Attempt(string filename, int submode, int & error);
|
||||
friend class WResourceManager;
|
||||
template<class cacheItem, class cacheActual> friend class WCache;
|
||||
WCachedSample();
|
||||
~WCachedSample();
|
||||
bool compare(JSample * s)
|
||||
{
|
||||
return (s == sample);
|
||||
}
|
||||
;
|
||||
unsigned long size();
|
||||
bool isGood();
|
||||
void Refresh();
|
||||
bool Attempt(string filename, int submode, int & error);
|
||||
|
||||
JSample * Actual(); //Return this sample.
|
||||
protected:
|
||||
JSample * sample;
|
||||
JSample * Actual(); //Return this sample.
|
||||
protected:
|
||||
JSample * sample;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user