Clamp graphic effect values in Target

Author: adazem009

src/scratch/target.cpp

@@ -552,7 +552,8 @@ double Target::graphicsEffectValue(IGraphicsEffect *effect) const
 /*! Sets the value of the given graphics effect. */
 void Target::setGraphicsEffectValue(IGraphicsEffect *effect, double value)
 {
-    impl->graphicsEffects[effect] = value;
+    assert(effect);
+    impl->graphicsEffects[effect] = effect->clamp(value);
 }
 
 /*! Sets the value of all graphics effects to 0 (clears them). */

test/blocks/looks_blocks_test.cpp

@@ -22,6 +22,8 @@
 using namespace libscratchcpp;
 
 using ::testing::Return;
+using ::testing::ReturnArg;
+using ::testing::_;
 
 class LooksBlocksTest : public testing::Test
 {
@@ -857,6 +859,14 @@ static void initEffects()
     LooksBlocks::m_mosaicEffect = ScratchConfiguration::getGraphicsEffect("mosaic");
     LooksBlocks::m_brightnessEffect = ScratchConfiguration::getGraphicsEffect("brightness");
     LooksBlocks::m_ghostEffect = ScratchConfiguration::getGraphicsEffect("ghost");
+
+    EXPECT_CALL(*colorEffect, clamp(_)).WillRepeatedly(ReturnArg<0>());
+    EXPECT_CALL(*fisheyeEffect, clamp(_)).WillRepeatedly(ReturnArg<0>());
+    EXPECT_CALL(*whirlEffect, clamp(_)).WillRepeatedly(ReturnArg<0>());
+    EXPECT_CALL(*pixelateEffect, clamp(_)).WillRepeatedly(ReturnArg<0>());
+    EXPECT_CALL(*mosaicEffect, clamp(_)).WillRepeatedly(ReturnArg<0>());
+    EXPECT_CALL(*brightnessEffect, clamp(_)).WillRepeatedly(ReturnArg<0>());
+    EXPECT_CALL(*ghostEffect, clamp(_)).WillRepeatedly(ReturnArg<0>());
 }
 
 static void removeEffects()
@@ -888,6 +898,8 @@ TEST_F(LooksBlocksTest, ChangeEffectByImpl)
     static Value constValues[] = { 0, 55.15, 1, -40.54, 1.2, 2.3, -3.4, -4.5, 0.5, -8.54, 0.01 };
 
     GraphicsEffectMock effect1, effect2;
+    EXPECT_CALL(effect1, clamp(_)).WillRepeatedly(ReturnArg<0>());
+    EXPECT_CALL(effect2, clamp(_)).WillRepeatedly(ReturnArg<0>());
 
     Target target;
     target.setGraphicsEffectValue(&effect1, 12.5);
@@ -1164,6 +1176,8 @@ TEST_F(LooksBlocksTest, SetEffectToImpl)
     static Value constValues[] = { 0, 55.15, 1, -40.54, 1.2, 2.3, -3.4, -4.5, 0.5, -8.54, 0.01 };
 
     GraphicsEffectMock effect1, effect2;
+    EXPECT_CALL(effect1, clamp(_)).WillRepeatedly(ReturnArg<0>());
+    EXPECT_CALL(effect2, clamp(_)).WillRepeatedly(ReturnArg<0>());
 
     Target target;
     target.setGraphicsEffectValue(&effect1, 12.5);
@@ -1283,6 +1297,8 @@ TEST_F(LooksBlocksTest, ClearGraphicEffectsImpl)
 
     Target target;
     GraphicsEffectMock effect1, effect2;
+    EXPECT_CALL(effect1, clamp(_)).WillRepeatedly(ReturnArg<0>());
+    EXPECT_CALL(effect2, clamp(_)).WillRepeatedly(ReturnArg<0>());
     target.setGraphicsEffectValue(&effect1, 48.21);
     target.setGraphicsEffectValue(&effect2, -107.08);
 

test/scratch_classes/sprite_test.cpp

@@ -853,24 +853,22 @@ TEST(SpriteTest, GraphicsEffects)
 
     EngineMock engine;
     sprite.setEngine(&engine);
-    EXPECT_CALL(engine, requestRedraw()).Times(3);
+    EXPECT_CALL(engine, requestRedraw()).Times(4);
 
     GraphicsEffectMock effect1, effect2;
+    EXPECT_CALL(effect1, clamp(48.21)).WillOnce(Return(48.21));
     sprite.setGraphicsEffectValue(&effect1, 48.21);
     ASSERT_EQ(sprite.graphicsEffectValue(&effect1), 48.21);
     ASSERT_EQ(sprite.graphicsEffectValue(&effect2), 0);
 
+    EXPECT_CALL(effect2, clamp(-107.08)).WillOnce(Return(-107.08));
     sprite.setGraphicsEffectValue(&effect2, -107.08);
     ASSERT_EQ(sprite.graphicsEffectValue(&effect1), 48.21);
     ASSERT_EQ(sprite.graphicsEffectValue(&effect2), -107.08);
 
-    sprite.clearGraphicsEffects();
-    ASSERT_EQ(sprite.graphicsEffectValue(&effect1), 0);
-    ASSERT_EQ(sprite.graphicsEffectValue(&effect2), 0);
-
-    sprite.setVisible(false);
-    sprite.setGraphicsEffectValue(&effect2, -107.08);
-    ASSERT_EQ(sprite.graphicsEffectValue(&effect1), 0);
+    EXPECT_CALL(effect1, clamp(300)).WillOnce(Return(101.5));
+    sprite.setGraphicsEffectValue(&effect1, 300);
+    ASSERT_EQ(sprite.graphicsEffectValue(&effect1), 101.5);
     ASSERT_EQ(sprite.graphicsEffectValue(&effect2), -107.08);
 
     sprite.clearGraphicsEffects();

test/scratch_classes/stage_test.cpp

@@ -248,17 +248,24 @@ TEST(StageTest, GraphicsEffects)
 
     EngineMock engine;
     stage.setEngine(&engine);
-    EXPECT_CALL(engine, requestRedraw()).Times(3);
+    EXPECT_CALL(engine, requestRedraw()).Times(4);
 
     GraphicsEffectMock effect1, effect2;
+    EXPECT_CALL(effect1, clamp(48.21)).WillOnce(Return(48.21));
     stage.setGraphicsEffectValue(&effect1, 48.21);
     ASSERT_EQ(stage.graphicsEffectValue(&effect1), 48.21);
     ASSERT_EQ(stage.graphicsEffectValue(&effect2), 0);
 
+    EXPECT_CALL(effect2, clamp(-107.08)).WillOnce(Return(-107.08));
     stage.setGraphicsEffectValue(&effect2, -107.08);
     ASSERT_EQ(stage.graphicsEffectValue(&effect1), 48.21);
     ASSERT_EQ(stage.graphicsEffectValue(&effect2), -107.08);
 
+    EXPECT_CALL(effect1, clamp(300)).WillOnce(Return(101.5));
+    stage.setGraphicsEffectValue(&effect1, 300);
+    ASSERT_EQ(stage.graphicsEffectValue(&effect1), 101.5);
+    ASSERT_EQ(stage.graphicsEffectValue(&effect2), -107.08);
+
     stage.clearGraphicsEffects();
     ASSERT_EQ(stage.graphicsEffectValue(&effect1), 0);
     ASSERT_EQ(stage.graphicsEffectValue(&effect2), 0);

test/scratch_classes/target_test.cpp

@@ -750,14 +750,21 @@ TEST(TargetTest, GraphicsEffects)
     target.setEngine(&engine);
 
     GraphicsEffectMock effect1, effect2;
+    EXPECT_CALL(effect1, clamp(48.21)).WillOnce(Return(48.21));
     target.setGraphicsEffectValue(&effect1, 48.21);
     ASSERT_EQ(target.graphicsEffectValue(&effect1), 48.21);
     ASSERT_EQ(target.graphicsEffectValue(&effect2), 0);
 
+    EXPECT_CALL(effect2, clamp(-107.08)).WillOnce(Return(-107.08));
     target.setGraphicsEffectValue(&effect2, -107.08);
     ASSERT_EQ(target.graphicsEffectValue(&effect1), 48.21);
     ASSERT_EQ(target.graphicsEffectValue(&effect2), -107.08);
 
+    EXPECT_CALL(effect1, clamp(300)).WillOnce(Return(101.5));
+    target.setGraphicsEffectValue(&effect1, 300);
+    ASSERT_EQ(target.graphicsEffectValue(&effect1), 101.5);
+    ASSERT_EQ(target.graphicsEffectValue(&effect2), -107.08);
+
     target.clearGraphicsEffects();
     ASSERT_EQ(target.graphicsEffectValue(&effect1), 0);
     ASSERT_EQ(target.graphicsEffectValue(&effect2), 0);