Reset flip/rotation in addition to position in case of collison after…

… movement
ElTh0r0 · Jul 6, 2024 · d14fbc8 · d14fbc8
1 parent 91c97db
commit d14fbc8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/block.cpp b/block.cpp
@@ -206,7 +206,8 @@ void Block::moveBlock(const bool bRelease) {
   if (!bRelease) {
     m_bActive = true;
     this->bringToForeground();
-    m_posBlockSelected = this->pos();  // Save last position
+    m_posBlockSelected = this->pos();   // Save last position
+    m_PolyShapeSelected = m_PolyShape;  // Save shape
   } else {
     m_bActive = false;
 
@@ -219,8 +220,8 @@ void Block::moveBlock(const bool bRelease) {
 
     emit incrementMoves();
     if (this->checkCollision(thisPath)) {
-      // Reset position
-      this->setPos(this->snapToGrid(m_posBlockSelected));
+      m_PolyShape = m_PolyShapeSelected;  // Reset shape (flip / rotation)
+      this->setPos(this->snapToGrid(m_posBlockSelected));  // Reset position
       this->checkBlockIntersection();
     } else {
       // Check if puzzle is solved

diff --git a/block.h b/block.h
@@ -104,6 +104,7 @@ class Block : public QGraphicsObject {
   QTransform *m_pTransform;
   QPointF m_posBlockSelected;
   QPointF m_posMouseSelected;
+  QPolygonF m_PolyShapeSelected;
   QGraphicsSimpleTextItem m_ItemNumberText;
 };