Implement pen_setPenShadeToNumber block

Author: adazem009

src/blocks/penblocks.cpp

@@ -30,6 +30,7 @@ void PenBlocks::registerBlocks(IEngine *engine)
     engine->addCompileFunction(this, "pen_changePenSizeBy", &compileChangePenSizeBy);
     engine->addCompileFunction(this, "pen_setPenSizeTo", &compileSetPenSizeTo);
     engine->addCompileFunction(this, "pen_changePenShadeBy", &compileChangePenShadeBy);
+    engine->addCompileFunction(this, "pen_setPenShadeToNumber", &compileSetPenShadeToNumber);
     engine->addCompileFunction(this, "pen_changePenHueBy", &compileChangePenHueBy);
     engine->addCompileFunction(this, "pen_setPenHueToNumber", &compileSetPenHueToNumber);
 
@@ -79,6 +80,12 @@ void PenBlocks::compileChangePenShadeBy(Compiler *compiler)
     compiler->addFunctionCall(&changePenShadeBy);
 }
 
+void PenBlocks::compileSetPenShadeToNumber(libscratchcpp::Compiler *compiler)
+{
+    compiler->addInput(SHADE);
+    compiler->addFunctionCall(&setPenShadeToNumber);
+}
+
 void PenBlocks::compileChangePenHueBy(libscratchcpp::Compiler *compiler)
 {
     compiler->addInput(HUE);
@@ -155,6 +162,16 @@ unsigned int PenBlocks::changePenShadeBy(libscratchcpp::VirtualMachine *vm)
     return 1;
 }
 
+unsigned int PenBlocks::setPenShadeToNumber(libscratchcpp::VirtualMachine *vm)
+{
+    SpriteModel *model = getSpriteModel(vm);
+
+    if (model)
+        setPenShade(vm->getInput(0, 1)->toInt(), model->penState());
+
+    return 1;
+}
+
 unsigned int PenBlocks::changePenHueBy(libscratchcpp::VirtualMachine *vm)
 {
     SpriteModel *model = getSpriteModel(vm);

src/blocks/penblocks.h

@@ -33,6 +33,7 @@ class PenBlocks : public libscratchcpp::IBlockSection
         static void compileChangePenSizeBy(libscratchcpp::Compiler *compiler);
         static void compileSetPenSizeTo(libscratchcpp::Compiler *compiler);
         static void compileChangePenShadeBy(libscratchcpp::Compiler *compiler);
+        static void compileSetPenShadeToNumber(libscratchcpp::Compiler *compiler);
         static void compileChangePenHueBy(libscratchcpp::Compiler *compiler);
         static void compileSetPenHueToNumber(libscratchcpp::Compiler *compiler);
 
@@ -43,6 +44,7 @@ class PenBlocks : public libscratchcpp::IBlockSection
         static unsigned int changePenSizeBy(libscratchcpp::VirtualMachine *vm);
         static unsigned int setPenSizeTo(libscratchcpp::VirtualMachine *vm);
         static unsigned int changePenShadeBy(libscratchcpp::VirtualMachine *vm);
+        static unsigned int setPenShadeToNumber(libscratchcpp::VirtualMachine *vm);
         static unsigned int changePenHueBy(libscratchcpp::VirtualMachine *vm);
         static unsigned int setPenHueToNumber(libscratchcpp::VirtualMachine *vm);
 

test/blocks/pen_blocks_test.cpp

@@ -68,6 +68,7 @@ TEST_F(PenBlocksTest, RegisterBlocks)
     EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "pen_changePenSizeBy", &PenBlocks::compileChangePenSizeBy));
     EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "pen_setPenSizeTo", &PenBlocks::compileSetPenSizeTo));
     EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "pen_changePenShadeBy", &PenBlocks::compileChangePenShadeBy));
+    EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "pen_setPenShadeToNumber", &PenBlocks::compileSetPenShadeToNumber));
     EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "pen_changePenHueBy", &PenBlocks::compileChangePenHueBy));
     EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "pen_setPenHueToNumber", &PenBlocks::compileSetPenHueToNumber));
 
@@ -505,6 +506,72 @@ TEST_F(PenBlocksTest, ChangePenShadeByImpl)
     ASSERT_EQ(model.penAttributes().color, QColor::fromHsv(240, 255, 55, 150));
 }
 
+TEST_F(PenBlocksTest, SetPenShadeToNumber)
+{
+    Compiler compiler(&m_engineMock);
+
+    // set pen shade to (4.5)
+    auto block1 = std::make_shared<Block>("a", "pen_setPenShadeToNumber");
+    addValueInput(block1, "SHADE", PenBlocks::SHADE, 4.5);
+
+    // set pen shade to (null block)
+    auto block2 = std::make_shared<Block>("b", "pen_setPenShadeToNumber");
+    addObscuredInput(block2, "SHADE", PenBlocks::SHADE, createNullBlock("c"));
+
+    compiler.init();
+
+    EXPECT_CALL(m_engineMock, functionIndex(&PenBlocks::setPenShadeToNumber)).WillOnce(Return(2));
+    compiler.setBlock(block1);
+    PenBlocks::compileSetPenShadeToNumber(&compiler);
+
+    EXPECT_CALL(m_engineMock, functionIndex(&PenBlocks::setPenShadeToNumber)).WillOnce(Return(2));
+    compiler.setBlock(block2);
+    PenBlocks::compileSetPenShadeToNumber(&compiler);
+
+    compiler.end();
+
+    ASSERT_EQ(compiler.bytecode(), std::vector<unsigned int>({ vm::OP_START, vm::OP_CONST, 0, vm::OP_EXEC, 2, vm::OP_NULL, vm::OP_EXEC, 2, vm::OP_HALT }));
+    ASSERT_EQ(compiler.constValues().size(), 1);
+    ASSERT_EQ(compiler.constValues()[0].toDouble(), 4.5);
+    ASSERT_TRUE(compiler.variables().empty());
+    ASSERT_TRUE(compiler.lists().empty());
+}
+
+TEST_F(PenBlocksTest, SetPenShadeToNumberImpl)
+{
+    static unsigned int bytecode1[] = { vm::OP_START, vm::OP_CONST, 0, vm::OP_EXEC, 0, vm::OP_HALT };
+    static unsigned int bytecode2[] = { vm::OP_START, vm::OP_CONST, 1, vm::OP_EXEC, 0, vm::OP_HALT };
+    static unsigned int bytecode3[] = { vm::OP_START, vm::OP_CONST, 2, vm::OP_EXEC, 0, vm::OP_HALT };
+    static BlockFunc functions[] = { &PenBlocks::setPenShadeToNumber };
+    static Value constValues[] = { 125.7, -114.09, 489.4 };
+
+    SpriteModel model;
+    model.penState().transparency = 100 * (1 - 150 / 255.0);
+    Sprite sprite;
+    sprite.setInterface(&model);
+
+    VirtualMachine vm(&sprite, &m_engineMock, nullptr);
+    vm.setBytecode(bytecode1);
+    vm.setFunctions(functions);
+    vm.setConstValues(constValues);
+
+    vm.run();
+    ASSERT_EQ(vm.registerCount(), 0);
+    ASSERT_EQ(model.penAttributes().color, QColor::fromHsv(240, 148, 253, 150));
+
+    vm.reset();
+    vm.setBytecode(bytecode2);
+    vm.run();
+    ASSERT_EQ(vm.registerCount(), 0);
+    ASSERT_EQ(model.penAttributes().color, QColor::fromHsv(240, 102, 255, 150));
+
+    vm.reset();
+    vm.setBytecode(bytecode3);
+    vm.run();
+    ASSERT_EQ(vm.registerCount(), 0);
+    ASSERT_EQ(model.penAttributes().color, QColor::fromHsv(240, 89, 255, 150));
+}
+
 TEST_F(PenBlocksTest, ChangePenHueBy)
 {
     Compiler compiler(&m_engineMock);