Skip to content

Commit 20788aa

Browse files
committed
fix #457: Use correct input name in the set effect block
1 parent fad74ce commit 20788aa

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

src/blocks/looksblocks.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -179,55 +179,55 @@ void LooksBlocks::compileSetEffectTo(Compiler *compiler)
179179
if (!m_colorEffect)
180180
m_colorEffect = ScratchConfiguration::getGraphicsEffect("color");
181181

182-
compiler->addInput(CHANGE);
182+
compiler->addInput(VALUE);
183183
compiler->addFunctionCall(&setColorEffectTo);
184184
break;
185185

186186
case FisheyeEffect:
187187
if (!m_fisheyeEffect)
188188
m_fisheyeEffect = ScratchConfiguration::getGraphicsEffect("fisheye");
189189

190-
compiler->addInput(CHANGE);
190+
compiler->addInput(VALUE);
191191
compiler->addFunctionCall(&setFisheyeEffectTo);
192192
break;
193193

194194
case WhirlEffect:
195195
if (!m_whirlEffect)
196196
m_whirlEffect = ScratchConfiguration::getGraphicsEffect("whirl");
197197

198-
compiler->addInput(CHANGE);
198+
compiler->addInput(VALUE);
199199
compiler->addFunctionCall(&setWhirlEffectTo);
200200
break;
201201

202202
case PixelateEffect:
203203
if (!m_pixelateEffect)
204204
m_pixelateEffect = ScratchConfiguration::getGraphicsEffect("pixelate");
205205

206-
compiler->addInput(CHANGE);
206+
compiler->addInput(VALUE);
207207
compiler->addFunctionCall(&setPixelateEffectTo);
208208
break;
209209

210210
case MosaicEffect:
211211
if (!m_mosaicEffect)
212212
m_mosaicEffect = ScratchConfiguration::getGraphicsEffect("mosaic");
213213

214-
compiler->addInput(CHANGE);
214+
compiler->addInput(VALUE);
215215
compiler->addFunctionCall(&setMosaicEffectTo);
216216
break;
217217

218218
case BrightnessEffect:
219219
if (!m_brightnessEffect)
220220
m_brightnessEffect = ScratchConfiguration::getGraphicsEffect("brightness");
221221

222-
compiler->addInput(CHANGE);
222+
compiler->addInput(VALUE);
223223
compiler->addFunctionCall(&setBrightnessEffectTo);
224224
break;
225225

226226
case GhostEffect:
227227
if (!m_ghostEffect)
228228
m_ghostEffect = ScratchConfiguration::getGraphicsEffect("ghost");
229229

230-
compiler->addInput(CHANGE);
230+
compiler->addInput(VALUE);
231231
compiler->addFunctionCall(&setGhostEffectTo);
232232
break;
233233

@@ -245,7 +245,7 @@ void LooksBlocks::compileSetEffectTo(Compiler *compiler)
245245
index = it - m_customGraphicsEffects.begin();
246246

247247
compiler->addConstValue(index);
248-
compiler->addInput(CHANGE);
248+
compiler->addInput(VALUE);
249249
compiler->addFunctionCall(&setEffectTo);
250250
}
251251

test/blocks/looks_blocks_test.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -531,47 +531,47 @@ TEST_F(LooksBlocksTest, SetEffectTo)
531531
// set [custom1] effect to 12.5
532532
auto block1 = std::make_shared<Block>("a", "looks_seteffectto");
533533
addDropdownField(block1, "EFFECT", LooksBlocks::EFFECT, "custom1", static_cast<LooksBlocks::FieldValues>(-1));
534-
addValueInput(block1, "CHANGE", LooksBlocks::CHANGE, 12.5);
534+
addValueInput(block1, "VALUE", LooksBlocks::VALUE, 12.5);
535535

536536
// set [custom2] effect to -78.15
537537
auto block2 = std::make_shared<Block>("b", "looks_seteffectto");
538538
addDropdownField(block2, "EFFECT", LooksBlocks::EFFECT, "custom2", static_cast<LooksBlocks::FieldValues>(-1));
539-
addValueInput(block2, "CHANGE", LooksBlocks::CHANGE, -78.15);
539+
addValueInput(block2, "VALUE", LooksBlocks::VALUE, -78.15);
540540

541541
// set [color] effect to 154.152
542542
auto block3 = std::make_shared<Block>("c", "looks_seteffectto");
543543
addDropdownField(block3, "EFFECT", LooksBlocks::EFFECT, "color", LooksBlocks::ColorEffect);
544-
addValueInput(block3, "CHANGE", LooksBlocks::CHANGE, 154.152);
544+
addValueInput(block3, "VALUE", LooksBlocks::VALUE, 154.152);
545545

546546
// set [fisheye] effect to -124.054
547547
auto block4 = std::make_shared<Block>("d", "looks_seteffectto");
548548
addDropdownField(block4, "EFFECT", LooksBlocks::EFFECT, "fisheye", LooksBlocks::FisheyeEffect);
549-
addValueInput(block4, "CHANGE", LooksBlocks::CHANGE, -124.054);
549+
addValueInput(block4, "VALUE", LooksBlocks::VALUE, -124.054);
550550

551551
// set [whirl] effect to 45.858
552552
auto block5 = std::make_shared<Block>("e", "looks_seteffectto");
553553
addDropdownField(block5, "EFFECT", LooksBlocks::EFFECT, "whirl", LooksBlocks::WhirlEffect);
554-
addValueInput(block5, "CHANGE", LooksBlocks::CHANGE, 45.858);
554+
addValueInput(block5, "VALUE", LooksBlocks::VALUE, 45.858);
555555

556556
// set [pixelate] effect to -0.15
557557
auto block6 = std::make_shared<Block>("f", "looks_seteffectto");
558558
addDropdownField(block6, "EFFECT", LooksBlocks::EFFECT, "pixelate", LooksBlocks::PixelateEffect);
559-
addValueInput(block6, "CHANGE", LooksBlocks::CHANGE, -0.15);
559+
addValueInput(block6, "VALUE", LooksBlocks::VALUE, -0.15);
560560

561561
// set [mosaic] effect to 0.84
562562
auto block7 = std::make_shared<Block>("g", "looks_seteffectto");
563563
addDropdownField(block7, "EFFECT", LooksBlocks::EFFECT, "mosaic", LooksBlocks::MosaicEffect);
564-
addValueInput(block7, "CHANGE", LooksBlocks::CHANGE, 0.84);
564+
addValueInput(block7, "VALUE", LooksBlocks::VALUE, 0.84);
565565

566566
// set [brightness] effect to 40.87
567567
auto block8 = std::make_shared<Block>("h", "looks_seteffectto");
568568
addDropdownField(block8, "EFFECT", LooksBlocks::EFFECT, "brightness", LooksBlocks::BrightnessEffect);
569-
addValueInput(block8, "CHANGE", LooksBlocks::CHANGE, 40.87);
569+
addValueInput(block8, "VALUE", LooksBlocks::VALUE, 40.87);
570570

571571
// set [ghost] effect to 50.04
572572
auto block9 = std::make_shared<Block>("i", "looks_seteffectto");
573573
addDropdownField(block9, "EFFECT", LooksBlocks::EFFECT, "ghost", LooksBlocks::GhostEffect);
574-
addValueInput(block9, "CHANGE", LooksBlocks::CHANGE, 50.04);
574+
addValueInput(block9, "VALUE", LooksBlocks::VALUE, 50.04);
575575

576576
auto effect1 = std::make_shared<GraphicsEffectMock>();
577577
auto effect2 = std::make_shared<GraphicsEffectMock>();

0 commit comments

Comments
 (0)