Changeset 8506 for code/branches/spaceboundaries2/src/orxonox

Timestamp:

May 19, 2011, 1:47:01 PM (14 years ago)

Author:

kmaurus

Message:

 

Location:

code/branches/spaceboundaries2/src/orxonox/worldentities

Files:

• SpaceBoundaries.cc (modified) (2 diffs)
• SpaceBoundaries.h (modified) (2 diffs)

code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.cc

@@ -273 +273 @@
         /* 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;
@@ -284 +284 @@
             item->setAcceleration(acceleration * dampingFactor);
             item->setVelocity(velocity * dampingFactor);
+            
+            item->setPosition( item->getPosition() - normal * 10 );
         }
     }

code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.h

@@ -50 +50 @@
 #include <string>
 #include <list>
-#include <map>
 #include <vector>
 
@@ -94 +93 @@
             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);