Merge pull request #36 from scratchcpp/rotation_style

Implement rotation style

Author: adazem009

ScratchCPPGui/ProjectPlayer.qml

@@ -41,6 +41,7 @@ ProjectScene {
             id: target
             engine: loader.engine
             spriteModel: modelData
+            transform: Scale { xScale: mirrorHorizontally ? -1 : 1 }
             Component.onCompleted: modelData.renderedTarget = this
         }
     }

ScratchCPPGui/renderedtarget.cpp

@@ -36,16 +36,34 @@ void RenderedTarget::loadProperties()
         m_visible = sprite->visible();
 
         if (m_visible) {
+            // Direction
+            switch (sprite->rotationStyle()) {
+                case Sprite::RotationStyle::AllAround:
+                    m_rotation = sprite->direction() - 90;
+                    m_newMirrorHorizontally = false;
+
+                    break;
+
+                case Sprite::RotationStyle::LeftRight: {
+                    m_rotation = 0;
+                    m_newMirrorHorizontally = (sprite->direction() < 0);
+
+                    break;
+                }
+
+                case Sprite::RotationStyle::DoNotRotate:
+                    m_rotation = 0;
+                    m_newMirrorHorizontally = false;
+                    break;
+            }
+
             // Coordinates
             double size = sprite->size() / 100;
-            m_x = m_engine->stageWidth() / 2 + sprite->x() - m_costume->rotationCenterX() * size / 2;
+            m_x = m_engine->stageWidth() / 2 + sprite->x() - m_costume->rotationCenterX() * size / 2 * (m_newMirrorHorizontally ? -1 : 1);
             m_y = m_engine->stageHeight() / 2 - sprite->y() - m_costume->rotationCenterY() * size / 2;
             m_originX = m_costume->rotationCenterX() * size / 2.0;
             m_originY = m_costume->rotationCenterY() * size / 2.0;
 
-            // Direction
-            m_rotation = sprite->direction() - 90;
-
             // Layer
             m_z = sprite->layerOrder();
         }
@@ -102,6 +120,11 @@ void RenderedTarget::updateProperties()
         setRotation(m_rotation);
         setTransformOriginPoint(QPointF(m_originX, m_originY));
 
+        if (m_newMirrorHorizontally != m_mirrorHorizontally) {
+            m_mirrorHorizontally = m_newMirrorHorizontally;
+            emit mirrorHorizontallyChanged();
+        }
+
         if (m_imageChanged) {
             update();
             m_imageChanged = false;
@@ -199,3 +222,8 @@ const QString &RenderedTarget::bitmapUniqueKey() const
 {
     return m_bitmapUniqueKey;
 }
+
+bool RenderedTarget::mirrorHorizontally() const
+{
+    return m_mirrorHorizontally;
+}

ScratchCPPGui/renderedtarget.h

@@ -30,6 +30,7 @@ class RenderedTarget : public QNanoQuickItem
         Q_PROPERTY(libscratchcpp::IEngine *engine READ engine WRITE setEngine NOTIFY engineChanged)
         Q_PROPERTY(StageModel *stageModel READ stageModel WRITE setStageModel NOTIFY stageModelChanged)
         Q_PROPERTY(SpriteModel *spriteModel READ spriteModel WRITE setSpriteModel NOTIFY spriteModelChanged)
+        Q_PROPERTY(bool mirrorHorizontally READ mirrorHorizontally NOTIFY mirrorHorizontallyChanged)
 
     public:
         RenderedTarget(QNanoQuickItem *parent = nullptr);
@@ -54,11 +55,15 @@ class RenderedTarget : public QNanoQuickItem
         QBuffer *bitmapBuffer();
         const QString &bitmapUniqueKey() const;
 
+        bool mirrorHorizontally() const;
+
     signals:
         void engineChanged();
         void stageModelChanged();
         void spriteModelChanged();
 
+        void mirrorHorizontallyChanged();
+
     protected:
         QNanoQuickItemPainter *createItemPainter() const override;
 
@@ -81,6 +86,8 @@ class RenderedTarget : public QNanoQuickItem
         double m_y = 0;
         double m_z = 0;
         double m_rotation = 0;
+        bool m_mirrorHorizontally = false;
+        bool m_newMirrorHorizontally = false;
         double m_originX = 0;
         double m_originY = 0;
 };