Use pointer type for graphic effects in looks blocks

Author: adazem009

src/blocks/looksblocks.cpp

@@ -18,12 +18,6 @@
 
 using namespace libscratchcpp;
 
-LooksBlocks::~LooksBlocks()
-{
-    if (m_engine)
-        m_instances.erase(m_engine);
-}
-
 std::string LooksBlocks::name() const
 {
     return "Looks";
@@ -78,9 +72,6 @@ void LooksBlocks::onInit(IEngine *engine)
             target->clearGraphicsEffects();
         }
     });
-
-    m_engine = engine;
-    m_instances[engine] = this;
 }
 
 void LooksBlocks::compileSayOrThinkForSecs(Compiler *compiler, const std::string function)
@@ -98,28 +89,15 @@ void LooksBlocks::compileSayOrThinkForSecs(Compiler *compiler, const std::string
     compiler->endLoop();
 }
 
-long LooksBlocks::getEffectIndex(IEngine *engine, const std::string &name)
+void LooksBlocks::compileSetOrChangeEffect(Compiler *compiler, const std::string &function, const std::string &effectName, CompilerValue *arg)
 {
-    assert(engine);
-    assert(m_instances.find(engine) != m_instances.cend());
+    IGraphicsEffect *effect = ScratchConfiguration::getGraphicsEffect(effectName);
 
-    LooksBlocks *instance = m_instances[engine];
-    auto it = instance->m_effectMap.find(name);
-
-    if (it == instance->m_effectMap.cend()) {
-        IGraphicsEffect *effect = ScratchConfiguration::getGraphicsEffect(name);
-
-        if (effect) {
-            instance->m_effects.push_back(effect);
-            instance->m_effectMap[name] = instance->m_effects.size() - 1;
-            return instance->m_effects.size() - 1;
-        } else {
-            std::cout << "warning: graphic effect '" << name << "' is not registered" << std::endl;
-            return -1;
-        }
-    }
-
-    return it->second;
+    if (effect) {
+        CompilerValue *effectPtr = compiler->addConstValue(effect);
+        compiler->addTargetFunctionCall(function, Compiler::StaticType::Void, { Compiler::StaticType::Pointer, Compiler::StaticType::Number }, { effectPtr, arg });
+    } else
+        std::cout << "warning: graphic effect '" << effectName << "' is not registered" << std::endl;
 }
 
 CompilerValue *LooksBlocks::compileSayForSecs(Compiler *compiler)
@@ -173,14 +151,8 @@ CompilerValue *LooksBlocks::compileChangeEffectBy(Compiler *compiler)
     if (!field)
         return nullptr;
 
-    auto index = getEffectIndex(compiler->engine(), field->value().toString());
-
-    if (index != -1) {
-        auto indexValue = compiler->addConstValue(index);
-        auto change = compiler->addInput("CHANGE");
-        compiler->addTargetFunctionCall("looks_changeeffectby", Compiler::StaticType::Void, { Compiler::StaticType::Number, Compiler::StaticType::Number }, { indexValue, change });
-    }
-
+    CompilerValue *change = compiler->addInput("CHANGE");
+    compileSetOrChangeEffect(compiler, "looks_changeeffectby", field->value().toString(), change);
     return nullptr;
 }
 
@@ -191,14 +163,8 @@ CompilerValue *LooksBlocks::compileSetEffectTo(Compiler *compiler)
     if (!field)
         return nullptr;
 
-    auto index = getEffectIndex(compiler->engine(), field->value().toString());
-
-    if (index != -1) {
-        auto indexValue = compiler->addConstValue(index);
-        auto value = compiler->addInput("VALUE");
-        compiler->addTargetFunctionCall("looks_seteffectto", Compiler::StaticType::Void, { Compiler::StaticType::Number, Compiler::StaticType::Number }, { indexValue, value });
-    }
-
+    CompilerValue *change = compiler->addInput("VALUE");
+    compileSetOrChangeEffect(compiler, "looks_seteffectto", field->value().toString(), change);
     return nullptr;
 }
 
@@ -290,15 +256,14 @@ extern "C" void looks_hide(Sprite *sprite)
     sprite->setVisible(false);
 }
 
-extern "C" void looks_changeeffectby(Target *target, double index, double change)
+extern "C" void looks_changeeffectby(Target *target, IGraphicsEffect *effect, double change)
 {
-    IGraphicsEffect *effect = LooksBlocks::getEffect(target->engine(), index);
     target->setGraphicsEffectValue(effect, target->graphicsEffectValue(effect) + change);
 }
 
-extern "C" void looks_seteffectto(Target *target, double index, double value)
+extern "C" void looks_seteffectto(Target *target, IGraphicsEffect *effect, double value)
 {
-    target->setGraphicsEffectValue(LooksBlocks::getEffect(target->engine(), index), value);
+    target->setGraphicsEffectValue(effect, value);
 }
 
 extern "C" void looks_cleargraphiceffects(Target *target)

src/blocks/looksblocks.h

@@ -16,20 +16,16 @@ class IGraphicsEffect;
 class LooksBlocks : public IExtension
 {
     public:
-        ~LooksBlocks();
-
         std::string name() const override;
         std::string description() const override;
         Rgb color() const override;
 
         void registerBlocks(IEngine *engine) override;
         void onInit(IEngine *engine) override;
 
-        static inline IGraphicsEffect *getEffect(IEngine *engine, long index) { return m_instances[engine]->m_effects[index]; }
-
     private:
         static void compileSayOrThinkForSecs(Compiler *compiler, const std::string function);
-        static long getEffectIndex(IEngine *engine, const std::string &name);
+        static void compileSetOrChangeEffect(Compiler *compiler, const std::string &function, const std::string &effectName, CompilerValue *arg);
 
         static CompilerValue *compileSayForSecs(Compiler *compiler);
         static CompilerValue *compileSay(Compiler *compiler);
@@ -43,11 +39,6 @@ class LooksBlocks : public IExtension
         static CompilerValue *compileChangeSizeBy(Compiler *compiler);
         static CompilerValue *compileSetSizeTo(Compiler *compiler);
         static CompilerValue *compileSize(Compiler *compiler);
-
-        IEngine *m_engine = nullptr;
-        std::unordered_map<std::string, long> m_effectMap;
-        std::vector<IGraphicsEffect *> m_effects;
-        static inline std::unordered_map<IEngine *, LooksBlocks *> m_instances;
 };
 
 } // namespace libscratchcpp