[Orxonox-commit 7748] r12341 - in code/branches/OrxoBlox_FS19: data/levels src/modules/OrxoBlox

[ahuwyler at orxonox.net]

Author: ahuwyler
Date: 2019-05-09 10:25:24 +0200 (Thu, 09 May 2019)
New Revision: 12341

Modified:
   code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw
   code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxWall.cc
   code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxWall.h
Log:
Wall is ready

Modified: code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw
===================================================================
--- code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw	2019-05-09 07:43:02 UTC (rev 12340)
+++ code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw	2019-05-09 08:25:24 UTC (rev 12341)
@@ -110,9 +110,9 @@
         
           <attached>
             <!-- Balken die das Spielfeld begrenzen. -->
-            <Model position="0,0,-50" mesh="cube.mesh" scale3D="45,1,1" />
-            <Model position="45,0,0" mesh="cube.mesh" scale3D="1,1,50"/>
-            <Model position="-45,0,0" mesh="cube.mesh" scale3D="1,1,50"/>
+            <Model position="0,0,-49" mesh="cube.mesh" scale3D="45,1,1" />
+            <Model position="46,0,0" mesh="cube.mesh" scale3D="1,1,50"/>
+            <Model position="-46,0,0" mesh="cube.mesh" scale3D="1,1,50"/>
           </attached>
         </OrxoBloxCenterpoint>
       </attached>

Modified: code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxWall.cc
===================================================================
--- code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxWall.cc	2019-05-09 07:43:02 UTC (rev 12340)
+++ code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxWall.cc	2019-05-09 08:25:24 UTC (rev 12341)
@@ -18,10 +18,12 @@
     {
         RegisterObject(OrxoBloxWall);
 
-        this->num_Stones_ = 1 + static_cast<unsigned int>(rnd(6.0f)); //<! random number between 0 and 7;
+        this->num_Stones_ = 10;
         this->size_ = 9.0f;
         this->delay_ = false;
+
         this->orxoblox_ = this->getOrxoBlox();
+        this->center_ = this->orxoblox_->getCenterpoint();
         this->createWall();
     }
 
@@ -34,7 +36,9 @@
                 OrxoBloxStones* stone = new OrxoBloxStones(this->getContext());
                 this->TotalStones_.push_back(stone);
                 this->attach(stone);
-                stone->setPosition(size_*i -55.5f, 0, 0.0f);
+                float x_=(this->center_->getFieldDimension()).x;
+                float y_=(this->center_->getFieldDimension()).y;
+                stone->setPosition(size_*i -x_/2 +4.5f, -3.5f, -y_/2 + 6.5f);
 
 
 

Modified: code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxWall.h
===================================================================
--- code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxWall.h	2019-05-09 07:43:02 UTC (rev 12340)
+++ code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxWall.h	2019-05-09 08:25:24 UTC (rev 12341)
@@ -50,7 +50,7 @@
             std::vector<OrxoBloxStones*> TotalStones_; //!< A list of all stones in a Wall.
             bool delay_;
             OrxoBlox* orxoblox_;
-            
+            WeakPtr<OrxoBloxCenterpoint> center_; //!< The playing field.
 
     };
 }