Update libscratchcpp to latest master

Author: adazem009

libscratchcpp

@@ -74,8 +74,6 @@ qt_add_qml_module(scratchcpp-render
     cputexturemanager.h
     effecttransform.cpp
     effecttransform.h
-	blocks/penextension.cpp
-	blocks/penextension.h
 	blocks/penblocks.cpp
 	blocks/penblocks.h
 )

src/CMakeLists.txt

@@ -26,7 +26,12 @@ const std::unordered_map<std::string, PenBlocks::ColorParam>
 
 std::string PenBlocks::name() const
 {
-    return "Pen";
+    return "pen";
+}
+
+std::string PenBlocks::description() const
+{
+    return "Pen blocks";
 }
 
 void PenBlocks::registerBlocks(IEngine *engine)

src/blocks/penblocks.cpp

@@ -3,15 +3,15 @@
 #pragma once
 
 #include <QColor>
-#include <scratchcpp/iblocksection.h>
+#include <scratchcpp/iextension.h>
 
 namespace scratchcpprender
 {
 
 class SpriteModel;
 class PenState;
 
-class PenBlocks : public libscratchcpp::IBlockSection
+class PenBlocks : public libscratchcpp::IExtension
 {
     public:
         enum Inputs
@@ -25,6 +25,7 @@ class PenBlocks : public libscratchcpp::IBlockSection
         };
 
         std::string name() const override;
+        std::string description() const override;
 
         void registerBlocks(libscratchcpp::IEngine *engine) override;
 

src/blocks/penblocks.h

@@ -12,8 +12,8 @@ ListMonitorModel::ListMonitorModel(QObject *parent) :
 {
 }
 
-ListMonitorModel::ListMonitorModel(libscratchcpp::IBlockSection *section, QObject *parent) :
-    MonitorModel(section, parent)
+ListMonitorModel::ListMonitorModel(libscratchcpp::IExtension *extension, QObject *parent) :
+    MonitorModel(extension, parent)
 {
     m_listModel = new ListMonitorListModel(this);
 }

src/blocks/penextension.cpp

@@ -21,7 +21,7 @@ class ListMonitorModel : public MonitorModel
 
     public:
         ListMonitorModel(QObject *parent = nullptr);
-        ListMonitorModel(libscratchcpp::IBlockSection *section, QObject *parent = nullptr);
+        ListMonitorModel(libscratchcpp::IExtension *extension, QObject *parent = nullptr);
 
         void onValueChanged(const libscratchcpp::VirtualMachine *vm) override;
 

src/blocks/penextension.h

@@ -2,7 +2,7 @@
 
 #include <scratchcpp/monitor.h>
 #include <scratchcpp/sprite.h>
-#include <scratchcpp/iblocksection.h>
+#include <scratchcpp/iextension.h>
 
 #include "monitormodel.h"
 
@@ -13,14 +13,14 @@ MonitorModel::MonitorModel(QObject *parent) :
 {
 }
 
-MonitorModel::MonitorModel(libscratchcpp::IBlockSection *section, QObject *parent) :
+MonitorModel::MonitorModel(libscratchcpp::IExtension *extension, QObject *parent) :
     QObject(parent)
 {
-    if (!section)
+    if (!extension)
         return;
 
-    // TODO: Get the color from the block section
-    std::string name = section->name();
+    // TODO: Get the color from the extension
+    std::string name = extension->name();
     if (name == "Motion")
         m_color = QColor::fromString("#4C97FF");
     else if (name == "Looks")
@@ -69,6 +69,14 @@ void MonitorModel::onVisibleChanged(bool visible)
     emit visibleChanged();
 }
 
+void MonitorModel::onXChanged(int x)
+{
+}
+
+void MonitorModel::onYChanged(int y)
+{
+}
+
 libscratchcpp::Monitor *MonitorModel::monitor() const
 {
     return m_monitor;

src/listmonitormodel.cpp

@@ -10,7 +10,7 @@
 namespace libscratchcpp
 {
 
-class IBlockSection;
+class IExtension;
 
 }
 
@@ -43,12 +43,14 @@ class MonitorModel
         Q_ENUM(Type)
 
         MonitorModel(QObject *parent = nullptr);
-        MonitorModel(libscratchcpp::IBlockSection *section, QObject *parent = nullptr);
+        MonitorModel(libscratchcpp::IExtension *extension, QObject *parent = nullptr);
 
         void init(libscratchcpp::Monitor *monitor) override final;
 
         virtual void onValueChanged(const libscratchcpp::VirtualMachine *vm) override { }
         void onVisibleChanged(bool visible) override final;
+        void onXChanged(int x) override final;
+        void onYChanged(int y) override final;
 
         libscratchcpp::Monitor *monitor() const;