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

[jeromela at orxonox.net]

Author: jeromela
Date: 2019-04-04 16:16:22 +0200 (Thu, 04 Apr 2019)
New Revision: 12277

Modified:
   code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw
   code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc
   code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxCenterpoint.cc
Log:
Spielfeld angepasst. Next: Fumktionalitaet auch anpassen

Modified: code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw
===================================================================
--- code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw	2019-04-04 14:15:09 UTC (rev 12276)
+++ code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw	2019-04-04 14:16:22 UTC (rev 12277)
@@ -26,7 +26,7 @@
 <Template name=OrxoBloxbat>
   <OrxoBloxBat camerapositiontemplate=OrxoBloxbatcameras>
     <attached>
-      <Model position="0,0,3" mesh="cube.mesh" scale3D="14,2,2" />
+      <Model position="60,0,-50" mesh="cube.mesh" scale3D="2,2,14" />
       <!--Model roll=180 mesh="OrxoBloxbat.mesh" scale=0.045 /-->
     </attached>
   </OrxoBloxBat>
@@ -52,6 +52,7 @@
 
 
 
+
 <Level
   plugins = "OrxoBlox"
  gametype = "OrxoBlox"
@@ -75,10 +76,12 @@
 
     <MovableEntity rotationrate=5 rotationaxis="0,0,1">
       <attached>
-        <OrxoBloxCenterpoint name=OrxoBloxcenter dimension="200,120" balltemplate=OrxoBloxball battemplate=OrxoBloxbat ballspeed=200 ballaccfactor=1.0 batspeed=130 batlength=0.25>
+        <OrxoBloxCenterpoint name=OrxoBloxcenter dimension="100,120" balltemplate=OrxoBloxball battemplate=OrxoBloxbat ballspeed=200 ballaccfactor=1.0 batspeed=130 batlength=0.25>
           <attached>
-            <Model position="0,0,60" mesh="cube.mesh" scale3D="105,1,1" />
-            <Model position="0,0,-60" mesh="cube.mesh" scale3D="105,1,1" />
+            <!-- Balken die das Spielfeld begrenzen. -->
+            <Model position="0,0,-50" mesh="cube.mesh" scale3D="60,1,1" />
+            <Model position="60,0,0" mesh="cube.mesh" scale3D="1,1,50"/>
+            <Model position="-60,0,0" mesh="cube.mesh" scale3D="1,1,50"/>
 
             <ParticleSpawner name=scoreeffect_right position="120,0, 45" source="Orxonox/sparks2" lifetime=0.1 autostart=0 />
             <ParticleSpawner name=scoreeffect_right position="120,0, 30" source="Orxonox/BigExplosion1part2" lifetime=3.0 autostart=0 />

Modified: code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc
===================================================================
--- code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc	2019-04-04 14:15:09 UTC (rev 12276)
+++ code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc	2019-04-04 14:16:22 UTC (rev 12277)
@@ -67,7 +67,8 @@
         this->ball_ = nullptr;
         this->bat_[0] = nullptr;
 
-        this->setHUDTemplate("OrxoBloxHUD");
+        //this->setHUDTemplate("pongHUD");
+        //Error when specified
 
         // Pre-set the timer, but don't start it yet.
         this->starttimer_.setTimer(1.0, false, createExecutor(createFunctor(&OrxoBlox::startBall, this)));
@@ -125,7 +126,6 @@
     */
     void OrxoBlox::start()
     {
-        orxout() << "Hello" << endl;
         if (this->center_ != nullptr) // There needs to be a OrxoBloxCenterpoint, i.e. the area the game takes place.
         {
             if (this->ball_ == nullptr) // If there is no ball, create a new ball.
@@ -184,6 +184,7 @@
 
         // Reset the variable.
         this->bForceSpawn_ = temp;
+
     }
 
     /**

Modified: code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxCenterpoint.cc
===================================================================
--- code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxCenterpoint.cc	2019-04-04 14:15:09 UTC (rev 12276)
+++ code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxCenterpoint.cc	2019-04-04 14:16:22 UTC (rev 12277)
@@ -1,3 +1,8 @@
+/**
+    Centerpoint: Konstruktion Spielfeld. Wird in orxoblox.oxw definiert.
+*/
+
+
 /*
  *   ORXONOX - the hottest 3D action shooter ever to exist
  *                    > www.orxonox.net <
@@ -52,7 +57,7 @@
 
         this->width_ = 200;
         this->height_ = 120;
-        this->ballspeed_ = 100;
+        this->ballspeed_ = 60;
         this->ballaccfactor_ = 1.0;
         this->batspeed_ = 60;
         this->batlength_ = 0.25;