Changeset 6989 in orxonox.OLD for trunk/src

Timestamp:

Feb 2, 2006, 10:02:24 PM (18 years ago)

Author:

bensch

Message:

trunk: story entity work.

Location:

trunk/src

Files:

• story_entities/game_world.cc (modified) (1 diff)
• story_entities/game_world.h (modified) (1 diff)
• story_entities/multi_player_world.cc (modified) (1 diff)
• story_entities/simple_game_menu.cc (modified) (1 diff)
• story_entities/single_player_world.cc (modified) (1 diff)
• world_entities/image_entity.cc (modified) (1 diff)

trunk/src/story_entities/game_world.cc

@@ -74 +74 @@
 
 
-GameWorld::GameWorld(const TiXmlElement* root)
+GameWorld::GameWorld()
     : StoryEntity()
 {

trunk/src/story_entities/game_world.h

@@ -26 +26 @@
 
   public:
-    GameWorld (const TiXmlElement* root = NULL);
+    GameWorld ();
     virtual ~GameWorld ();
 

trunk/src/story_entities/multi_player_world.cc

@@ -38 +38 @@
 
 MultiPlayerWorld::MultiPlayerWorld(const TiXmlElement* root)
-  : GameWorld(root)
+  : GameWorld()
 {
   this->setClassID(CL_MULTI_PLAYER_WORLD, "MultiPlayerWorld");

trunk/src/story_entities/simple_game_menu.cc

@@ -49 +49 @@
 
 SimpleGameMenu::SimpleGameMenu(const TiXmlElement* root)
-  : GameWorld(root)
+  : GameWorld()
 {
   this->setClassID(CL_SIMPLE_GAME_MENU, "SimpleGameMenu");

trunk/src/story_entities/single_player_world.cc

@@ -39 +39 @@
 
 SinglePlayerWorld::SinglePlayerWorld(const TiXmlElement* root)
-  : GameWorld(root)
+  : GameWorld()
 {
   this->setClassID(CL_SINGLE_PLAYER_WORLD, "SinglePlayerWorld");

trunk/src/world_entities/image_entity.cc

@@ -128 +128 @@
 void ImageEntity::tick(float dt)
 {
-  // let the crosshair rotate
-  //this->shiftDir2D(dt * rotationSpeed);
 
-
-  float z = 0.0f;
-  glReadPixels ((int)this->getAbsCoor2D().x,
-                 GraphicsEngine::getInstance()->getResolutionY()-(int)this->getAbsCoor2D().y-1,
-                 1,
-                 1,
-                 GL_DEPTH_COMPONENT,
-                 GL_FLOAT,
-                 &z);
-
-
-  GLdouble objX=.0, objY=.0, objZ=.0;
-  gluUnProject(this->getAbsCoor2D().x,
-               GraphicsEngine::getInstance()->getResolutionY()-this->getAbsCoor2D().y-1,
-               .99,  // z
-               GraphicsEngine::modMat,
-               GraphicsEngine::projMat,
-               GraphicsEngine::viewPort,
-               &objX,
-               &objY,
-               &objZ );
-
-  //this->setAbsCoor(objX, objY, objZ);
 }