Changeset 2885 for code/trunk/src/orxonox/objects/worldentities

Timestamp:

Apr 1, 2009, 12:37:16 AM (16 years ago)

Author:

landauf

Message:

Extended PongAI:

• Random prediction errors depend on the vertical ball-speed
• Fixed a bug: Position correction was also affected by the reaction delay. Now it works instantly.
• Added oscillation avoidance system (the already implemented hysteresis avoidance system failed at low framerates)

Additionally fixed auto-respawn in Pong Gametype.

Location:

code/trunk/src/orxonox/objects/worldentities

Files:

• PongBall.cc (modified) (3 diffs)
• PongBall.h (modified) (1 diff)

code/trunk/src/orxonox/objects/worldentities/PongBall.cc

@@ -37 +37 @@
 {
     CreateFactory(PongBall);
+
+    const float PongBall::MAX_REL_Z_VELOCITY = 1.5;
 
     PongBall::PongBall(BaseObject* creator) : MovableEntity(creator)
@@ -79 +81 @@
                             position.x = this->fieldWidth_ / 2;
                             velocity.x = -velocity.x;
-                            velocity.z = distance * distance * sgn(distance) * 1.5 * this->speed_;
+                            velocity.z = distance * distance * sgn(distance) * PongBall::MAX_REL_Z_VELOCITY * this->speed_;
                         }
                         else if (position.x > this->fieldWidth_ / 2 * (1 + this->relMercyOffset_))
@@ -97 +99 @@
                             position.x = -this->fieldWidth_ / 2;
                             velocity.x = -velocity.x;
-                            velocity.z = distance * distance * sgn(distance) * 1.5 * this->speed_;
+                            velocity.z = distance * distance * sgn(distance) * PongBall::MAX_REL_Z_VELOCITY * this->speed_;
                         }
                         else if (position.x < -this->fieldWidth_ / 2 * (1 + this->relMercyOffset_))

code/trunk/src/orxonox/objects/worldentities/PongBall.h

@@ -63 +63 @@
                 { this->bat_ = bats; }
 
+            static const float MAX_REL_Z_VELOCITY;
+
         private:
             float fieldWidth_;