Changeset 6835 in orxonox.OLD

Timestamp:

Jan 29, 2006, 11:59:39 PM (18 years ago)

Author:

patrick

Message:

trunk: resturcture of the game menu for multi-level menus

Location:

trunk/src/story_entities

Files:

• game_world.cc (modified) (1 diff)
• game_world.h (modified) (2 diffs)
• simple_game_menu.cc (modified) (4 diffs)
• simple_game_menu.h (modified) (2 diffs)
• story_entity.cc (modified) (1 diff)
• story_entity.h (modified) (2 diffs)

trunk/src/story_entities/game_world.cc

@@ -112 +112 @@
 
   LoadParam(root, "path", this, GameWorld, setPath)
-  .describe("The Filename of this GameWorld (relative from the data-dir)");
+      .describe("The Filename of this GameWorld (relative from the data-dir)");
+  LoadParam(root, "menu-entry", this, GameWorld, addToGameMenu)
+      .describe("If this entry is 1, the world is contained in the SimpleGameMenu");
+
 
 //   LoadParam(root, "soundtrack", this->dataTank, GameWorldData, setSoundTrack);

trunk/src/story_entities/game_world.h

@@ -55 +55 @@
     void toggleBVVisibility() { this->showBV = !this->showBV; };
 
+    /** toggle the menu visibility: SimpleMenu specific */
+    inline void addToGameMenu(int toggle) { this->bMenuEntry = (bool)toggle; }
+    /** @returns true if the GameWorld should be contained in the SimpleMenu: SimpleMenu specific */
+    inline bool isContainedInMenu() { return this->bMenuEntry; }
+
 
     inline void setSky(WorldEntity* sky) { this->dataTank->sky = sky; }
@@ -93 +98 @@
     /* external modules interfaces */
     Shell*              shell;
+
+    bool                bMenuEntry;                   //!< If true, this GameWorld apears in the SimpleMenu: SimpleMenu specific
 };
 

trunk/src/story_entities/simple_game_menu.cc

@@ -55 +55 @@
 
   this->cameraVector = Vector(50.0, 0.0, 0.0);
+  this->menuLayer.push_back(new MenuLayer());
 
   this->loadParams(root);
@@ -127 +128 @@
     {
       this->menuSelector = dynamic_cast<ImageEntity*>(*entity);
-      PRINTF(0)("Found the selector: %s\n", (*entity)->getName());
     }
     else if( !strcmp( "StartGame_Menu", (*entity)->getName()))
     {
-      PRINTF(0)("Found a StartItem: %s\n", (*entity)->getName());
       this->menuStartGame = dynamic_cast<ImageEntity*>(*entity);
-      this->menuList.push_back(dynamic_cast<ImageEntity*>(*entity));
+      this->menuLayer[0]->menuList.push_back(dynamic_cast<ImageEntity*>(*entity));
+
     }
     else if( !strcmp( "Multiplayer_Menu", (*entity)->getName()))
     {
-      PRINTF(0)("Found a MultiplayerItem: %s\n", (*entity)->getName());
       this->menuStartMultiplayerGame = dynamic_cast<ImageEntity*>(*entity);
-      this->menuList.push_back(dynamic_cast<ImageEntity*>(*entity));
+      this->menuLayer[0]->menuList.push_back(dynamic_cast<ImageEntity*>(*entity));
     }
     else if( !strcmp( "Quit_Menu", (*entity)->getName()))
     {
-      PRINTF(0)("Found a QuitItem: %s\n", (*entity)->getName());
       this->menuQuitGame = dynamic_cast<ImageEntity*>(*entity);
-      this->menuList.push_back(dynamic_cast<ImageEntity*>(*entity));
+      this->menuLayer[0]->menuList.push_back(dynamic_cast<ImageEntity*>(*entity));
     }
   }
   this->menuSelectedIndex = 0;
-  this->menuSelected = this->menuList[this->menuSelectedIndex];
+  this->menuSelected = this->menuLayer[0]->menuList[this->menuSelectedIndex];
   this->menuSelector->setAbsCoor(this->menuSelected->getAbsCoor());
 }
@@ -233 +231 @@
   {
 //     ImageEntity*
-    if(this->menuSelectedIndex < (this->menuList.size() - 1))
-    {
-      this->menuSelected = this->menuList[++this->menuSelectedIndex];
+    if(this->menuSelectedIndex < (this->menuLayer[0]->menuList.size() - 1))
+    {
+      this->menuSelected = this->menuLayer[0]->menuList[++this->menuSelectedIndex];
       this->menuSelector->setAbsCoor(this->menuSelected->getAbsCoor());
     }
@@ -243 +241 @@
     if(this->menuSelectedIndex > 0)
     {
-      this->menuSelected = this->menuList[--this->menuSelectedIndex];
+      this->menuSelected = this->menuLayer[0]->menuList[--this->menuSelectedIndex];
       this->menuSelector->setAbsCoor(this->menuSelected->getAbsCoor());
     }

trunk/src/story_entities/simple_game_menu.h

@@ -18 +18 @@
 class TiXmlElement;
 class ImageEntity;
+
+
+
+class MenuLayer
+{
+  public:
+    MenuLayer() {}
+    ~MenuLayer() {}
+
+
+  public:
+    std::vector<ImageEntity*>         menuList;                        //!< the list of the menu items
+};
+
 
 //! a simple game menu based on a story entity
@@ -52 +66 @@
 
   private:
-    std::vector<ImageEntity*>         menuList;                        //!< the list of the menu items
+    std::vector<MenuLayer*>           menuLayer;                       //!< the menu layer
+    MenuLayer*                        selectedLayer;                   //!< the selected menu layer
+
+    //std::vector<ImageEntity*>         menuList;                        //!< the list of the menu items
     ImageEntity*                      menuSelected;                    //!< ref to the selected menu entity
     ImageEntity*                      menuSelector;                    //!< ref to the selector image

trunk/src/story_entities/story_entity.cc

@@ -65 +65 @@
       .describe("Sets the ID of the next StoryEntity");
 
+  LoadParam(root, "name", this, StoryEntity, setName)
+      .describe("Sets the name of this StoryEntity");
+
   PRINTF(4)("Loaded StoryEntity specific stuff\n");
 }

trunk/src/story_entities/story_entity.h

@@ -67 +67 @@
   /**  gets the story id of the current entity @returns story id */
   inline int getNextStoryID() { return this->nextStoryID; }
-
+  /** sets the name of this StoryEntity @param name name */
+  inline void setName(const char* name) { this->name = name; }
+  /** @returns the name of this StoryEntity */
+  inline const char* getName() { return this->name; }
 
 
@@ -79 +82 @@
     int storyID;           //!< this is the number of this entity, identifying it in a list/tree...
     int nextStoryID;       //!< if this entity has finished, this entity shall be called
+    const char* name;      //!< name of this StoryEntity
 };