Ancurio
/
mkxp-freebird
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

quad.h: Cleanup static functions to use templated Vertex parameter 

Collapses all the different Vertex/SVertex/CVertex variants
into one generic one per function.
This commit is contained in:
Jonas Kulla 2014-08-12 19:44:57 +02:00
parent 0af5e9d66c
commit 7d30ce1a00
1 changed files with 23 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/quad.h
View File

@ -36,7 +36,8 @@ struct Quad
GLMeta::VAO vao; GLMeta::VAO vao;
bool vboDirty; bool vboDirty;
static void setPosRect(CVertex *vert, const FloatRect &r) template<typename V>
static void setPosRect(V *vert, const FloatRect &r)
{ {
int i = 0; int i = 0;
vert[i++].pos = r.topLeft(); vert[i++].pos = r.topLeft();
@ -45,64 +46,32 @@ struct Quad
vert[i++].pos = r.bottomLeft(); vert[i++].pos = r.bottomLeft();
} }
static void setColor(CVertex *vert, const Vec4 &c) template<typename V>
static void setTexRect(V *vert, const FloatRect &r)
{
int i = 0;
vert[i++].texPos = r.topLeft();
vert[i++].texPos = r.topRight();
vert[i++].texPos = r.bottomRight();
vert[i++].texPos = r.bottomLeft();
}
template<typename V>
static int setTexPosRect(V *vert, const FloatRect &tex, const FloatRect &pos)
{
setPosRect(vert, pos);
setTexRect(vert, tex);
return 1;
}
template<typename V>
static void setColor(V *vert, const Vec4 &c)
{ {
for (int i = 0; i < 4; ++i) for (int i = 0; i < 4; ++i)
vert[i].color = c; vert[i].color = c;
} }
static void setPosRect(SVertex *vert, const FloatRect &r)
{
int i = 0;
vert[i++].pos = r.topLeft();
vert[i++].pos = r.topRight();
vert[i++].pos = r.bottomRight();
vert[i++].pos = r.bottomLeft();
}
static void setTexRect(SVertex *vert, const FloatRect &r)
{
int i = 0;
vert[i++].texPos = r.topLeft();
vert[i++].texPos = r.topRight();
vert[i++].texPos = r.bottomRight();
vert[i++].texPos = r.bottomLeft();
}
static void setPosRect(Vertex *vert, const FloatRect &r)
{
int i = 0;
vert[i++].pos = r.topLeft();
vert[i++].pos = r.topRight();
vert[i++].pos = r.bottomRight();
vert[i++].pos = r.bottomLeft();
}
static void setTexRect(Vertex *vert, const FloatRect &r)
{
int i = 0;
vert[i++].texPos = r.topLeft();
vert[i++].texPos = r.topRight();
vert[i++].texPos = r.bottomRight();
vert[i++].texPos = r.bottomLeft();
}
static int setTexPosRect(SVertex *vert, const FloatRect &tex, const FloatRect &pos)
{
setPosRect(vert, pos);
setTexRect(vert, tex);
return 1;
}
static int setTexPosRect(Vertex *vert, const FloatRect &tex, const FloatRect &pos)
{
setPosRect(vert, pos);
setTexRect(vert, tex);
return 1;
}
Quad() Quad()
: vbo(VBO::gen()), : vbo(VBO::gen()),
vboDirty(true) vboDirty(true)