[Orxonox-commit 3830] r8506 - code/branches/spaceboundaries2/src/orxonox/worldentities

[kmaurus at orxonox.net]

Author: kmaurus
Date: 2011-05-19 13:47:01 +0200 (Thu, 19 May 2011)
New Revision: 8506

Modified:
   code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.cc
   code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.h
Log:


Modified: code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.cc
===================================================================
--- code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.cc	2011-05-19 01:18:44 UTC (rev 8505)
+++ code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.cc	2011-05-19 11:47:01 UTC (rev 8506)
@@ -272,7 +272,7 @@
         
         /* Checke, ob das Pawn innerhalb des nächsten Ticks, das erlaubte Gebiet verlassen würde.
            Falls ja: Spicke es zurück. */
-        if( currentDistance + normalSpeed * dt > this->maxDistance_ - 10 ) // -10: "security measure"
+        if( currentDistance + normalSpeed * dt > this->maxDistance_ - 20 ) // -20: "security measure"
         {
             float dampingFactor = 0.5;
             velocity = velocity.reflect(normal);
@@ -283,6 +283,8 @@
             
             item->setAcceleration(acceleration * dampingFactor);
             item->setVelocity(velocity * dampingFactor);
+            
+            item->setPosition( item->getPosition() - normal * 10 );
         }
     }
     

Modified: code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.h
===================================================================
--- code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.h	2011-05-19 01:18:44 UTC (rev 8505)
+++ code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.h	2011-05-19 11:47:01 UTC (rev 8506)
@@ -49,7 +49,6 @@
 
 #include <string>
 #include <list>
-#include <map>
 #include <vector>
 
 namespace orxonox
@@ -93,7 +92,7 @@
             
             void positionBillboard(const Vector3 position); //!< Display a Billboard at the position 'position'.
             void setBillboardOptions(Billboard *billy);
-            void removeAllBillboards(); //!< Hide all all elements of '*billboard_' and set their attribute 'usedYet' to 0.
+            void removeAllBillboards(); //!< Hide all elements of '*billboard_' and set their attribute 'usedYet' to 0.
             
             void setMaxDistance(float r);
             float getMaxDistance();