AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 01:07:43 +00:00
Code Issues Projects Releases Wiki Activity

TLockedToken cached pointer

Browse Source
This commit is contained in:
Jack Andersen
2016-02-07 19:10:17 -10:00
parent 259eb89b00
commit 718436d2a6
6 changed files with 77 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Runtime/Particle/CUVElement.hpp
View File

@@ -9,14 +9,6 @@ namespace Retro
{
class CToken;
struct SUVElementTexture
{
TToken<CTexture> m_tex;
CTexture* m_directTex;
SUVElementTexture(TToken<CTexture>&& tex, CTexture* directTex)
: m_tex(std::move(tex)), m_directTex(directTex) {}
};
struct SUVElementSet
{
float xMin, yMin, xMax, yMax;
@@ -25,7 +17,7 @@ struct SUVElementSet
class CUVElement : public IElement
{
public:
virtual SUVElementTexture GetValueTexture(int frame) const=0;
virtual TLockedToken<CTexture> GetValueTexture(int frame) const=0;
virtual void GetValueUV(int frame, SUVElementSet& valOut) const=0;
virtual bool HasConstantTexture() const=0;
virtual bool HasConstantUV() const=0;
@@ -33,14 +25,13 @@ public:
struct CUVEConstant : public CUVElement
{
TToken<CTexture> x4_tex;
CTexture* xc_directTex;
TLockedToken<CTexture> x4_tex;
public:
CUVEConstant(TToken<CTexture>&& tex)
: x4_tex(std::move(tex)), xc_directTex(x4_tex.GetObj()) {}
SUVElementTexture GetValueTexture(int frame) const
: x4_tex(std::move(tex)) {}
TLockedToken<CTexture> GetValueTexture(int frame) const
{
return SUVElementTexture(TLockedToken<CTexture>(x4_tex), xc_directTex);
return TLockedToken<CTexture>(x4_tex);
}
void GetValueUV(int frame, SUVElementSet& valOut) const
{
@@ -52,8 +43,7 @@ public:
struct CUVEAnimTexture : public CUVElement
{
TToken<CTexture> x4_tex;
CTexture* xc_directTex;
TLockedToken<CTexture> x4_tex;
int x10_tileW, x14_tileH, x18_strideW, x1c_strideH;
int x20_tiles;
bool x24_loop;
@@ -62,9 +52,9 @@ struct CUVEAnimTexture : public CUVElement
public:
CUVEAnimTexture(TToken<CTexture>&& tex, CIntElement* a, CIntElement* b,
CIntElement* c, CIntElement* d, CIntElement* e, bool f);
SUVElementTexture GetValueTexture(int frame) const
TLockedToken<CTexture> GetValueTexture(int frame) const
{
return SUVElementTexture(TLockedToken<CTexture>(x4_tex), xc_directTex);
return TLockedToken<CTexture>(x4_tex);
}
void GetValueUV(int frame, SUVElementSet& valOut) const;
bool HasConstantTexture() const {return true;}