Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5846 in orxonox.OLD for branches/spaceshipcontrol/src


Ignore:
Timestamp:
Dec 1, 2005, 4:33:01 PM (19 years ago)
Author:
bensch
Message:

orxonox/spaceship-controll: removed Player-stuff from CD-engine

@patrick: this will not be merged to the trunk

Location:
branches/spaceshipcontrol/src/lib/collision_detection
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/spaceshipcontrol/src/lib/collision_detection/cd_engine.cc

    r5134 r5846  
    2424#include "world_entity.h"
    2525#include "terrain.h"
    26 #include "player.h"
     26// #include "player.h"
    2727
    2828#include "spatial_separation.h"
     
    119119    Quadtree* q = this->terrain->ssp->getQuadtree();
    120120
    121     QuadtreeNode* n = q->getQuadtreeFromPosition(this->player->getAbsCoor());
     121//    QuadtreeNode* n = q->getQuadtreeFromPosition(this->player->getAbsCoor());
    122122  }
    123123  //sTriangleExt* tri = q->getTriangleFromPosition(this->player->getAbsCoor());
  • branches/spaceshipcontrol/src/lib/collision_detection/cd_engine.h

    r5039 r5846  
    1717class OBBTree;
    1818class Terrain;
    19 class Player;
     19//class Player;
    2020
    2121
     
    5151  inline void setEntityList(tList<WorldEntity>* entityList) { this->entityList = entityList; }
    5252  inline void setTerrain(Terrain* terrain) { this->terrain = terrain; }
    53   inline void setPlayer(Player* player) { this->player = player; } /* only for debug purposes \todo: delete*/
     53  //  inline void setPlayer(Player* player) { this->player = player; } /* only for debug purposes \todo: delete*/
    5454
    5555  void drawBV(int depth, int drawMode) const;
     
    7979
    8080  Terrain*                terrain;                          //!< this it a ref to the terrain, serving as a ground for all WE
    81   Player*                 player;
     81//  Player*                 player;
    8282};
    8383
Note: See TracChangeset for help on using the changeset viewer.