LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-15 07:41:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add SpriteBatch:set(q) and make add(q) return the index

Browse Source
This commit is contained in:
Bart van Strien
2011-10-20 20:19:01 +02:00
parent 7a15953595
commit dc66ea20c1
4 changed files with 209 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/SpriteBatch.cpp
+36 -32
View File
@@ -99,50 +99,54 @@ namespace opengl
delete element_buf;
}
void SpriteBatch::add(float x, float y, float a, float sx, float sy, float ox, float oy, float kx, float ky)
int SpriteBatch::add(float x, float y, float a, float sx, float sy, float ox, float oy, float kx, float ky, int index /*= -1*/)
{
// Only do this if there's a free slot.
if(next < size)
{
// Needed for texture coordinates.
memcpy(sprite, image->getVertices(), sizeof(vertex)*4);
if((index == -1 && next >= size) || index < -1 || index >= size)
return -1;
// Transform.
Matrix t;
t.setTransformation(x, y, a, sx, sy, ox, oy, kx, ky);
t.transform(sprite, sprite, 4);
// Needed for colors.
memcpy(sprite, image->getVertices(), sizeof(vertex)*4);
if (color)
setColorv(sprite, *color);
// Transform.
Matrix t;
t.setTransformation(x, y, a, sx, sy, ox, oy, kx, ky);
t.transform(sprite, sprite, 4);
addv(sprite);
if (color)
setColorv(sprite, *color);
// Increment counter.
next++;
}
addv(sprite, (index == -1 ? next : index));
// Increment counter.
if (index == -1)
return next++;
return index;
}
void SpriteBatch::addq(Quad * quad, float x, float y, float a, float sx, float sy, float ox, float oy, float kx, float ky)
int SpriteBatch::addq(Quad * quad, float x, float y, float a, float sx, float sy, float ox, float oy, float kx, float ky, int index /*= -1*/)
{
// Only do this if there's a free slot.
if(next < size)
{
// Needed for colors.
memcpy(sprite, quad->getVertices(), sizeof(vertex)*4);
if((index == -1 && next >= size) || index < -1 || index >= next)
return -1;
// Transform.
Matrix t;
t.setTransformation(x, y, a, sx, sy, ox, oy, kx, ky);
t.transform(sprite, sprite, 4);
// Needed for colors.
memcpy(sprite, quad->getVertices(), sizeof(vertex)*4);
if (color)
setColorv(sprite, *color);
// Transform.
Matrix t;
t.setTransformation(x, y, a, sx, sy, ox, oy, kx, ky);
t.transform(sprite, sprite, 4);
addv(sprite);
if (color)
setColorv(sprite, *color);
// Increment counter.
next++;
}
addv(sprite, (index == -1 ? next : index));
// Increment counter.
if (index == -1)
return next++;
return index;
}
void SpriteBatch::clear()
@@ -226,13 +230,13 @@ namespace opengl
glPopMatrix();
}
void SpriteBatch::addv(const vertex * v)
void SpriteBatch::addv(const vertex * v, int index)
{
int sprite_size = sizeof(vertex) * 4;
VertexArray::Bind bind(*array_buf);
array_buf->fill(next * sprite_size, sprite_size, v);
array_buf->fill(index * sprite_size, sprite_size, v);
}
void SpriteBatch::setColorv(vertex * v, const Color & color)