Changeset 6848 in orxonox.OLD for trunk

Timestamp:

Jan 30, 2006, 2:56:54 AM (19 years ago)

Author:

patrick

Message:

trunk: switching to element2sd

Location:

trunk/src

Files:

• lib/graphics/render2D/element_2d.h (modified) (1 diff)
• story_entities/simple_game_menu.cc (modified) (4 diffs)
• story_entities/story_entity.cc (modified) (1 diff)
• world_entities/image_entity.cc (modified) (1 diff)

trunk/src/lib/graphics/render2D/element_2d.h

@@ -114 +114 @@
     inline void setVisibility(bool visible) { this->bVisible = visible; };
     /** @returns the visibility state */
-    inline bool isVisible() { return this->bVisible; };
+    inline bool isVisible() const { return this->bVisible; };
 
 

trunk/src/story_entities/simple_game_menu.cc

@@ -190 +190 @@
       PRINTF(0)("Got a new menu entry |%s|\n", se->getName());
       ImageEntity* ie = new ImageEntity();
-      ie->setAbsCoor(0.0f, this->menuLayer[1]->menuList.size() * -10.0f, 0.0f);
-      //State::getObjectManager()->toList(dynamic_cast<WorldEntity*>(ie), OM_DEAD);
-      //this->menuLayer[1]->menuList.push_back(ie);
+      ie->setTexture(se->getMenuItemImage());
+      ie->setRelCoor(0.0f,- (this->menuLayer[1]->menuList.size() * 10.0f), 0.0f);
+      ie->setVisibility(false);
+      this->menuLayer[1]->menuList.push_back(ie);
     }
   }
@@ -306 +307 @@
   else if( this->layerIndex == 1)
   {
-
+    if( event.type == SDLK_RETURN && event.bPressed == true)
+    {
+      this->setNextStoryID( this->menuLayer[1]->storyList[this->menuSelectedIndex]->getStoryID());
+      this->stop();
+    }
   }
 }
@@ -328 +333 @@
   for( it = this->menuLayer[layer1]->menuList.begin(); it != this->menuLayer[layer1]->menuList.end(); it++ )
   {
-    (*it)->setAbsCoor(Vector(-100, -100, -100));
+    (*it)->setVisibility(false);
   }
 
@@ -335 +340 @@
   // beam here the new menu
   for( it = this->menuLayer[layer2]->menuList.begin(); it != this->menuLayer[layer2]->menuList.end(); it++ )
-  {}
+  {
+    (*it)->setVisibility(true);
+  }
 
   this->layerIndex = layer2;

trunk/src/story_entities/story_entity.cc

@@ -41 +41 @@
   this->storyID = -1;
   this->description = NULL;
+  this->menuItemImage = "pictures/menu/DefaultMenuItem.png";
   this->nextStoryID = WORLD_ID_GAMEEND;
   this->bMenuEntry = false;

trunk/src/world_entities/image_entity.cc

@@ -161 +161 @@
 void ImageEntity::draw() const
 {
+  if( !this->isVisible())
+    return;
+
   glPushMatrix();
   glTranslatef(this->getAbsCoor2D().x, this->getAbsCoor2D().y, 0);