Changeset 9083

Timestamp:

Apr 11, 2012, 6:35:15 PM (13 years ago)

Author:

jo

Message:

Camera works.

Location:

code/branches/pCuts

Files:

• data/levels/tetris.oxw (modified) (2 diffs)
• src/modules/tetris/TetrisBrick.cc (modified) (1 diff)
• src/orxonox/worldentities/ControllableEntity.cc (modified) (2 diffs)

code/branches/pCuts/data/levels/tetris.oxw

@@ -12 +12 @@
 ?>
 
+<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>
+  </TetrisStone>
+</Template>
+
+<Template name=tetrisstone>
+  <TetrisStone camerapositiontemplate=tetrisstonecameras>
+    <attached>
+      <Model position="0,0,0" mesh="crate.mesh" scale=1 />
+    </attached>
+  </TetrisStone>
+</Template>
+
+
+
 <Template name=tetrisbrickcameras defaults=0>
   <TetrisBrick>
@@ -22 +42 @@
 </Template>
 
-<Template name=tetrisstone>
-  <TetrisStone>
+<Template name=tetrisbrick>
+  <TetrisBrick camerapositiontemplate=tetrisbrickcameras>
     <attached>
       <Model position="0,0,0" mesh="crate.mesh" scale=1 />
     </attached>
-  </TetrisStone>
-</Template>
-
-<Template name=tetrisbrick>
-  <TetrisBrick camerapositiontemplate=tetrisbrickcameras>
   </TetrisBrick>
 </Template>

code/branches/pCuts/src/modules/tetris/TetrisBrick.cc

@@ -53 +53 @@
         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;

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

@@ -177 +177 @@
     {
         if (this->cameraPositions_.size() <= 0)
-            return 0;
+            {orxout()<< "camareapositions_size == 0"<<endl ; return 0;}
 
         unsigned int counter = 0;
@@ -196 +196 @@
         if(this->camera_ != NULL && this->cameraPositions_.size() > 0)
         {
+        orxout()<< "Cameraposition is set."<<endl;
             if(index >= this->cameraPositions_.size())
                 index = 0;