Changeset 8680

Timestamp:

May 30, 2011, 9:55:38 AM (13 years ago)

Author:

dafrick

Message:

Make the camera position stay the same between differnet stones in Tetris.

Location:

code/branches/presentation/src

Files:

• modules/tetris/Tetris.cc (modified) (2 diffs)
• orxonox/worldentities/ControllableEntity.cc (modified) (2 diffs)
• orxonox/worldentities/ControllableEntity.h (modified) (1 diff)

code/branches/presentation/src/modules/tetris/Tetris.cc

@@ -233 +233 @@
         if(this->player_ == NULL)
             return;
-        
+
+        unsigned int cameraIndex = 0;
         if(this->activeStone_ != NULL)
+        {
+            // Get camera settings
+            cameraIndex = this->activeStone_->getCurrentCameraIndex();
             this->player_->stopControl();
+        }
         
         // Make the last stone to be created the active stone.
@@ -242 +247 @@
         this->player_->startControl(this->activeStone_);
         this->activeStone_->setVelocity(0.0f, -this->center_->getStoneSpeed(), 0.0f);
+        this->activeStone_->setCameraPosition(cameraIndex);
     }
 

code/branches/presentation/src/orxonox/worldentities/ControllableEntity.cc

@@ -120 +120 @@
 
         XMLPortParam(ControllableEntity, "hudtemplate", setHudTemplate, getHudTemplate, xmlelement, mode);
-        XMLPortParam(ControllableEntity, "camerapositiontemplate", setCameraPositionTemplate, getCameraPositionTemkplate, xmlelement, mode);
+        XMLPortParam(ControllableEntity, "camerapositiontemplate", setCameraPositionTemplate, getCameraPositionTemplate, xmlelement, mode);
 
         XMLPortObject(ControllableEntity, CameraPosition, "camerapositions", addCameraPosition, getCameraPosition, xmlelement, mode);
@@ -170 +170 @@
         }
         return 0;
+    }
+
+    unsigned int ControllableEntity::getCurrentCameraIndex() const
+    {
+        if (this->cameraPositions_.size() <= 0)
+            return 0;
+
+        unsigned int counter = 0;
+        for (std::list<SmartPtr<CameraPosition> >::const_iterator it = this->cameraPositions_.begin(); it != this->cameraPositions_.end(); ++it)
+        {
+            if ((*it) == this->currentCameraPosition_)
+                break;
+            counter++;
+        }
+        if (counter >= this->cameraPositions_.size())
+            return 0;
+
+        return counter;
+    }
+    
+    bool ControllableEntity::setCameraPosition(unsigned int index)
+    {
+        if(this->camera_ != NULL && this->cameraPositions_.size() > 0)
+        {
+            if(index >= this->cameraPositions_.size())
+                index = 0;
+
+            CameraPosition* position = this->getCameraPosition(index);
+            position->attachCamera(this->camera_);
+            this->currentCameraPosition_ = position;
+            return true;
+        }
+
+        return false;
     }
 

code/branches/presentation/src/orxonox/worldentities/ControllableEntity.h

@@ -116 +116 @@
             inline const std::list<SmartPtr<CameraPosition> >& getCameraPositions() const
                 { return this->cameraPositions_; }
+            unsigned int getCurrentCameraIndex() const;
+            bool setCameraPosition(unsigned int index);
 
             inline void setCameraPositionTemplate(const std::string& name)
                 { this->cameraPositionTemplate_ = name; }
-            inline const std::string& getCameraPositionTemkplate() const
+            inline const std::string& getCameraPositionTemplate() const
                 { return this->cameraPositionTemplate_; }