|
|
|
@ -2918,7 +2918,7 @@ template<FlatGL2D::Flag flag> void FlatGLTest::renderInstanced2D() { |
|
|
|
Matrix3::projection({2.1f, 2.1f})* |
|
|
|
Matrix3::projection({2.1f, 2.1f})* |
|
|
|
Matrix3::scaling(Vector2{0.4f})); |
|
|
|
Matrix3::scaling(Vector2{0.4f})); |
|
|
|
|
|
|
|
|
|
|
|
if(data.flags & FlatGL3D::Flag::TextureTransformation) |
|
|
|
if(data.flags & FlatGL2D::Flag::TextureTransformation) |
|
|
|
shader.setTextureMatrix(Matrix3::scaling( |
|
|
|
shader.setTextureMatrix(Matrix3::scaling( |
|
|
|
#ifndef MAGNUM_TARGET_GLES2 |
|
|
|
#ifndef MAGNUM_TARGET_GLES2 |
|
|
|
/* Slices of the texture array have half the height */ |
|
|
|
/* Slices of the texture array have half the height */ |
|
|
|
@ -2970,7 +2970,7 @@ template<FlatGL2D::Flag flag> void FlatGLTest::renderInstanced2D() { |
|
|
|
FlatMaterialUniform{} |
|
|
|
FlatMaterialUniform{} |
|
|
|
.setColor(data.flags & FlatGL2D::Flag::Textured ? 0xffffff_rgbf : 0xffff00_rgbf) |
|
|
|
.setColor(data.flags & FlatGL2D::Flag::Textured ? 0xffffff_rgbf : 0xffff00_rgbf) |
|
|
|
}}; |
|
|
|
}}; |
|
|
|
if(data.flags & FlatGL3D::Flag::TextureTransformation) |
|
|
|
if(data.flags & FlatGL2D::Flag::TextureTransformation) |
|
|
|
shader.bindTextureTransformationBuffer(textureTransformationUniform); |
|
|
|
shader.bindTextureTransformationBuffer(textureTransformationUniform); |
|
|
|
shader.bindTransformationProjectionBuffer(transformationProjectionUniform) |
|
|
|
shader.bindTransformationProjectionBuffer(transformationProjectionUniform) |
|
|
|
.bindDrawBuffer(drawUniform) |
|
|
|
.bindDrawBuffer(drawUniform) |
|
|
|
|