Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5047 in orxonox.OLD for orxonox/trunk


Ignore:
Timestamp:
Aug 16, 2005, 9:26:28 PM (19 years ago)
Author:
patrick
Message:

orxonox/trunk: flushing work

Location:
orxonox/trunk/src
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/lib/collision_detection/cd_engine.cc

    r5042 r5047  
    6868{
    6969  this->checkCollisionObjects();
    70   this->checkCollisionGround();
     70  //this->checkCollisionGround();
    7171}
    7272

  • orxonox/trunk/src/world_entities/environment.cc

    r5042 r5047  
    4444*/
    4545Environment::~Environment ()
    46 {
     46{}
    4747
    48 }
    4948
    5049/**
    … …  
    5453void Environment::tick (float time) {}
    5554
    56 /**
    57  *  if a hit occures
    58 */
    59 void Environment::hit (WorldEntity* weapon, Vector* loc) {}
    60 
    61 /**
    62  *  destroys an Environment
    63 */
    64 void Environment::destroy () {}
    65 
    66 /**
    67  *  a collision with some ship
    68 */
    69 void Environment::collide (WorldEntity* other,  Uint32 ownhitflags, Uint32 otherhitflags) {}
    7055
    7156/**

  • orxonox/trunk/src/world_entities/environment.h

    r4490 r5047  
    1414   Environment is a container for all the worldEntities that are non-interactive
    1515*/
    16 class Environment : public WorldEntity 
     16class Environment : public WorldEntity
    1717{
    1818  friend class World;
    … …  
    2222  virtual ~Environment ();
    2323
    24  
     24
    2525  virtual void tick (float time);
    26   virtual void hit (WorldEntity* weapon, Vector* loc);
    27   virtual void destroy ();
    28   virtual void collide (WorldEntity* other,  Uint32 ownhitflags, Uint32 otherhitflags);
     26
    2927  virtual void draw ();
    3028
Note: See TracChangeset for help on using the changeset viewer.