Implement sound_volume block

Author: adazem009

src/blocks/soundblocks.cpp

@@ -18,6 +18,7 @@ void SoundBlocks::registerBlocks(IEngine *engine)
     // Blocks
     engine->addCompileFunction(this, "sound_changevolumeby", &compileChangeVolumeBy);
     engine->addCompileFunction(this, "sound_setvolumeto", &compileSetVolumeTo);
+    engine->addCompileFunction(this, "sound_volume", &compileVolume);
 
     // Inputs
     engine->addInput(this, "VOLUME", VOLUME);
@@ -35,6 +36,11 @@ void SoundBlocks::compileSetVolumeTo(Compiler *compiler)
     compiler->addFunctionCall(&setVolumeTo);
 }
 
+void SoundBlocks::compileVolume(Compiler *compiler)
+{
+    compiler->addFunctionCall(&volume);
+}
+
 unsigned int SoundBlocks::changeVolumeBy(VirtualMachine *vm)
 {
     if (Target *target = vm->target())
@@ -50,3 +56,13 @@ unsigned int SoundBlocks::setVolumeTo(VirtualMachine *vm)
 
     return 1;
 }
+
+unsigned int SoundBlocks::volume(VirtualMachine *vm)
+{
+    if (Target *target = vm->target())
+        vm->addReturnValue(target->volume());
+    else
+        vm->addReturnValue(0);
+
+    return 0;
+}

src/blocks/soundblocks.h

@@ -32,9 +32,11 @@ class SoundBlocks : public IBlockSection
 
         static void compileChangeVolumeBy(Compiler *compiler);
         static void compileSetVolumeTo(Compiler *compiler);
+        static void compileVolume(Compiler *compiler);
 
         static unsigned int changeVolumeBy(VirtualMachine *vm);
         static unsigned int setVolumeTo(VirtualMachine *vm);
+        static unsigned int volume(VirtualMachine *vm);
 };
 
 } // namespace libscratchcpp

test/blocks/sound_blocks_test.cpp

@@ -96,6 +96,7 @@ TEST_F(SoundBlocksTest, RegisterBlocks)
     // Blocks
     EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "sound_changevolumeby", &SoundBlocks::compileChangeVolumeBy));
     EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "sound_setvolumeto", &SoundBlocks::compileSetVolumeTo));
+    EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "sound_volume", &SoundBlocks::compileVolume));
 
     // Inputs
     EXPECT_CALL(m_engineMock, addInput(m_section.get(), "VOLUME", SoundBlocks::VOLUME));
@@ -198,3 +199,38 @@ TEST_F(SoundBlocksTest, SetVolumeToImpl)
     ASSERT_EQ(vm.registerCount(), 0);
     ASSERT_EQ(target.volume(), 43.409);
 }
+
+TEST_F(SoundBlocksTest, Volume)
+{
+    Compiler compiler(&m_engineMock);
+
+    auto block = std::make_shared<Block>("a", "sound_volume");
+
+    EXPECT_CALL(m_engineMock, functionIndex(&SoundBlocks::volume)).WillOnce(Return(0));
+
+    compiler.init();
+    compiler.setBlock(block);
+    SoundBlocks::compileVolume(&compiler);
+    compiler.end();
+
+    ASSERT_EQ(compiler.bytecode(), std::vector<unsigned int>({ vm::OP_START, vm::OP_EXEC, 0, vm::OP_HALT }));
+    ASSERT_TRUE(compiler.constValues().empty());
+}
+
+TEST_F(SoundBlocksTest, VolumeImpl)
+{
+    static unsigned int bytecode[] = { vm::OP_START, vm::OP_EXEC, 0, vm::OP_HALT };
+    static BlockFunc functions[] = { &SoundBlocks::volume };
+
+    Target target;
+    target.setVolume(42.4);
+
+    VirtualMachine vm(&target, nullptr, nullptr);
+
+    vm.setBytecode(bytecode);
+    vm.setFunctions(functions);
+    vm.run();
+
+    ASSERT_EQ(vm.registerCount(), 1);
+    ASSERT_EQ(vm.getInput(0, 1)->toDouble(), 42.4);
+}