Merge pull request #77 from scratchcpp/basic_pen_blocks

Implement basic pen blocks

Author: adazem009

src/CMakeLists.txt

@@ -55,6 +55,10 @@ qt_add_qml_module(scratchcpp-render
 	penlayerpainter.cpp
 	penlayerpainter.h
 	penattributes.h
+	blocks/penextension.cpp
+	blocks/penextension.h
+	blocks/penblocks.cpp
+	blocks/penblocks.h
 )
 
 list(APPEND QML_IMPORT_PATH ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})

src/blocks/penblocks.cpp

@@ -0,0 +1,83 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+#include <scratchcpp/compiler.h>
+#include <scratchcpp/sprite.h>
+
+#include "penblocks.h"
+#include "penlayer.h"
+#include "spritemodel.h"
+
+using namespace scratchcpprender;
+using namespace libscratchcpp;
+
+std::string PenBlocks::name() const
+{
+    return "Pen";
+}
+
+void PenBlocks::registerBlocks(IEngine *engine)
+{
+    // Blocks
+    engine->addCompileFunction(this, "pen_clear", &compileClear);
+    engine->addCompileFunction(this, "pen_penDown", &compilePenDown);
+    engine->addCompileFunction(this, "pen_penUp", &compilePenUp);
+}
+
+void PenBlocks::compileClear(Compiler *compiler)
+{
+    compiler->addFunctionCall(&clear);
+}
+
+void PenBlocks::compilePenDown(Compiler *compiler)
+{
+    compiler->addFunctionCall(&penDown);
+}
+
+void PenBlocks::compilePenUp(Compiler *compiler)
+{
+    compiler->addFunctionCall(&penUp);
+}
+
+unsigned int PenBlocks::clear(VirtualMachine *vm)
+{
+    IPenLayer *penLayer = PenLayer::getProjectPenLayer(vm->engine());
+
+    if (penLayer) {
+        penLayer->clear();
+        vm->engine()->requestRedraw();
+    }
+
+    return 0;
+}
+
+unsigned int PenBlocks::penDown(VirtualMachine *vm)
+{
+    Target *target = vm->target();
+
+    if (!target || target->isStage())
+        return 0;
+
+    Sprite *sprite = static_cast<Sprite *>(target);
+    SpriteModel *model = static_cast<SpriteModel *>(sprite->getInterface());
+
+    if (model)
+        model->setPenDown(true);
+
+    return 0;
+}
+
+unsigned int PenBlocks::penUp(libscratchcpp::VirtualMachine *vm)
+{
+    Target *target = vm->target();
+
+    if (!target || target->isStage())
+        return 0;
+
+    Sprite *sprite = static_cast<Sprite *>(target);
+    SpriteModel *model = static_cast<SpriteModel *>(sprite->getInterface());
+
+    if (model)
+        model->setPenDown(false);
+
+    return 0;
+}

src/blocks/penblocks.h

@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+#pragma once
+
+#include <scratchcpp/iblocksection.h>
+
+namespace scratchcpprender
+{
+
+class PenBlocks : public libscratchcpp::IBlockSection
+{
+    public:
+        enum Inputs
+        {
+        };
+
+        std::string name() const override;
+
+        void registerBlocks(libscratchcpp::IEngine *engine) override;
+
+        static void compileClear(libscratchcpp::Compiler *compiler);
+        static void compilePenDown(libscratchcpp::Compiler *compiler);
+        static void compilePenUp(libscratchcpp::Compiler *compiler);
+
+        static unsigned int clear(libscratchcpp::VirtualMachine *vm);
+        static unsigned int penDown(libscratchcpp::VirtualMachine *vm);
+        static unsigned int penUp(libscratchcpp::VirtualMachine *vm);
+};
+
+} // namespace scratchcpprender

src/blocks/penextension.cpp

@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+#include <scratchcpp/iengine.h>
+
+#include "penextension.h"
+#include "penblocks.h"
+
+using namespace scratchcpprender;
+using namespace libscratchcpp;
+
+std::string PenExtension::name() const
+{
+    return "pen";
+}
+
+std::string PenExtension::description() const
+{
+    return "Pen extension";
+}
+
+void PenExtension::registerSections(IEngine *engine)
+{
+    engine->registerSection(std::make_shared<PenBlocks>());
+}

src/blocks/penextension.h

@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+#pragma once
+
+#include <scratchcpp/iextension.h>
+
+namespace scratchcpprender
+{
+
+class PenExtension : public libscratchcpp::IExtension
+{
+    public:
+        std::string name() const override;
+        std::string description() const override;
+
+        void registerSections(libscratchcpp::IEngine *engine) override;
+};
+
+} // namespace scratchcpprender

src/penlayer.cpp

@@ -47,7 +47,7 @@ void PenLayer::setEngine(libscratchcpp::IEngine *newEngine)
 
     m_engine = newEngine;
 
-    if (m_engine) {
+    if (m_engine && QOpenGLContext::currentContext()) {
         m_projectPenLayers[m_engine] = this;
         m_fbo = std::make_unique<QOpenGLFramebufferObject>(m_engine->stageWidth(), m_engine->stageHeight(), m_fboFormat);
         Q_ASSERT(m_fbo->isValid());
@@ -134,6 +134,11 @@ IPenLayer *PenLayer::getProjectPenLayer(libscratchcpp::IEngine *engine)
     return nullptr;
 }
 
+void PenLayer::addPenLayer(libscratchcpp::IEngine *engine, IPenLayer *penLayer)
+{
+    m_projectPenLayers[engine] = penLayer;
+}
+
 QNanoQuickItemPainter *PenLayer::createItemPainter() const
 {
     return new PenLayerPainter;

src/penlayer.h

@@ -34,6 +34,7 @@ class PenLayer : public IPenLayer
         QOpenGLFramebufferObject *framebufferObject() const override;
 
         static IPenLayer *getProjectPenLayer(libscratchcpp::IEngine *engine);
+        static void addPenLayer(libscratchcpp::IEngine *engine, IPenLayer *penLayer); // for tests
 
     signals:
         void engineChanged();

src/projectloader.cpp

@@ -3,6 +3,7 @@
 #include <scratchcpp/iengine.h>
 #include <scratchcpp/value.h>
 #include <scratchcpp/monitor.h>
+#include <scratchcpp/scratchconfiguration.h>
 #include <QtConcurrent/QtConcurrent>
 #include <QApplication>
 
@@ -11,6 +12,7 @@
 #include "valuemonitormodel.h"
 #include "listmonitormodel.h"
 #include "renderedtarget.h"
+#include "blocks/penextension.h"
 
 using namespace scratchcpprender;
 using namespace libscratchcpp;
@@ -31,6 +33,9 @@ ProjectLoader::ProjectLoader(QObject *parent) :
     });
 
     initTimer();
+
+    // Register pen blocks
+    ScratchConfiguration::registerExtension(std::make_shared<PenExtension>());
 }
 
 ProjectLoader::~ProjectLoader()

src/spritemodel.cpp

@@ -2,6 +2,7 @@
 
 #include <scratchcpp/costume.h>
 #include <scratchcpp/rect.h>
+#include <scratchcpp/iengine.h>
 
 #include "spritemodel.h"
 #include "renderedtarget.h"
@@ -65,8 +66,13 @@ void SpriteModel::onYChanged(double y)
 
 void SpriteModel::onMoved(double oldX, double oldY, double newX, double newY)
 {
-    if (m_penDown && m_penLayer)
+    if (m_penDown && m_penLayer) {
         m_penLayer->drawLine(m_penAttributes, oldX, oldY, newX, newY);
+        libscratchcpp::IEngine *engine = m_sprite->engine();
+
+        if (engine)
+            engine->requestRedraw();
+    }
 }
 
 void SpriteModel::onSizeChanged(double size)
@@ -151,13 +157,15 @@ bool SpriteModel::penDown() const
 
 void SpriteModel::setPenDown(bool newPenDown)
 {
-    if (m_penDown == newPenDown)
-        return;
-
     m_penDown = newPenDown;
 
-    if (m_penDown && m_penLayer && m_sprite)
+    if (m_penDown && m_penLayer && m_sprite) {
         m_penLayer->drawPoint(m_penAttributes, m_sprite->x(), m_sprite->y());
+        libscratchcpp::IEngine *engine = m_sprite->engine();
+
+        if (engine)
+            engine->requestRedraw();
+    }
 }
 
 SpriteModel *SpriteModel::cloneRoot() const

test/CMakeLists.txt

@@ -34,3 +34,4 @@ add_subdirectory(skins)
 add_subdirectory(penattributes)
 add_subdirectory(penlayer)
 add_subdirectory(penlayerpainter)
+add_subdirectory(blocks)