Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6989 in orxonox.OLD


Ignore:
Timestamp:
Feb 2, 2006, 10:02:24 PM (14 years ago)
Author:
bensch
Message:

trunk: story entity work.

Location:
trunk/src
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/story_entities/game_world.cc

    r6988 r6989  
    7474
    7575
    76 GameWorld::GameWorld(const TiXmlElement* root)
     76GameWorld::GameWorld()
    7777    : StoryEntity()
    7878{
  • trunk/src/story_entities/game_world.h

    r6845 r6989  
    2626
    2727  public:
    28     GameWorld (const TiXmlElement* root = NULL);
     28    GameWorld ();
    2929    virtual ~GameWorld ();
    3030
  • trunk/src/story_entities/multi_player_world.cc

    r6512 r6989  
    3838
    3939MultiPlayerWorld::MultiPlayerWorld(const TiXmlElement* root)
    40   : GameWorld(root)
     40  : GameWorld()
    4141{
    4242  this->setClassID(CL_MULTI_PLAYER_WORLD, "MultiPlayerWorld");
  • trunk/src/story_entities/simple_game_menu.cc

    r6980 r6989  
    4949
    5050SimpleGameMenu::SimpleGameMenu(const TiXmlElement* root)
    51   : GameWorld(root)
     51  : GameWorld()
    5252{
    5353  this->setClassID(CL_SIMPLE_GAME_MENU, "SimpleGameMenu");
  • trunk/src/story_entities/single_player_world.cc

    r6512 r6989  
    3939
    4040SinglePlayerWorld::SinglePlayerWorld(const TiXmlElement* root)
    41   : GameWorld(root)
     41  : GameWorld()
    4242{
    4343  this->setClassID(CL_SINGLE_PLAYER_WORLD, "SinglePlayerWorld");
  • trunk/src/world_entities/image_entity.cc

    r6852 r6989  
    128128void ImageEntity::tick(float dt)
    129129{
    130   // let the crosshair rotate
    131   //this->shiftDir2D(dt * rotationSpeed);
    132130
    133 
    134   float z = 0.0f;
    135   glReadPixels ((int)this->getAbsCoor2D().x,
    136                  GraphicsEngine::getInstance()->getResolutionY()-(int)this->getAbsCoor2D().y-1,
    137                  1,
    138                  1,
    139                  GL_DEPTH_COMPONENT,
    140                  GL_FLOAT,
    141                  &z);
    142 
    143 
    144   GLdouble objX=.0, objY=.0, objZ=.0;
    145   gluUnProject(this->getAbsCoor2D().x,
    146                GraphicsEngine::getInstance()->getResolutionY()-this->getAbsCoor2D().y-1,
    147                .99,  // z
    148                GraphicsEngine::modMat,
    149                GraphicsEngine::projMat,
    150                GraphicsEngine::viewPort,
    151                &objX,
    152                &objY,
    153                &objZ );
    154 
    155   //this->setAbsCoor(objX, objY, objZ);
    156131}
    157132
Note: See TracChangeset for help on using the changeset viewer.