LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-14 10:13:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Array textures can be easily drawn without a shader (resolves issue #1111).

Browse Source 
Added love.graphics.drawLayer(texture, layerindex, …). ‘texture’ must be an array texture.
Added SpriteBatch:add/setLayer.

Added Quad:get/setLayer. This applies to array textures that are drawn without specifying an explicit layer index in the draw call.

Added love.graphics.newQuad variants which have layer arguments.

--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2017-02-26 17:11:22 -04:00
parent 9ba7234f14
commit 66b299822a
27 changed files with 559 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/Graphics.cpp
+34 -28
View File
@@ -99,8 +99,7 @@ bool isDebugEnabled()
love::Type Graphics::type("graphics", &Module::type);
Shader::ShaderSource Graphics::defaultShaderCode[Shader::LANGUAGE_MAX_ENUM][2];
Shader::ShaderSource Graphics::defaultVideoShaderCode[Shader::LANGUAGE_MAX_ENUM][2];
Shader::ShaderSource Graphics::defaultShaderCode[Shader::STANDARD_MAX_ENUM][Shader::LANGUAGE_MAX_ENUM][2];
Graphics::Graphics()
: width(0)
@@ -130,16 +129,13 @@ Graphics::~Graphics()
defaultFont.set(nullptr);
if (Shader::defaultShader)
for (int i = 0; i < Shader::STANDARD_MAX_ENUM; i++)
{
Shader::defaultShader->release();
Shader::defaultShader = nullptr;
}
if (Shader::defaultVideoShader)
{
Shader::defaultVideoShader->release();
Shader::defaultVideoShader = nullptr;
if (Shader::standardShaders[i])
{
Shader::standardShaders[i]->release();
Shader::standardShaders[i] = nullptr;
}
}
delete streamBufferState.vb[0];
@@ -390,7 +386,7 @@ void Graphics::setShader()
{
flushStreamDraws();
Shader::attachDefault();
Shader::attachDefault(Shader::STANDARD_DEFAULT);
states.back().shader.set(nullptr);
}
@@ -692,6 +688,31 @@ Graphics::StreamVertexData Graphics::requestStreamDraw(const StreamDrawRequest &
* Drawing
**/
void Graphics::draw(Drawable *drawable, const Matrix4 &m)
{
drawable->draw(this, m);
}
void Graphics::draw(Texture *texture, Quad *quad, const Matrix4 &m)
{
texture->draw(this, quad, m);
}
void Graphics::drawLayer(Texture *texture, int layer, const Matrix4 &m)
{
texture->drawLayer(this, layer, m);
}
void Graphics::drawLayer(Texture *texture, int layer, Quad *quad, const Matrix4 &m)
{
texture->drawLayer(this, layer, quad, m);
}
void Graphics::drawInstanced(Mesh *mesh, const Matrix4 &m, int instancecount)
{
mesh->drawInstanced(this, m, instancecount);
}
void Graphics::print(const std::vector<Font::ColoredString> &str, const Matrix4 &m)
{
checkSetDefaultFont();
@@ -712,21 +733,6 @@ void Graphics::printf(const std::vector<Font::ColoredString> &str, float wrap, F
state.font->printf(this, str, wrap, align, m, state.color);
}
void Graphics::draw(Drawable *drawable, const Matrix4 &m)
{
drawable->draw(this, m);
}
void Graphics::draw(Texture *texture, Quad *quad, const Matrix4 &m)
{
texture->drawq(this, quad, m);
}
void Graphics::drawInstanced(Mesh *mesh, const Matrix4 &m, int instancecount)
{
mesh->drawInstanced(this, m, instancecount);
}
/**
* Primitives (points, shapes, lines).
**/
@@ -1165,7 +1171,7 @@ Vector Graphics::inverseTransformPoint(Vector point)
const Shader::ShaderSource &Graphics::getCurrentDefaultShaderCode() const
{
return defaultShaderCode[getShaderLanguageTarget()][isGammaCorrect() ? 1 : 0];
return defaultShaderCode[Shader::STANDARD_DEFAULT][getShaderLanguageTarget()][isGammaCorrect() ? 1 : 0];
}
/**