[Orxonox-commit 4412] r9083 - in code/branches/pCuts: data/levels src/modules/tetris src/orxonox/worldentities

[jo at orxonox.net]

Author: jo
Date: 2012-04-11 18:35:15 +0200 (Wed, 11 Apr 2012)
New Revision: 9083

Modified:
   code/branches/pCuts/data/levels/tetris.oxw
   code/branches/pCuts/src/modules/tetris/TetrisBrick.cc
   code/branches/pCuts/src/orxonox/worldentities/ControllableEntity.cc
Log:
Camera works.

Modified: code/branches/pCuts/data/levels/tetris.oxw
===================================================================
--- code/branches/pCuts/data/levels/tetris.oxw	2012-04-11 13:53:43 UTC (rev 9082)
+++ code/branches/pCuts/data/levels/tetris.oxw	2012-04-11 16:35:15 UTC (rev 9083)
@@ -11,26 +11,41 @@
   include("templates/lodInformation.oxt")
 ?>
 
-<Template name=tetrisbrickcameras defaults=0>
-  <TetrisBrick>
+<Template name=tetrisstonecameras defaults=0>
+  <TetrisStone>
     <camerapositions>
       <CameraPosition position="55,75,200" absolute=true />
       <CameraPosition position="0,50,160" drag=true mouselook=true />
       <CameraPosition position="0,50,0" pitch=-90 drag=true mouselook=true />
     </camerapositions>
-  </TetrisBrick>
+  </TetrisStone>
 </Template>
 
 <Template name=tetrisstone>
-  <TetrisStone>
+  <TetrisStone camerapositiontemplate=tetrisstonecameras>
     <attached>
       <Model position="0,0,0" mesh="crate.mesh" scale=1 />
     </attached>
   </TetrisStone>
 </Template>
 
+
+
+<Template name=tetrisbrickcameras defaults=0>
+  <TetrisBrick>
+    <camerapositions>
+      <CameraPosition position="55,75,200" absolute=true />
+      <CameraPosition position="0,50,160" drag=true mouselook=true />
+      <CameraPosition position="0,50,0" pitch=-90 drag=true mouselook=true />
+    </camerapositions>
+  </TetrisBrick>
+</Template>
+
 <Template name=tetrisbrick>
   <TetrisBrick camerapositiontemplate=tetrisbrickcameras>
+    <attached>
+      <Model position="0,0,0" mesh="crate.mesh" scale=1 />
+    </attached>
   </TetrisBrick>
 </Template>
 

Modified: code/branches/pCuts/src/modules/tetris/TetrisBrick.cc
===================================================================
--- code/branches/pCuts/src/modules/tetris/TetrisBrick.cc	2012-04-11 13:53:43 UTC (rev 9082)
+++ code/branches/pCuts/src/modules/tetris/TetrisBrick.cc	2012-04-11 16:35:15 UTC (rev 9083)
@@ -52,7 +52,7 @@
     {
         RegisterObject(TetrisBrick);
 
-        this->shapeIndex_ = 6; //<! TODO: random number between 0 and 7
+        this->shapeIndex_ = 3; //<! TODO: random number between 0 and 7
         this->stonesPerBrick_ = 4; //<! most tetris bricks is formed by 4 stones
         this->delay_ = false;
         this->delayTimer_.setTimer(0.2f, false, createExecutor(createFunctor(&TetrisBrick::enableMovement, this)));

Modified: code/branches/pCuts/src/orxonox/worldentities/ControllableEntity.cc
===================================================================
--- code/branches/pCuts/src/orxonox/worldentities/ControllableEntity.cc	2012-04-11 13:53:43 UTC (rev 9082)
+++ code/branches/pCuts/src/orxonox/worldentities/ControllableEntity.cc	2012-04-11 16:35:15 UTC (rev 9083)
@@ -176,7 +176,7 @@
     unsigned int ControllableEntity::getCurrentCameraIndex() const
     {
         if (this->cameraPositions_.size() <= 0)
-            return 0;
+            {orxout()<< "camareapositions_size == 0"<<endl ; return 0;}
 
         unsigned int counter = 0;
         for (std::list<SmartPtr<CameraPosition> >::const_iterator it = this->cameraPositions_.begin(); it != this->cameraPositions_.end(); ++it)
@@ -195,6 +195,7 @@
     {
         if(this->camera_ != NULL && this->cameraPositions_.size() > 0)
         {
+        orxout()<< "Cameraposition is set."<<endl;
             if(index >= this->cameraPositions_.size())
                 index = 0;