Changeset 8677 in orxonox.OLD for branches

Timestamp:

Jun 21, 2006, 4:49:06 PM (18 years ago)

Author:

bensch

Message:

new gui implementing work

Location:

branches/gui/src

Files:

• defs/error.h (modified) (3 diffs)
• lib/data/data_tank.h (modified) (1 diff)
• lib/util/loading/game_loader.cc (modified) (7 diffs)
• story_entities/campaign.cc (modified) (5 diffs)
• story_entities/game_menu.cc (modified) (13 diffs)
• story_entities/game_menu.h (modified) (3 diffs)
• story_entities/game_world.cc (modified) (11 diffs)
• story_entities/game_world_data.cc (modified) (9 diffs)
• story_entities/multi_player_world.cc (modified) (1 diff)
• story_entities/multi_player_world_data.cc (modified) (8 diffs)
• story_entities/single_player_world_data.cc (modified) (7 diffs)
• story_entities/story_entity.h (modified) (1 diff)

branches/gui/src/defs/error.h

@@ -1 +1 @@
 
 
-/* 
+/*
    orxonox - the future of 3D-vertical-scrollers
 
@@ -17 +17 @@
 
 
-/*! 
+/*!
  * @file error.h
   *  A compendium of Error codes used in the program
-*/ 
+*/
 
 
@@ -54 +54 @@
 */
 
-typedef struct 
+struct ErrorMessage
 {
+  ErrorMessage(int code = 0, char* message = NULL, char* location = NULL)
+    : code(code), message(message), location(location) {};
   int code;
   char* message;
   char* location;
-} ErrorMessage;
+};
 
 #endif /* _ERROR_H */

branches/gui/src/lib/data/data_tank.h

@@ -23 +23 @@
 
     /** initializes the DataTank to be able to load the data */
-    virtual ErrorMessage init() {}
+    virtual ErrorMessage init() { return ErrorMessage(); }
     /** loads the data into the DataTank @param root is the xml root parameter for for loadParams() connection */
-    virtual ErrorMessage loadData(const TiXmlElement* root = NULL) {}
+    virtual ErrorMessage loadData(const TiXmlElement* root = NULL) { return ErrorMessage(); }
     /** unloads the data again from the DataTank */
-    virtual ErrorMessage unloadData() {}
+    virtual ErrorMessage unloadData() { return ErrorMessage(); }
 };
 

branches/gui/src/lib/util/loading/game_loader.cc

@@ -73 +73 @@
   this->subscribeEvent(ES_GAME, KeyMapper::PEV_NEXT_WORLD);
   this->subscribeEvent(ES_GAME, KeyMapper::PEV_PREVIOUS_WORLD);
+
+  return ErrorMessage();
 }
 
@@ -91 +93 @@
     this->currentCampaign = this->fileToCampaign(campaignName);
   }
+
+  return ErrorMessage();
 }
 
@@ -109 +113 @@
     this->currentCampaign = this->fileToCampaign(campaignName);
   }
+
+  return ErrorMessage();
 }
 
@@ -147 +153 @@
       }
   }
+
+  return ErrorMessage();
 }
 
@@ -160 +168 @@
     this->currentCampaign->start();
   }
+
+  return ErrorMessage();
 }
 
@@ -191 +201 @@
   if(this->currentCampaign != NULL)
     this->currentCampaign->pause();
+
+  return ErrorMessage();
 }
 
@@ -205 +217 @@
   if(this->currentCampaign != NULL)
     this->currentCampaign->resume();
+
+  return ErrorMessage();
 }
 

branches/gui/src/story_entities/campaign.cc

@@ -82 +82 @@
   this->bReturnToMenu = false;
   this->run();
+
+  return true;
 }
 
@@ -90 +92 @@
 bool Campaign::pause()
 {
-  this->bPaused = true;
+  return (this->bPaused = true);
 }
 
@@ -100 +102 @@
 {
   PRINTF(4)("Resuming the current Campaign\n");
-  this->bPaused = false;
+  return (this->bPaused = false);
 }
 
@@ -118 +120 @@
     this->currentEntity->stop();
   }
+
+  return true;
 }
 
@@ -127 +131 @@
 {
   ErrorMessage       errorCode;
-  int                storyID = WORLD_ID_0;
+//  int                storyID = WORLD_ID_0;
 
   for( this->currentEntity = this->campaignData->getFirstLevel(), this->bRunning = true;

branches/gui/src/story_entities/game_menu.cc

@@ -68 +68 @@
 
   State::setMenuID(this->getNextStoryID());
-}
-
-/// HACK only for testing.
-void GameMenu::enterGui()
-{
 }
 
@@ -126 +121 @@
   GraphicsEngine::getInstance()->displayFPS(false);
 
+  return ErrorMessage();
 }
 
@@ -134 +130 @@
 ErrorMessage GameMenu::loadData()
 {
-  this->mainMenuBox = new OrxGui::GLGuiBox();
+  this->mainMenuBox = NULL;
+
+  this->levelsBox = NULL;
+  this->networkBox = NULL;
+
+  this->optionsBox = NULL;
+  this->audioBox = NULL;
+  this->videoBox = NULL;
+  this->controlBox = NULL;
+  this->levelsBox = NULL;
+
+  return GameWorld::loadData();
+}
+
+
+void GameMenu::showMainMenu()
+{
+  if (mainMenuBox == NULL)
   {
-    OrxGui::GLGuiButton* startButton = new OrxGui::GLGuiPushButton("Play");
-    this->mainMenuBox->pack(startButton);
-
-
-    OrxGui::GLGuiButton* quitButton = new OrxGui::GLGuiPushButton("Quit");
-    this->mainMenuBox->pack(quitButton);
-    quitButton->connect(SIGNAL(quitButton, released), this, SLOT(GameMenu, quitMenu));
-
-
+    this->mainMenuBox = new OrxGui::GLGuiBox();
+    {
+      OrxGui::GLGuiButton* startButton = new OrxGui::GLGuiPushButton("Play");
+      startButton->connect(SIGNAL(startButton, released), this, SLOT(GameMenu, showCampaigns));
+      this->mainMenuBox->pack(startButton);
+
+      OrxGui::GLGuiButton* networkButton = new OrxGui::GLGuiPushButton("MultiPlayer");
+      networkButton->connect(SIGNAL(networkButton, released), this, SLOT(GameMenu, showMultiPlayer));
+      this->mainMenuBox->pack(networkButton);
+
+      OrxGui::GLGuiButton* optionsButton = new OrxGui::GLGuiPushButton("Options");
+      optionsButton->connect(SIGNAL(optionsButton, released), this, SLOT(GameMenu, showOptionsMenu));
+      this->mainMenuBox->pack(optionsButton);
+
+
+      OrxGui::GLGuiButton* quitButton = new OrxGui::GLGuiPushButton("Quit");
+      this->mainMenuBox->pack(quitButton);
+      quitButton->connect(SIGNAL(quitButton, released), this, SLOT(GameMenu, quitMenu));
+    }
   }
-
-
-  GameWorld::loadData();
-}
+  this->mainMenuBox->showAll();
+
+  this->mainMenuBox->setRelCoor2D(200, 100);
+}
+
+void GameMenu::showCampaigns()
+{
+
+  if (this->levelsBox == NULL)
+  {
+    this->levelsBox = new OrxGui::GLGuiBox();
+    {
+      const std::list<BaseObject*>* storyEntities = ClassList::getList(CL_STORY_ENTITY);
+      std::list<BaseObject*>::const_iterator it;
+      for( it = storyEntities->begin(); it != storyEntities->end(); it++)
+      {
+        StoryEntity* se = dynamic_cast<StoryEntity*>(*it);
+        if( se->isContainedInMenu())
+        {
+          OrxGui::GLGuiWidget* button = new OrxGui::GLGuiPushButton(se->getName());
+          levelsBox->pack(button);
+
+          // generating screenshoot item
+          /*
+          ImageEntity* ie = new ImageEntity();
+          ie->setVisibility(false);
+          ie->setBindNode((const PNode*)NULL);
+          ie->setTexture(se->getMenuScreenshoot());
+          ie->setRelCoor2D(State::getResX() / 2.0f + 250.0f, State::getResY() / 2.0f);
+          ie->setSize2D(140.0f, 105.0f);
+          this->menuLayers[1].screenshootList.push_back(ie);
+          */
+        }
+      }
+    }
+  }
+
+  this->levelsBox->showAll();
+  this->levelsBox->setRelCoor2D(200, 100);
+  this->mainMenuBox->setRelCoorSoft2D(50, 100, 5);
+
+}
+
+void GameMenu::showMultiPlayer()
+{
+
+}
+
+void GameMenu::showOptionsMenu()
+{
+  if (this->optionsBox == NULL)
+  {
+    this->optionsBox = new OrxGui::GLGuiBox();
+    {
+      OrxGui::GLGuiButton* generalButton = new OrxGui::GLGuiPushButton("General");
+      optionsBox->pack(generalButton);
+
+      OrxGui::GLGuiButton* audioButton = new OrxGui::GLGuiPushButton("Audio");
+      optionsBox->pack(audioButton);
+
+      OrxGui::GLGuiButton* videoButton = new OrxGui::GLGuiPushButton("Video");
+      optionsBox->pack(videoButton);
+
+      OrxGui::GLGuiButton* controlButton = new OrxGui::GLGuiPushButton("Control");
+      optionsBox->pack(controlButton);
+
+
+      //      for (unsigned int i = 0; i <
+      //OrxGui::GLGuiButton*
+
+    }
+  }
+  this->optionsBox->showAll();
+  this->optionsBox->setRelCoor2D(200, 100);
+
+  this->mainMenuBox->setRelCoorSoft2D(50, 100, 5);
+
+}
+
+
+
+
+
+
+
+
+
 
 /**
@@ -164 +270 @@
   this->unsubscribeEvents(ES_MENU);
 
-  GameWorld::unloadData();
+  return GameWorld::unloadData();
 }
 
@@ -175 +281 @@
   EventHandler::getInstance()->pushState(ES_MENU);
 
-  this->mainMenuBox->showAll();
+  this->showMainMenu();
 
   /* now call the underlying*/
-  GameWorld::start();
+  return GameWorld::start();
 }
 
@@ -191 +297 @@
 
   /* now call the underlying*/
-  GameWorld::stop();
+  return GameWorld::stop();
 }
 
@@ -276 +382 @@
 {
   /* call underlying function */
-  GameWorldData::init();
+  return GameWorldData::init();
 }
 
@@ -287 +393 @@
 {
   /* call underlying function */
-  GameWorldData::loadGUI(root);
+  return GameWorldData::loadGUI(root);
 }
 
@@ -297 +403 @@
 {
   /* call underlying function */
-  GameWorldData::unloadGUI();
+  return GameWorldData::unloadGUI();
 }
 
@@ -307 +413 @@
 ErrorMessage GameMenuData::loadWorldEntities(const TiXmlElement* root)
 {
-  GameWorldData::loadWorldEntities(root);
+  return GameWorldData::loadWorldEntities(root);
 }
 
@@ -317 +423 @@
 {
   /* call underlying function */
-  GameWorldData::unloadWorldEntities();
+  return GameWorldData::unloadWorldEntities();
 }
 
@@ -328 +434 @@
 {
   /* call underlying function */
-  GameWorldData::loadScene(root);
+  return GameWorldData::loadScene(root);
 }
 
@@ -338 +444 @@
 {
   /* call underlying function */
-  GameWorldData::unloadScene();
-}
-
-
-
+  return GameWorldData::unloadScene();
+}
+
+
+

branches/gui/src/story_entities/game_menu.h

@@ -27 +27 @@
     virtual ~GameMenu();
 
-    /// TODO TAKE THIS OUT
-    void enterGui();
-    void execURL() const;
-    static int startURL(void* data);
-
-    void setImage(int i);
-    OrxGui::GLGuiImage* image;
-    OrxGui::GLGuiInputLine* imageName;
-    ///
     virtual void loadParams(const TiXmlElement* root);
 
@@ -49 +40 @@
 
     void startLevel(int level);
+
+    void showMainMenu();
+    void showCampaigns();
+    void showMultiPlayer();
+    void showOptionsMenu();
+
     void quitMenu();
 
@@ -65 +62 @@
   private:
     OrxGui::GLGuiBox*                 mainMenuBox;
+    OrxGui::GLGuiBox*                 levelsBox;
+    OrxGui::GLGuiBox*                 networkBox;
+
+    OrxGui::GLGuiBox*                 optionsBox;
     OrxGui::GLGuiBox*                 audioBox;
     OrxGui::GLGuiBox*                 videoBox;
     OrxGui::GLGuiBox*                 controlBox;
-    OrxGui::GLGuiBox*                 levelsBox;
 
     Vector                            cameraVector;

branches/gui/src/story_entities/game_world.cc

@@ -140 +140 @@
   State::setScriptManager(&this->scriptManager);
 
+  return ErrorMessage();
 }
 
@@ -155 +156 @@
 
   PRINTF(3)("> Loading world: '%s'\n", getLoadFile().c_str());
-  TiXmlElement* element;
-  GameLoader* loader = GameLoader::getInstance();
+//  TiXmlElement* element;
+//  GameLoader* loader = GameLoader::getInstance();
 
   if( getLoadFile().empty())
   {
     PRINTF(1)("GameWorld has no path specified for loading\n");
-    return (ErrorMessage){213,"Path not specified","GameWorld::load()"};
+    return (ErrorMessage(213,"Path not specified","GameWorld::load()"));
   }
 
@@ -170 +171 @@
     PRINTF(1)("loading XML File: %s @ %s:l%d:c%d\n", XMLDoc->ErrorDesc(), this->getLoadFile().c_str(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
     delete XMLDoc;
-    return (ErrorMessage){213,"XML File parsing error","GameWorld::load()"};
+    return ErrorMessage(213,"XML File parsing error","GameWorld::load()");
   }
   // check basic validity
@@ -180 +181 @@
     PRINTF(1)("Specified XML File is not an orxonox world data file (WorldDataFile element missing)\n");
     delete XMLDoc;
-    return (ErrorMessage){213,"Path not a WorldDataFile","GameWorld::load()"};
+    return ErrorMessage(213,"Path not a WorldDataFile","GameWorld::load()");
   }
   /* the whole loading process for the GameWorld */
@@ -193 +194 @@
   Account *b = new Account(30);
   b->setName("b");
-  
-  
+
+
   LoadParamXML(root, "ScriptManager", &this->scriptManager, ScriptManager, loadParams);
 
   delete XMLDoc;
   this->releaseLoadScreen();
+
+  return ErrorMessage();
 }
 
@@ -223 +226 @@
   if (this->dataXML)
     delete this->dataXML;
+
+  return ErrorMessage();
 }
 
@@ -235 +240 @@
   State::setScriptManager(&this->scriptManager); //make sure we have the right script manager
   this->run();
+
+  return true;
 }
 
@@ -245 +252 @@
   PRINTF(3)("GameWorld::stop() - got stop signal\n");
   State::setScriptManager(NULL);
-  this->bRunning = false;
+  return (this->bRunning = false);
 }
 
@@ -254 +261 @@
 bool GameWorld::pause()
 {
-  this->bPaused = true;
+  return (this->bPaused = true);
 }
 
@@ -263 +270 @@
 bool GameWorld::resume()
 {
-  this->bPaused = false;
+  return(this->bPaused = false);
 }
 
@@ -413 +420 @@
     if( likely(this->dataTank->gameRule != NULL))
       this->dataTank->gameRule->tick(this->dtS);
-      
+
   }
 }

branches/gui/src/story_entities/game_world_data.cc

@@ -108 +108 @@
 
   GraphicsEngine::getInstance()->displayFPS(true);
+
+  return ErrorMessage();
 }
 
@@ -131 +133 @@
   this->loadWorldEntities(root);
   this->loadScene(root);
+
+  return ErrorMessage();
 }
 
@@ -142 +146 @@
   this->unloadWorldEntities();
   this->unloadScene();
+
+  return ErrorMessage();
 }
 
@@ -166 +172 @@
   }
   this->glmis->draw();
+
+  return ErrorMessage();
 }
 
@@ -175 +183 @@
 {
   delete this->glmis;
+
+  return ErrorMessage();
 }
 
@@ -250 +260 @@
   /* init the pnode tree */
   PNode::getNullParent()->init();
+
+  return ErrorMessage();
 }
 
@@ -312 +324 @@
 
   this->glmis = NULL;
+
+  return ErrorMessage();
 }
 
@@ -337 +351 @@
     this->localCamera->addChild(this->sky);
   OrxSound::SoundEngine::getInstance()->setListener(this->localCamera);
+
+  return ErrorMessage();
 }
 
@@ -357 +373 @@
 
   State::setGameRules(NULL);
+
+  return ErrorMessage();
 }
 

branches/gui/src/story_entities/multi_player_world.cc

@@ -123 +123 @@
 /**
  * cleanup
- * @return 
+ * @return
  */
 ErrorMessage MultiPlayerWorld::unloadData( )
 {
-    
+
   GameWorld::unloadData();
-  
+
   delete NetworkManager::getInstance();
   delete NetworkGameManager::getInstance();
 
+  return ErrorMessage();
 }

branches/gui/src/story_entities/multi_player_world_data.cc

@@ -78 +78 @@
 {
   /* call underlying function */
-  GameWorldData::init();
+  return GameWorldData::init();
 }
 
@@ -89 +89 @@
 {
   /* call underlying function */
-  GameWorldData::loadGUI(root);
+  return GameWorldData::loadGUI(root);
 }
 
@@ -99 +99 @@
 {
   /* call underlying function */
-  GameWorldData::unloadGUI();
+  return GameWorldData::unloadGUI();
 }
 
@@ -245 +245 @@
   this->drawLists.push_back(OM_GROUP_01);
   this->drawLists.push_back(OM_GROUP_01_PROJ);
-  
+
   State::setPlayer(this->localPlayer);
- 
+
+  return ErrorMessage();
 }
 
@@ -257 +258 @@
 {
   /* call underlying function */
-  GameWorldData::unloadWorldEntities();
+  return GameWorldData::unloadWorldEntities();
 }
 
@@ -269 +270 @@
   /* call underlying function */
   GameWorldData::loadScene(root);
-  
+
   // create server playable
   if ( NetworkManager::getInstance()->isGameServer() )
@@ -276 +277 @@
     State::getPlayer()->setPlayable( PlayerStats::getStats( 0 )->getPlayable() );
   }
+
+  return ErrorMessage();
 }
 
@@ -285 +288 @@
 {
   /* call underlying function */
-  GameWorldData::unloadScene();
+  return GameWorldData::unloadScene();
 }
 

branches/gui/src/story_entities/single_player_world_data.cc

@@ -45 +45 @@
 {
   /* call underlying function */
-  GameWorldData::init();
+  return GameWorldData::init();
 }
 
@@ -56 +56 @@
 {
   /* call underlying function */
-  GameWorldData::loadGUI(root);
+  return GameWorldData::loadGUI(root);
 }
 
@@ -66 +66 @@
 {
   /* call underlying function */
-  GameWorldData::unloadGUI();
+  return GameWorldData::unloadGUI();
 }
 
@@ -77 +77 @@
 {
   /* call underlying function */
-  GameWorldData::loadWorldEntities(root);
+  return GameWorldData::loadWorldEntities(root);
 }
 
@@ -87 +87 @@
 {
   /* call underlying function */
-  GameWorldData::unloadWorldEntities();
+  return GameWorldData::unloadWorldEntities();
 }
 
@@ -98 +98 @@
 {
   /* call underlying function */
-  GameWorldData::loadScene(root);
+  return GameWorldData::loadScene(root);
 }
 
@@ -108 +108 @@
 {
   /* call underlying function */
-  GameWorldData::unloadScene();
+  return GameWorldData::unloadScene();
 }
 

branches/gui/src/story_entities/story_entity.h

@@ -35 +35 @@
   /* initialisation and loading */
   /** initializes a Story Entity to the needed values */
-  virtual ErrorMessage init() {};
+  virtual ErrorMessage init() { return ErrorMessage(); };
   /** called to load the data into the StoryEntity*/
-  virtual ErrorMessage loadData() {};
+  virtual ErrorMessage loadData() { return ErrorMessage(); };
   /** function that unloads the data from the StoryEntity */
-  virtual ErrorMessage unloadData() {};
+  virtual ErrorMessage unloadData() { return ErrorMessage(); };
 
   /* running, stopping and pausing */