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

[jeromela at orxonox.net]

Author: jeromela
Date: 2019-04-18 13:40:10 +0200 (Thu, 18 Apr 2019)
New Revision: 12305

Modified:
   code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw
   code/branches/OrxoBlox_FS19/data/levels/pong.oxw
   code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc
   code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.cc
   code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxCenterpoint.cc
Log:
Ball bewegt sich in zwei Richtungen

Modified: code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw
===================================================================
--- code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw	2019-04-18 11:26:10 UTC (rev 12304)
+++ code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw	2019-04-18 11:40:10 UTC (rev 12305)
@@ -50,9 +50,6 @@
   </OrxoBloxBall>
 </Template>
 
-
-
-
 <Level
   plugins = "OrxoBlox"
  gametype = "OrxoBlox"

Modified: code/branches/OrxoBlox_FS19/data/levels/pong.oxw
===================================================================
--- code/branches/OrxoBlox_FS19/data/levels/pong.oxw	2019-04-18 11:26:10 UTC (rev 12304)
+++ code/branches/OrxoBlox_FS19/data/levels/pong.oxw	2019-04-18 11:40:10 UTC (rev 12305)
@@ -15,6 +15,7 @@
 <Template name=pongbatcameras defaults=0>
   <PongBat>
     <camerapositions>
+      <!---- Verschidene Kameraeinstellungen festlegen ---->
       <CameraPosition position="0,150,0" pitch=-90 absolute=true />
       <CameraPosition position="0,50,160" drag=true mouselook=true />
       <CameraPosition position="0,40,125" drag=true mouselook=true />

Modified: code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc
===================================================================
--- code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc	2019-04-18 11:26:10 UTC (rev 12304)
+++ code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc	2019-04-18 11:40:10 UTC (rev 12305)
@@ -140,7 +140,7 @@
 
             // Attach the ball to the centerpoint and set the parameters as specified in the centerpoint, the ball is attached to.
             this->center_->attach(this->ball_);
-            this->ball_->setPosition(0,0,50);
+            this->ball_->setPosition(0,0,50); //Startposition
             this->ball_->setFieldDimension(this->center_->getFieldDimension());
             this->ball_->setSpeed(0);
             this->ball_->setAccelerationFactor(this->center_->getBallAccelerationFactor());

Modified: code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.cc
===================================================================
--- code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.cc	2019-04-18 11:26:10 UTC (rev 12304)
+++ code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.cc	2019-04-18 11:40:10 UTC (rev 12305)
@@ -209,6 +209,8 @@
                 velocity.x = sgn(velocity.x) * this->speed_;
             else // If the balls current velocity is zero, the speed is set in a random direction.
                 velocity.x = this->speed_ * sgn(rnd(-1,1));
+            //velocity.y = this->speed_;
+            velocity.z = this->speed_;
 
             this->setVelocity(velocity);
         }

Modified: code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxCenterpoint.cc
===================================================================
--- code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxCenterpoint.cc	2019-04-18 11:26:10 UTC (rev 12304)
+++ code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxCenterpoint.cc	2019-04-18 11:40:10 UTC (rev 12305)
@@ -57,7 +57,7 @@
 
         this->width_ = 200;
         this->height_ = 120;
-        this->ballspeed_ = 60;
+        this->ballspeed_ = 100;
         this->ballaccfactor_ = 1.0;
         this->batspeed_ = 60;
         this->batlength_ = 0.25;