Add color() method to extensions

adazem009 · adazem009 · commit 5d6f27351502 · 2025-01-26T17:33:49.000+01:00
Resolves: #582
diff --git a/include/scratchcpp/iextension.h b/include/scratchcpp/iextension.h
@@ -2,9 +2,7 @@
 
 #pragma once
 
-#include <string>
-
-#include "global.h"
+#include "value_functions.h"
 
 namespace libscratchcpp
 {
@@ -27,6 +25,9 @@ class LIBSCRATCHCPP_EXPORT IExtension
         /*! Returns the description of the extension. */
         virtual std::string description() const = 0;
 
+        /*! Returns the block color of the extension. */
+        virtual Rgb color() const = 0;
+
         /*! Override this method to register blocks. */
         virtual void registerBlocks(IEngine *engine) = 0;
 
diff --git a/src/blocks/controlblocks.cpp b/src/blocks/controlblocks.cpp
@@ -25,6 +25,11 @@ std::string ControlBlocks::description() const
     return name() + " blocks";
 }
 
+Rgb ControlBlocks::color() const
+{
+    return rgb(255, 171, 25);
+}
+
 void ControlBlocks::registerBlocks(IEngine *engine)
 {
     // Blocks
diff --git a/src/blocks/controlblocks.h b/src/blocks/controlblocks.h
@@ -43,6 +43,7 @@ class ControlBlocks : public IExtension
 
         std::string name() const override;
         std::string description() const override;
+        Rgb color() const override;
 
         void registerBlocks(IEngine *engine) override;
 
diff --git a/src/blocks/customblocks.cpp b/src/blocks/customblocks.cpp
@@ -20,6 +20,11 @@ std::string CustomBlocks::description() const
     return name();
 }
 
+Rgb CustomBlocks::color() const
+{
+    return rgb(255, 102, 128);
+}
+
 void CustomBlocks::registerBlocks(IEngine *engine)
 {
     // Blocks
diff --git a/src/blocks/customblocks.h b/src/blocks/customblocks.h
@@ -24,6 +24,7 @@ class CustomBlocks : public IExtension
 
         std::string name() const override;
         std::string description() const override;
+        Rgb color() const override;
 
         void registerBlocks(IEngine *engine) override;
 
diff --git a/src/blocks/eventblocks.cpp b/src/blocks/eventblocks.cpp
@@ -30,6 +30,11 @@ std::string libscratchcpp::EventBlocks::description() const
     return "Event blocks";
 }
 
+Rgb EventBlocks::color() const
+{
+    return rgb(255, 191, 0);
+}
+
 void EventBlocks::registerBlocks(IEngine *engine)
 {
     // Blocks
diff --git a/src/blocks/eventblocks.h b/src/blocks/eventblocks.h
@@ -38,6 +38,7 @@ class EventBlocks : public IExtension
 
         std::string name() const override;
         std::string description() const override;
+        Rgb color() const override;
 
         void registerBlocks(IEngine *engine) override;
 
diff --git a/src/blocks/listblocks.cpp b/src/blocks/listblocks.cpp
@@ -23,6 +23,11 @@ std::string ListBlocks::description() const
     return "List blocks";
 }
 
+Rgb ListBlocks::color() const
+{
+    return rgb(255, 102, 26);
+}
+
 void ListBlocks::registerBlocks(IEngine *engine)
 {
     // Blocks
diff --git a/src/blocks/listblocks.h b/src/blocks/listblocks.h
@@ -28,6 +28,7 @@ class ListBlocks : public IExtension
 
         std::string name() const override;
         std::string description() const override;
+        Rgb color() const override;
 
         void registerBlocks(IEngine *engine) override;
 
diff --git a/src/blocks/looksblocks.cpp b/src/blocks/looksblocks.cpp
@@ -42,6 +42,11 @@ std::string LooksBlocks::description() const
     return name() + " blocks";
 }
 
+Rgb LooksBlocks::color() const
+{
+    return rgb(153, 102, 255);
+}
+
 void LooksBlocks::registerBlocks(IEngine *engine)
 {
     // Blocks
diff --git a/src/blocks/looksblocks.h b/src/blocks/looksblocks.h
@@ -60,6 +60,7 @@ class LooksBlocks : public IExtension
 
         std::string name() const override;
         std::string description() const override;
+        Rgb color() const override;
 
         void registerBlocks(IEngine *engine) override;
         void onInit(IEngine *engine) override;
diff --git a/src/blocks/motionblocks.cpp b/src/blocks/motionblocks.cpp
@@ -29,6 +29,11 @@ std::string MotionBlocks::description() const
     return name() + " blocks";
 }
 
+Rgb MotionBlocks::color() const
+{
+    return rgb(76, 151, 255);
+}
+
 void MotionBlocks::registerBlocks(IEngine *engine)
 {
     // Blocks
diff --git a/src/blocks/motionblocks.h b/src/blocks/motionblocks.h
@@ -45,6 +45,7 @@ class MotionBlocks : public IExtension
 
         std::string name() const override;
         std::string description() const override;
+        Rgb color() const override;
 
         void registerBlocks(IEngine *engine) override;
         void onInit(IEngine *engine) override;
diff --git a/src/blocks/operatorblocks.cpp b/src/blocks/operatorblocks.cpp
@@ -18,6 +18,11 @@ std::string OperatorBlocks::description() const
     return "Operator blocks";
 }
 
+Rgb OperatorBlocks::color() const
+{
+    return rgb(89, 192, 89);
+}
+
 void OperatorBlocks::registerBlocks(IEngine *engine)
 {
     // Blocks
diff --git a/src/blocks/operatorblocks.h b/src/blocks/operatorblocks.h
@@ -55,6 +55,7 @@ class OperatorBlocks : public IExtension
 
         std::string name() const override;
         std::string description() const override;
+        Rgb color() const override;
 
         void registerBlocks(IEngine *engine) override;
 
diff --git a/src/blocks/sensingblocks.cpp b/src/blocks/sensingblocks.cpp
@@ -34,6 +34,11 @@ std::string SensingBlocks::description() const
     return name() + " blocks";
 }
 
+Rgb SensingBlocks::color() const
+{
+    return rgb(92, 177, 214);
+}
+
 void SensingBlocks::registerBlocks(IEngine *engine)
 {
     // Blocks
diff --git a/src/blocks/sensingblocks.h b/src/blocks/sensingblocks.h
@@ -60,6 +60,7 @@ class SensingBlocks : public IExtension
 
         std::string name() const override;
         std::string description() const override;
+        Rgb color() const override;
 
         void registerBlocks(IEngine *engine) override;
         void onInit(IEngine *engine) override;
diff --git a/src/blocks/soundblocks.cpp b/src/blocks/soundblocks.cpp
@@ -34,6 +34,11 @@ std::string SoundBlocks::description() const
     return name() + " blocks";
 }
 
+Rgb SoundBlocks::color() const
+{
+    return rgb(207, 99, 207);
+}
+
 void SoundBlocks::registerBlocks(IEngine *engine)
 {
     // Blocks
diff --git a/src/blocks/soundblocks.h b/src/blocks/soundblocks.h
@@ -37,6 +37,7 @@ class SoundBlocks : public IExtension
 
         std::string name() const override;
         std::string description() const override;
+        Rgb color() const override;
 
         void registerBlocks(IEngine *engine) override;
         void onInit(IEngine *engine) override;
diff --git a/src/blocks/variableblocks.cpp b/src/blocks/variableblocks.cpp
@@ -23,6 +23,11 @@ std::string VariableBlocks::description() const
     return "Variable blocks";
 }
 
+Rgb VariableBlocks::color() const
+{
+    return rgb(255, 140, 26);
+}
+
 void VariableBlocks::registerBlocks(IEngine *engine)
 {
     // Blocks
diff --git a/src/blocks/variableblocks.h b/src/blocks/variableblocks.h
@@ -27,6 +27,7 @@ class VariableBlocks : public IExtension
 
         std::string name() const override;
         std::string description() const override;
+        Rgb color() const override;
 
         void registerBlocks(IEngine *engine) override;
 
diff --git a/src/dev/blocks/controlblocks.cpp b/src/dev/blocks/controlblocks.cpp
@@ -26,6 +26,11 @@ std::string ControlBlocks::description() const
     return name() + " blocks";
 }
 
+Rgb ControlBlocks::color() const
+{
+    return rgb(255, 171, 25);
+}
+
 void ControlBlocks::registerBlocks(IEngine *engine)
 {
     engine->addCompileFunction(this, "control_forever", &compileForever);
diff --git a/src/dev/blocks/controlblocks.h b/src/dev/blocks/controlblocks.h
@@ -12,6 +12,7 @@ class ControlBlocks : public IExtension
     public:
         std::string name() const override;
         std::string description() const override;
+        Rgb color() const override;
 
         void registerBlocks(IEngine *engine) override;
 
diff --git a/src/dev/blocks/customblocks.cpp b/src/dev/blocks/customblocks.cpp
@@ -20,6 +20,11 @@ std::string CustomBlocks::description() const
     return name();
 }
 
+Rgb CustomBlocks::color() const
+{
+    return rgb(255, 102, 128);
+}
+
 void CustomBlocks::registerBlocks(IEngine *engine)
 {
     engine->addCompileFunction(this, "procedures_definition", [](Compiler *) -> CompilerValue * { return nullptr; });
diff --git a/src/dev/blocks/customblocks.h b/src/dev/blocks/customblocks.h
@@ -12,6 +12,7 @@ class CustomBlocks : public IExtension
     public:
         std::string name() const override;
         std::string description() const override;
+        Rgb color() const override;
 
         void registerBlocks(IEngine *engine) override;
 
diff --git a/src/dev/blocks/eventblocks.cpp b/src/dev/blocks/eventblocks.cpp
@@ -24,6 +24,11 @@ std::string libscratchcpp::EventBlocks::description() const
     return "Event blocks";
 }
 
+Rgb EventBlocks::color() const
+{
+    return rgb(255, 191, 0);
+}
+
 void EventBlocks::registerBlocks(IEngine *engine)
 {
     engine->addCompileFunction(this, "event_whentouchingobject", &compileWhenTouchingObject);
diff --git a/src/dev/blocks/eventblocks.h b/src/dev/blocks/eventblocks.h
@@ -12,6 +12,7 @@ class EventBlocks : public IExtension
     public:
         std::string name() const override;
         std::string description() const override;
+        Rgb color() const override;
 
         void registerBlocks(IEngine *engine) override;
 
diff --git a/src/dev/blocks/listblocks.cpp b/src/dev/blocks/listblocks.cpp
@@ -20,6 +20,11 @@ std::string ListBlocks::description() const
     return "List blocks";
 }
 
+Rgb ListBlocks::color() const
+{
+    return rgb(255, 102, 26);
+}
+
 void ListBlocks::registerBlocks(IEngine *engine)
 {
     engine->addCompileFunction(this, "data_addtolist", &compileAddToList);
diff --git a/src/dev/blocks/listblocks.h b/src/dev/blocks/listblocks.h
@@ -14,6 +14,7 @@ class ListBlocks : public IExtension
     public:
         std::string name() const override;
         std::string description() const override;
+        Rgb color() const override;
 
         void registerBlocks(IEngine *engine) override;
 
diff --git a/src/dev/blocks/looksblocks.cpp b/src/dev/blocks/looksblocks.cpp
@@ -14,6 +14,11 @@ std::string LooksBlocks::description() const
     return name() + " blocks";
 }
 
+Rgb LooksBlocks::color() const
+{
+    return rgb(153, 102, 255);
+}
+
 void LooksBlocks::registerBlocks(IEngine *engine)
 {
 }
diff --git a/src/dev/blocks/looksblocks.h b/src/dev/blocks/looksblocks.h
@@ -12,6 +12,7 @@ class LooksBlocks : public IExtension
     public:
         std::string name() const override;
         std::string description() const override;
+        Rgb color() const override;
 
         void registerBlocks(IEngine *engine) override;
 };
diff --git a/src/dev/blocks/motionblocks.cpp b/src/dev/blocks/motionblocks.cpp
@@ -14,6 +14,11 @@ std::string MotionBlocks::description() const
     return name() + " blocks";
 }
 
+Rgb MotionBlocks::color() const
+{
+    return rgb(76, 151, 255);
+}
+
 void MotionBlocks::registerBlocks(IEngine *engine)
 {
 }
diff --git a/src/dev/blocks/motionblocks.h b/src/dev/blocks/motionblocks.h
@@ -12,6 +12,7 @@ class MotionBlocks : public IExtension
     public:
         std::string name() const override;
         std::string description() const override;
+        Rgb color() const override;
 
         void registerBlocks(IEngine *engine) override;
 };
diff --git a/src/dev/blocks/operatorblocks.cpp b/src/dev/blocks/operatorblocks.cpp
@@ -21,6 +21,11 @@ std::string OperatorBlocks::description() const
     return "Operator blocks";
 }
 
+Rgb OperatorBlocks::color() const
+{
+    return rgb(89, 192, 89);
+}
+
 void OperatorBlocks::registerBlocks(IEngine *engine)
 {
     engine->addCompileFunction(this, "operator_add", &compileAdd);
diff --git a/src/dev/blocks/operatorblocks.h b/src/dev/blocks/operatorblocks.h
@@ -14,6 +14,7 @@ class OperatorBlocks : public IExtension
     public:
         std::string name() const override;
         std::string description() const override;
+        Rgb color() const override;
 
         void registerBlocks(IEngine *engine) override;
 
diff --git a/src/dev/blocks/sensingblocks.cpp b/src/dev/blocks/sensingblocks.cpp
@@ -14,6 +14,11 @@ std::string SensingBlocks::description() const
     return name() + " blocks";
 }
 
+Rgb SensingBlocks::color() const
+{
+    return rgb(92, 177, 214);
+}
+
 void SensingBlocks::registerBlocks(IEngine *engine)
 {
 }
diff --git a/src/dev/blocks/sensingblocks.h b/src/dev/blocks/sensingblocks.h
@@ -12,6 +12,7 @@ class SensingBlocks : public IExtension
     public:
         std::string name() const override;
         std::string description() const override;
+        Rgb color() const override;
 
         void registerBlocks(IEngine *engine) override;
 };
diff --git a/src/dev/blocks/soundblocks.cpp b/src/dev/blocks/soundblocks.cpp
@@ -14,6 +14,11 @@ std::string SoundBlocks::description() const
     return name() + " blocks";
 }
 
+Rgb SoundBlocks::color() const
+{
+    return rgb(207, 99, 207);
+}
+
 void SoundBlocks::registerBlocks(IEngine *engine)
 {
 }
diff --git a/src/dev/blocks/soundblocks.h b/src/dev/blocks/soundblocks.h
diff --git a/src/dev/blocks/variableblocks.cpp b/src/dev/blocks/variableblocks.cpp
diff --git a/src/dev/blocks/variableblocks.h b/src/dev/blocks/variableblocks.h
diff --git a/test/compiler/testextension.cpp b/test/compiler/testextension.cpp
diff --git a/test/compiler/testextension.h b/test/compiler/testextension.h
diff --git a/test/dev/test_api/testextension.cpp b/test/dev/test_api/testextension.cpp
diff --git a/test/dev/test_api/testextension.h b/test/dev/test_api/testextension.h
diff --git a/test/extensions/testextension.cpp b/test/extensions/testextension.cpp
diff --git a/test/extensions/testextension.h b/test/extensions/testextension.h
diff --git a/test/mocks/extensionmock.h b/test/mocks/extensionmock.h
diff --git a/test/scratch_classes/testextension.cpp b/test/scratch_classes/testextension.cpp
diff --git a/test/scratch_classes/testextension.h b/test/scratch_classes/testextension.h
diff --git a/test/scratchconfiguration/extension1.cpp b/test/scratchconfiguration/extension1.cpp
diff --git a/test/scratchconfiguration/extension1.h b/test/scratchconfiguration/extension1.h
diff --git a/test/scratchconfiguration/extension2.cpp b/test/scratchconfiguration/extension2.cpp
diff --git a/test/scratchconfiguration/extension2.h b/test/scratchconfiguration/extension2.h
diff --git a/test/scratchconfiguration/extension3.cpp b/test/scratchconfiguration/extension3.cpp
diff --git a/test/scratchconfiguration/extension3.h b/test/scratchconfiguration/extension3.h

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,11 @@ std::string ControlBlocks::description() const`
`25`	`25`	`return name() + " blocks";`
`26`	`26`	`}`
`27`	`27`
	`28`	`+Rgb ControlBlocks::color() const`
	`29`	`+{`
	`30`	`+ return rgb(255, 171, 25);`
	`31`	`+}`
	`32`	`+`
`28`	`33`	`void ControlBlocks::registerBlocks(IEngine *engine)`
`29`	`34`	`{`
`30`	`35`	`// Blocks`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,11 @@ std::string CustomBlocks::description() const`
`20`	`20`	`return name();`
`21`	`21`	`}`
`22`	`22`
	`23`	`+Rgb CustomBlocks::color() const`
	`24`	`+{`
	`25`	`+ return rgb(255, 102, 128);`
	`26`	`+}`
	`27`	`+`
`23`	`28`	`void CustomBlocks::registerBlocks(IEngine *engine)`
`24`	`29`	`{`
`25`	`30`	`// Blocks`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,11 @@ std::string libscratchcpp::EventBlocks::description() const`
`30`	`30`	`return "Event blocks";`
`31`	`31`	`}`
`32`	`32`
	`33`	`+Rgb EventBlocks::color() const`
	`34`	`+{`
	`35`	`+ return rgb(255, 191, 0);`
	`36`	`+}`
	`37`	`+`
`33`	`38`	`void EventBlocks::registerBlocks(IEngine *engine)`
`34`	`39`	`{`
`35`	`40`	`// Blocks`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,11 @@ std::string ListBlocks::description() const`
`23`	`23`	`return "List blocks";`
`24`	`24`	`}`
`25`	`25`
	`26`	`+Rgb ListBlocks::color() const`
	`27`	`+{`
	`28`	`+ return rgb(255, 102, 26);`
	`29`	`+}`
	`30`	`+`
`26`	`31`	`void ListBlocks::registerBlocks(IEngine *engine)`
`27`	`32`	`{`
`28`	`33`	`// Blocks`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,11 @@ std::string LooksBlocks::description() const`
`42`	`42`	`return name() + " blocks";`
`43`	`43`	`}`
`44`	`44`
	`45`	`+Rgb LooksBlocks::color() const`
	`46`	`+{`
	`47`	`+ return rgb(153, 102, 255);`
	`48`	`+}`
	`49`	`+`
`45`	`50`	`void LooksBlocks::registerBlocks(IEngine *engine)`
`46`	`51`	`{`
`47`	`52`	`// Blocks`