Skip to content

Commit 0e43c14

Browse files
committed
TargetPainter: Fix skin size
1 parent 5fce95d commit 0e43c14

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

src/targetpainter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ void TargetPainter::paint(QNanoPainter *painter)
9494
glF.glBindVertexArray(VAO);
9595
glF.glActiveTexture(GL_TEXTURE0);
9696
glF.glBindTexture(GL_TEXTURE_2D, texture.handle());
97-
shaderManager->setUniforms(shaderProgram, 0, m_target->cpuTexture().size(), effects); // set texture and effect uniforms
97+
shaderManager->setUniforms(shaderProgram, 0, QSize(m_target->costumeWidth(), m_target->costumeHeight()), effects); // set texture and effect uniforms
9898
glF.glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
9999

100100
// Process the resulting texture

test/targetpainter/targetpainter_test.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ TEST_F(TargetPainterTest, Paint)
8181
Texture texture(refFbo.texture(), refFbo.size());
8282
std::unordered_map<ShaderManager::Effect, double> effects;
8383
EXPECT_CALL(target, texture()).WillOnce(Return(texture));
84-
EXPECT_CALL(target, cpuTexture()).WillOnce(ReturnRef(texture));
84+
EXPECT_CALL(target, costumeWidth()).WillOnce(Return(texture.width()));
85+
EXPECT_CALL(target, costumeHeight()).WillOnce(Return(texture.height()));
8586
EXPECT_CALL(target, graphicEffects()).WillOnce(ReturnRef(effects));
8687
targetPainter.paint(&painter);
8788
painter.endFrame();
@@ -96,7 +97,8 @@ TEST_F(TargetPainterTest, Paint)
9697
effects[ShaderManager::Effect::Brightness] = 20;
9798
effects[ShaderManager::Effect::Ghost] = 84;
9899
EXPECT_CALL(target, texture()).WillOnce(Return(texture));
99-
EXPECT_CALL(target, cpuTexture()).WillOnce(ReturnRef(texture));
100+
EXPECT_CALL(target, costumeWidth()).WillOnce(Return(texture.width()));
101+
EXPECT_CALL(target, costumeHeight()).WillOnce(Return(texture.height()));
100102
EXPECT_CALL(target, graphicEffects()).WillOnce(ReturnRef(effects));
101103
targetPainter.paint(&painter);
102104
painter.endFrame();
@@ -114,7 +116,8 @@ TEST_F(TargetPainterTest, Paint)
114116
effects[ShaderManager::Effect::Pixelate] = 25;
115117
effects[ShaderManager::Effect::Mosaic] = 30;
116118
EXPECT_CALL(target, texture()).WillOnce(Return(texture));
117-
EXPECT_CALL(target, cpuTexture()).WillOnce(ReturnRef(texture));
119+
EXPECT_CALL(target, costumeWidth()).WillOnce(Return(texture.width()));
120+
EXPECT_CALL(target, costumeHeight()).WillOnce(Return(texture.height()));
118121
EXPECT_CALL(target, graphicEffects()).WillOnce(ReturnRef(effects));
119122
targetPainter.paint(&painter);
120123
painter.endFrame();

0 commit comments

Comments
 (0)