Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8506


Ignore:
Timestamp:
May 19, 2011, 1:47:01 PM (13 years ago)
Author:
kmaurus
Message:
 
Location:
code/branches/spaceboundaries2/src/orxonox/worldentities
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.cc

    r8468 r8506  
    273273        /* Checke, ob das Pawn innerhalb des nächsten Ticks, das erlaubte Gebiet verlassen würde.
    274274           Falls ja: Spicke es zurück. */
    275         if( currentDistance + normalSpeed * dt > this->maxDistance_ - 10 ) // -10: "security measure"
     275        if( currentDistance + normalSpeed * dt > this->maxDistance_ - 20 ) // -20: "security measure"
    276276        {
    277277            float dampingFactor = 0.5;
     
    284284            item->setAcceleration(acceleration * dampingFactor);
    285285            item->setVelocity(velocity * dampingFactor);
     286           
     287            item->setPosition( item->getPosition() - normal * 10 );
    286288        }
    287289    }
  • code/branches/spaceboundaries2/src/orxonox/worldentities/SpaceBoundaries.h

    r8468 r8506  
    5050#include <string>
    5151#include <list>
    52 #include <map>
    5352#include <vector>
    5453
     
    9493            void positionBillboard(const Vector3 position); //!< Display a Billboard at the position 'position'.
    9594            void setBillboardOptions(Billboard *billy);
    96             void removeAllBillboards(); //!< Hide all all elements of '*billboard_' and set their attribute 'usedYet' to 0.
     95            void removeAllBillboards(); //!< Hide all elements of '*billboard_' and set their attribute 'usedYet' to 0.
    9796           
    9897            void setMaxDistance(float r);
Note: See TracChangeset for help on using the changeset viewer.