Implement sound_volume block

Author: adazem009

src/blocks/soundblocks.cpp

@@ -39,6 +39,7 @@ void SoundBlocks::registerBlocks(IEngine *engine)
     engine->addCompileFunction(this, "sound_cleareffects", &compileClearEffects);
     engine->addCompileFunction(this, "sound_changevolumeby", &compileChangeVolumeBy);
     engine->addCompileFunction(this, "sound_setvolumeto", &compileSetVolumeTo);
+    engine->addCompileFunction(this, "sound_volume", &compileVolume);
 }
 
 void SoundBlocks::onInit(IEngine *engine)
@@ -144,6 +145,11 @@ CompilerValue *SoundBlocks::compileSetVolumeTo(Compiler *compiler)
     return nullptr;
 }
 
+CompilerValue *SoundBlocks::compileVolume(Compiler *compiler)
+{
+    return compiler->addTargetFunctionCall("sound_volume", Compiler::StaticType::Number);
+}
+
 int sound_wrap_clamp_index(Target *target, int index)
 {
     const long soundCount = target->sounds().size();
@@ -248,3 +254,8 @@ extern "C" void sound_setvolumeto(Target *target, double volume)
 {
     target->setVolume(volume);
 }
+
+extern "C" double sound_volume(Target *target)
+{
+    return target->volume();
+}

src/blocks/soundblocks.h

@@ -28,6 +28,7 @@ class SoundBlocks : public IExtension
         static CompilerValue *compileClearEffects(Compiler *compiler);
         static CompilerValue *compileChangeVolumeBy(Compiler *compiler);
         static CompilerValue *compileSetVolumeTo(Compiler *compiler);
+        static CompilerValue *compileVolume(Compiler *compiler);
 };
 
 } // namespace libscratchcpp

test/blocks/sound_blocks_test.cpp

@@ -4,6 +4,7 @@
 #include <scratchcpp/compiler.h>
 #include <scratchcpp/script.h>
 #include <scratchcpp/thread.h>
+#include <scratchcpp/list.h>
 #include <scratchcpp/test/scriptbuilder.h>
 #include <scratch/sound_p.h>
 #include <enginemock.h>
@@ -1088,3 +1089,41 @@ TEST_F(SoundBlocksTest, SetVolumeTo_Stage)
     builder.run();
     ASSERT_EQ(stage->volume(), 38.4);
 }
+
+TEST_F(SoundBlocksTest, Volume_Sprite)
+{
+    auto sprite = std::make_shared<Sprite>();
+    sprite->setVolume(50);
+
+    ScriptBuilder builder(m_extension.get(), m_engine, sprite);
+    builder.addBlock("sound_volume");
+    builder.captureBlockReturnValue();
+    builder.build();
+
+    sprite->setVolume(1.9);
+    builder.run();
+    ASSERT_EQ(sprite->volume(), 1.9);
+
+    List *list = builder.capturedValues();
+    ASSERT_EQ(list->size(), 1);
+    ASSERT_EQ(Value(list->data()[0]).toDouble(), 1.9);
+}
+
+TEST_F(SoundBlocksTest, Volume_Stage)
+{
+    auto stage = std::make_shared<Stage>();
+    stage->setVolume(75);
+
+    ScriptBuilder builder(m_extension.get(), m_engine, stage);
+    builder.addBlock("sound_volume");
+    builder.captureBlockReturnValue();
+    builder.build();
+
+    stage->setVolume(43.7);
+    builder.run();
+    ASSERT_EQ(stage->volume(), 43.7);
+
+    List *list = builder.capturedValues();
+    ASSERT_EQ(list->size(), 1);
+    ASSERT_EQ(Value(list->data()[0]).toDouble(), 43.7);
+}