Changeset 8537 for code/branches/tetris/src/modules/tetris/TetrisStone.cc

Timestamp:

May 23, 2011, 3:06:08 PM (13 years ago)

Author:

catherine

Message:

Almost working.

File:

• code/branches/tetris/src/modules/tetris/TetrisStone.cc (modified) (3 diffs)

code/branches/tetris/src/modules/tetris/TetrisStone.cc

@@ -37 +37 @@
 #include "core/XMLPort.h"
 
+#include "Tetris.h"
+
 namespace orxonox
 {
@@ -52 +54 @@
         this->delay_ = false;
         this->delayTimer_.setTimer(0.2f, false, createExecutor(createFunctor(&TetrisStone::enableMovement, this)));
+        this->previousPosition_ = Vector3::ZERO;
+    }
+
+    void TetrisStone::tick(float dt)
+    {
+        SUPER(TetrisStone, tick, dt);
     }
 
@@ -76 +84 @@
         {
             const Vector3& position = this->getPosition();
-            this->setPosition(position.x+value.x/abs(value.x)*this->size_, position.y, position.z);
+            Vector3 newPos = Vector3(position.x+value.x/abs(value.x)*this->size_, position.y, position.z);
+            if(!this->tetris_->isValidMove(this, newPos))
+                return;
+
+            //this->previousPosition_ = position;
+            this->setPosition(newPos);
             this->delay_ = true;
             this->delayTimer_.startTimer();