Add target click hat

Author: adazem009

include/scratchcpp/iengine.h

@@ -283,6 +283,9 @@ class LIBSCRATCHCPP_EXPORT IEngine
         /* Registers the given "when key pressed" script. */
         virtual void addKeyPressScript(std::shared_ptr<Block> hatBlock, int fieldId) = 0;
 
+        /* Registers the given "when this sprite/stage clicked" script. */
+        virtual void addTargetClickScript(std::shared_ptr<Block> hatBlock) = 0;
+
         /*! Returns the list of targets. */
         virtual const std::vector<std::shared_ptr<Target>> &targets() const = 0;
 

src/engine/internal/engine.cpp

@@ -34,11 +34,8 @@
 using namespace libscratchcpp;
 
 const std::unordered_map<Engine::HatType, bool> Engine::m_hatRestartExistingThreads = {
-    { HatType::GreenFlag, true },
-    { HatType::BroadcastReceived, true },
-    { HatType::BackdropChanged, true },
-    { HatType::CloneInit, false },
-    { HatType::KeyPressed, false }
+    { HatType::GreenFlag, true },  { HatType::BroadcastReceived, true }, { HatType::BackdropChanged, true },
+    { HatType::CloneInit, false }, { HatType::KeyPressed, false },       { HatType::TargetClicked, true }
 };
 
 Engine::Engine() :
@@ -686,7 +683,7 @@ void Engine::setMousePressed(bool pressed)
 
 void Engine::clickTarget(Target *target)
 {
-    // TODO: Implement this (#92, #93)
+    startHats(HatType::TargetClicked, {}, target);
 }
 
 unsigned int Engine::stageWidth() const
@@ -969,6 +966,11 @@ void Engine::addKeyPressScript(std::shared_ptr<Block> hatBlock, int fieldId)
     addHatField(script, HatField::KeyOption, fieldId);
 }
 
+void Engine::addTargetClickScript(std::shared_ptr<Block> hatBlock)
+{
+    addHatToMap(m_whenTargetClickedHats, m_scripts[hatBlock].get());
+}
+
 const std::vector<std::shared_ptr<Target>> &Engine::targets() const
 {
     return m_targets;
@@ -1354,6 +1356,9 @@ const std::vector<Script *> &Engine::getHats(Target *target, HatType type)
         case HatType::KeyPressed:
             return m_whenKeyPressedHats[target];
 
+        case HatType::TargetClicked:
+            return m_whenTargetClickedHats[target];
+
         default: {
             static const std::vector<Script *> empty = {};
             return empty;

src/engine/internal/engine.h

@@ -120,6 +120,7 @@ class Engine : public IEngine
         void addBackdropChangeScript(std::shared_ptr<Block> hatBlock, int fieldId) override;
         void addCloneInitScript(std::shared_ptr<Block> hatBlock) override;
         void addKeyPressScript(std::shared_ptr<Block> hatBlock, int fieldId) override;
+        void addTargetClickScript(std::shared_ptr<Block> hatBlock) override;
 
         const std::vector<std::shared_ptr<Target>> &targets() const override;
         void setTargets(const std::vector<std::shared_ptr<Target>> &newTargets) override;
@@ -156,7 +157,8 @@ class Engine : public IEngine
             BroadcastReceived,
             BackdropChanged,
             CloneInit,
-            KeyPressed
+            KeyPressed,
+            TargetClicked
         };
 
         enum class HatField
@@ -222,6 +224,7 @@ class Engine : public IEngine
         std::unordered_map<Target *, std::vector<Script *>> m_broadcastHats;
         std::unordered_map<Target *, std::vector<Script *>> m_cloneInitHats;
         std::unordered_map<Target *, std::vector<Script *>> m_whenKeyPressedHats;
+        std::unordered_map<Target *, std::vector<Script *>> m_whenTargetClickedHats;
 
         std::unordered_map<Script *, std::unordered_map<HatField, int>> m_scriptHatFields; // HatField, field ID from the block implementation
 

test/mocks/enginemock.h

@@ -101,6 +101,7 @@ class EngineMock : public IEngine
         MOCK_METHOD(void, addBackdropChangeScript, (std::shared_ptr<Block>, int), (override));
         MOCK_METHOD(void, addCloneInitScript, (std::shared_ptr<Block>), (override));
         MOCK_METHOD(void, addKeyPressScript, (std::shared_ptr<Block>, int), (override));
+        MOCK_METHOD(void, addTargetClickScript, (std::shared_ptr<Block>), (override));
 
         MOCK_METHOD(const std::vector<std::shared_ptr<Target>> &, targets, (), (const, override));
         MOCK_METHOD(void, setTargets, (const std::vector<std::shared_ptr<Target>> &), (override));