Move PenState out from pen blocks

Author: adazem009

src/CMakeLists.txt

@@ -55,6 +55,7 @@ qt_add_qml_module(scratchcpp-render
 	penlayerpainter.cpp
 	penlayerpainter.h
 	penattributes.h
+	penstate.h
 	blocks/penextension.cpp
 	blocks/penextension.h
 	blocks/penblocks.cpp

src/blocks/penblocks.cpp

@@ -5,6 +5,7 @@
 
 #include "penblocks.h"
 #include "penlayer.h"
+#include "penstate.h"
 #include "spritemodel.h"
 
 using namespace scratchcpprender;
@@ -188,7 +189,8 @@ SpriteModel *PenBlocks::getSpriteModel(libscratchcpp::VirtualMachine *vm)
 
 void PenBlocks::setOrChangeColorParam(PenAttributes &penAttributes, ColorParam param, double value, bool change)
 {
-    PenState penState(penAttributes.color);
+    PenState penState;
+    penState.setColor(penAttributes.color);
 
     switch (param) {
         case ColorParam::COLOR:

src/blocks/penblocks.h

@@ -42,23 +42,6 @@ class PenBlocks : public libscratchcpp::IBlockSection
         static unsigned int changePenHueBy(libscratchcpp::VirtualMachine *vm);
 
     private:
-        struct PenState
-        {
-                PenState(const QColor &color)
-                {
-                    QColor hsvColor = color.toHsv();
-                    this->color = hsvColor.hue() * 100 / 360.0;
-                    this->saturation = hsvColor.saturationF() * 100;
-                    this->brightness = hsvColor.valueF() * 100;
-                    this->transparency = 100 * (1 - hsvColor.alphaF());
-                }
-
-                double color = 0;
-                double saturation = 0;
-                double brightness = 0;
-                double transparency = 0;
-        };
-
         enum class ColorParam
         {
             COLOR

src/penstate.h

@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+#pragma once
+
+#include <QColor>
+
+#include "penattributes.h"
+
+namespace scratchcpprender
+{
+
+struct PenState
+{
+        bool penDown = false;
+        double color = 66.66;
+        double saturation = 100;
+        double brightness = 100;
+        double transparency = 0;
+        double shade = 50; // for legacy blocks
+        PenAttributes penAttributes;
+
+        void setColor(const QColor &color)
+        {
+            QColor hsvColor = color.toHsv();
+            this->color = hsvColor.hue() * 100 / 360.0;
+            this->saturation = hsvColor.saturationF() * 100;
+            this->brightness = hsvColor.valueF() * 100;
+            this->transparency = 100 * (1 - hsvColor.alphaF());
+        }
+};
+
+} // namespace scratchcpprender

test/CMakeLists.txt

@@ -32,6 +32,7 @@ add_subdirectory(monitor_models)
 add_subdirectory(texture)
 add_subdirectory(skins)
 add_subdirectory(penattributes)
+add_subdirectory(penstate)
 add_subdirectory(penlayer)
 add_subdirectory(penlayerpainter)
 add_subdirectory(blocks)

test/penstate/CMakeLists.txt

@@ -0,0 +1,14 @@
+add_executable(
+  penstate_test
+  penstate_test.cpp
+)
+
+target_link_libraries(
+  penstate_test
+  GTest::gtest_main
+  scratchcpp-render
+  qnanopainter
+)
+
+add_test(penstate_test)
+gtest_discover_tests(penstate_test)

test/penstate/penstate_test.cpp

@@ -0,0 +1,33 @@
+#include <penstate.h>
+
+#include "../common.h"
+
+using namespace scratchcpprender;
+
+TEST(PenStateTest, DefaultPenState)
+{
+    PenState state;
+    ASSERT_FALSE(state.penDown);
+    ASSERT_EQ(state.color, 66.66);
+    ASSERT_EQ(state.saturation, 100);
+    ASSERT_EQ(state.brightness, 100);
+    ASSERT_EQ(state.transparency, 0);
+    ASSERT_EQ(state.shade, 50);
+
+    PenAttributes defaultAttributes;
+    ASSERT_EQ(state.penAttributes.color, defaultAttributes.color);
+    ASSERT_EQ(state.penAttributes.diameter, defaultAttributes.diameter);
+}
+
+TEST(PenStateTest, SetColor)
+{
+    PenState state;
+    QColor color(64, 20, 189, 167);
+    state.setColor(color);
+    ASSERT_FALSE(state.penDown);
+    ASSERT_EQ(std::round(state.color * 100) / 100, 70.83);
+    ASSERT_EQ(std::round(state.saturation * 100) / 100, 89.42);
+    ASSERT_EQ(std::round(state.brightness * 100) / 100, 74.12);
+    ASSERT_EQ(std::round(state.transparency * 100) / 100, 34.51);
+    ASSERT_EQ(state.shade, 50);
+}