Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9406 in orxonox.OLD for trunk/src/story_entities


Ignore:
Timestamp:
Jul 24, 2006, 11:09:47 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

Location:
trunk/src/story_entities
Files:
2 deleted
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/story_entities/Makefile.am

    r8717 r9406  
    1313                story_entities/multi_player_world_data.cc \
    1414                story_entities/movie_loader.cc \
    15                 story_entities/simple_game_menu.cc \
    1615                \
    1716                story_entities/menu/game_menu.cc \
    … …  
    3029                story_entities/multi_player_world_data.h \
    3130                story_entities/movie_loader.h \
    32                 story_entities/simple_game_menu.h \
    3331                \
    3432                story_entities/menu/game_menu.h \

  • trunk/src/story_entities/campaign.cc

    r8717 r9406  
    2525#include "campaign_data.h"
    2626
    27 using namespace std;
     27
    2828
    2929

  • trunk/src/story_entities/campaign_data.cc

    r7370 r9406  
    2323
    2424
    25 using namespace std;
     25
    2626
    2727
    … …  
    103103  int                            nextStoryID;
    104104  int                            storyID;
    105   list<StoryEntity*>::iterator   it;
     105  std::list<StoryEntity*>::iterator   it;
    106106
    107107  nextStoryID = 0;
    … …  
    124124  int                            nextStoryID;
    125125  int                            storyID;
    126   list<StoryEntity*>::iterator   it;
     126  std::list<StoryEntity*>::iterator   it;
    127127
    128128  nextStoryID = this->currentEntity->getNextStoryID();
    … …  
    145145StoryEntity* CampaignData::getLevel(int storyID)
    146146{
    147   list<StoryEntity*>::iterator   it;
     147  std::list<StoryEntity*>::iterator   it;
    148148  for( it = this->storyEntities.begin(); it != this->storyEntities.end(); it++)
    149149  {

  • trunk/src/story_entities/dedicated_server_world.cc

    r7193 r9406  
    2828
    2929
    30 using namespace std;
     30
    3131
    3232//! This creates a Factory to fabricate a DedicatedServerWorld

  • trunk/src/story_entities/game_world.cc

    r9235 r9406  
    512512void GameWorld::display ()
    513513{
     514
     515    // if this server is a dedicated server the game workd does not need to be drawn
     516  if( !GraphicsEngine::getInstance()->isDedicated())
     517  {
    514518  // render the reflection texture
    515519  this->renderPassReflection();
    516520  // redner the refraction texture
    517521  this->renderPassRefraction();
     522  }
    518523  // render all
    519524  this->renderPassAll();
    … …  
    643648  LightManager::getInstance()->draw();
    644649
    645   /* Draw the BackGround */
    646   this->drawEntityList(State::getObjectManager()->getObjectList(OM_BACKGROUND));
    647   engine->drawBackgroundElements();
    648 
    649   /* draw all WorldEntiy groups */
    650   for (unsigned int i = 0; i < this->dataTank->drawLists.size(); ++i)
    651     this->drawEntityList(State::getObjectManager()->getObjectList(this->dataTank->drawLists[i]));
    652 
    653   AtmosphericEngine::getInstance()->draw();
    654 
    655   if( unlikely( this->showBV))
    656   {
    657     CDEngine* engine = CDEngine::getInstance();
     650  // only render the world if its not dedicated mode
     651  if( !GraphicsEngine::getInstance()->isDedicated())
     652  {
     653    /* Draw the BackGround */
     654    this->drawEntityList(State::getObjectManager()->getObjectList(OM_BACKGROUND));
     655    engine->drawBackgroundElements();
     656
     657    /* draw all WorldEntiy groups */
    658658    for (unsigned int i = 0; i < this->dataTank->drawLists.size(); ++i)
    659       engine->drawBV(State::getObjectManager()->getObjectList(this->dataTank->drawLists[i]), this->showBVLevel);
    660   }
    661 
    662   if( unlikely(this->showPNodes))
    663     PNode::getNullParent()->debugDraw(0);
     659      this->drawEntityList(State::getObjectManager()->getObjectList(this->dataTank->drawLists[i]));
     660
     661    AtmosphericEngine::getInstance()->draw();
     662
     663    if( unlikely( this->showBV))
     664    {
     665      CDEngine* engine = CDEngine::getInstance();
     666      for (unsigned int i = 0; i < this->dataTank->drawLists.size(); ++i)
     667        engine->drawBV(State::getObjectManager()->getObjectList(this->dataTank->drawLists[i]), this->showBVLevel);
     668    }
     669
     670    if( unlikely(this->showPNodes))
     671      PNode::getNullParent()->debugDraw(0);
     672
     673    // draw the game ruls
     674    if( likely(this->dataTank->gameRule != NULL))
     675      this->dataTank->gameRule->draw();
     676  }
    664677
    665678  engine->draw();
    666 
    667   // draw the game ruls
    668   if( likely(this->dataTank->gameRule != NULL))
    669     this->dataTank->gameRule->draw();
    670679}
    671680

  • trunk/src/story_entities/game_world_data.cc

    r9235 r9406  
    6161
    6262
    63 using namespace std;
     63
    6464
    6565
    … …  
    194194ErrorMessage GameWorldData::loadWorldEntities(const TiXmlElement* root)
    195195{
     196
    196197  const TiXmlElement* element = root->FirstChildElement("WorldEntities");
     198  bool mouseCaptured = EventHandler::getInstance()->grabbedEvents();
     199  EventHandler::getInstance()->grabEvents(false);
    197200
    198201  if( element == NULL)
    … …  
    209212      BaseObject* created = Factory::fabricate(element);
    210213      if( created != NULL )
    211         PRINTF(4)("Created a %s: %s\n", created->getClassName(), created->getName());
     214        PRINTF(4)("Created a %s: %s\n", created->getClassCName(), created->getCName());
    212215
    213216      //todo do this more elegant
    … …  
    233236
    234237  Playable* playable;
    235   const list<BaseObject*>* playableList = ClassList::getList(CL_PLAYABLE);
     238  const std::list<BaseObject*>* playableList = ClassList::getList(CL_PLAYABLE);
    236239  if (playableList != NULL && !playableList->empty())
    237240  {
    … …  
    262265  /* init the pnode tree */
    263266  PNode::getNullParent()->init();
     267
     268  EventHandler::getInstance()->grabEvents(mouseCaptured);
    264269
    265270  return ErrorMessage();
    … …  
    284289      //    ClassList::debug( 3, CL_PARENT_NODE);
    285290      //    PNode::getNullParent()->debugNode(0);
    286       //    printf("%s::%s\n", nodeList->front()->getClassName(), nodeList->front()->getName());
     291      //    printf("%s::%s\n", nodeList->front()->getClassCName(), nodeList->front()->getName());
    287292      delete nodeList->front();
    288293    }

  • trunk/src/story_entities/game_world_data.h

    r7460 r9406  
    4242    void loadGameRule(const TiXmlElement* root);
    4343
     44
    4445  protected:
    4546    virtual ErrorMessage loadGUI(const TiXmlElement* root);

  • trunk/src/story_entities/menu/game_menu.cc

    r9235 r9406  
    152152    {
    153153      OrxGui::GLGuiButton* startButton = new OrxGui::GLGuiPushButton("Play");
    154       startButton->connect(SIGNAL(startButton, released), this, SLOT(GameMenu, showCampaigns));
     154      startButton->released.connect(this, &GameMenu::showCampaigns);
    155155      this->mainMenuBox->pack(startButton);
    156156      startButton->select();
    157157
    158158      OrxGui::GLGuiButton* networkButton = new OrxGui::GLGuiPushButton("MultiPlayer");
    159       networkButton->connect(SIGNAL(networkButton, released), this, SLOT(GameMenu, showMultiPlayer));
     159      networkButton->released.connect(this, &GameMenu::showMultiPlayer);
    160160      this->mainMenuBox->pack(networkButton);
    161161
    162162      OrxGui::GLGuiButton* optionsButton = new OrxGui::GLGuiPushButton("Options");
    163       optionsButton->connect(SIGNAL(optionsButton, released), this, SLOT(GameMenu, showOptionsMenu));
     163      optionsButton->released.connect(this, &GameMenu::showOptionsMenu);
    164164      this->mainMenuBox->pack(optionsButton);
    165165
    … …  
    167167      OrxGui::GLGuiButton* quitButton = new OrxGui::GLGuiPushButton("Quit");
    168168      this->mainMenuBox->pack(quitButton);
    169       quitButton->connect(SIGNAL(quitButton, released), this, SLOT(GameMenu, quitMenu));
     169      quitButton->released.connect(this, &GameMenu::quitMenu);
    170170    }
    171171  }
    … …  
    202202          printf("%s\n", se->getMenuScreenshoot().c_str());
    203203          OrxGui::GLGuiImageButton* button = new OrxGui::GLGuiImageButton(se->getName(), se->getStoryID(), se->getMenuScreenshoot(), image);
    204           button->connect(SIGNAL(button, startLevel), this, SLOT(GameMenu, startLevel));
     204          button->startLevel.connect(this, &GameMenu::startLevel);
    205205          labelBox->pack(button);
    206206
    … …  
    244244      OrxGui::GLGuiButton* clientButton = new OrxGui::GLGuiPushButton("Client");
    245245      box->pack(clientButton);
    246       clientButton->connect(SIGNAL(clientButton, released), this, SLOT(GameMenu, showClientMenu));
     246      clientButton->released.connect(this, &GameMenu::showClientMenu);
    247247
    248248      OrxGui::GLGuiButton* serverButton = new OrxGui::GLGuiPushButton("Server");
    249249      box->pack(serverButton);
    250       serverButton->connect(SIGNAL(serverButton, released), this, SLOT(GameMenu, showServerMenu));
     250      serverButton->released.connect(this, &GameMenu::showServerMenu);
    251251
    252252      networkBox->pack( box );
    … …  
    531531      this->ipInputLine->setText( Preferences::getInstance()->getString( "multiplayer", "lastVisitedServer", "localhost" ) );
    532532      this->clientNetworkBox->pack( this->ipInputLine );
    533       this->ipInputLine->connect(SIGNAL(ipInputLine, enterPushed), this, SLOT(GameMenu, connectToServer));
     533      //this->ipInputLine->enterPushed.connect(this, &GameMenu::connectToServer); /// redo this.
    534534      this->ipInputLine->select();
    535535
    536536      OrxGui::GLGuiButton* connectButton = new OrxGui::GLGuiPushButton("Connect");
    537537      clientNetworkBox->pack(connectButton);
    538       connectButton->connect(SIGNAL(connectButton, released), this, SLOT(GameMenu, connectToServer));
     538      connectButton->released.connect(this, &GameMenu::connectToServer);
    539539    }
    540540  }
    … …  
    574574      OrxGui::GLGuiButton* createButton = new OrxGui::GLGuiPushButton("Create Server");
    575575      serverNetworkBox->pack(createButton);
    576       createButton->connect(SIGNAL(createButton, released), this, SLOT(GameMenu, createServer));
     576      createButton->released.connect(this, &GameMenu::createMasterServer);
    577577    }
    578578  }
    … …  
    593593
    594594  State::setOnline(true);
    595   NetworkManager::getInstance()->establishConnection( this->ipInputLine->_getText(), 9999 );
     595  NetworkManager::getInstance()->createClient( this->ipInputLine->_getText(), 9999 );
    596596
    597597  Preferences::getInstance()->setString( "multiplayer", "lastVisitedServer", this->ipInputLine->_getText() );
    … …  
    600600}
    601601
    602 void GameMenu::createServer( )
     602void GameMenu::createMasterServer( )
    603603{
    604604  PRINTF(0)("Create server\n" );
    605605
    606606  State::setOnline(true);
    607   NetworkManager::getInstance()->createServer( 9999 );
     607  NetworkManager::getInstance()->createMasterServer( 9999 );
    608608
    609609  this->startLevel( 5 );

  • trunk/src/story_entities/menu/game_menu.h

    r9059 r9406  
    5050   
    5151    void showServerMenu();
    52     void createServer();
     52    void createMasterServer();
    5353
    5454

  • trunk/src/story_entities/menu/glgui_imagebutton.cc

    r8740 r9406  
    4040    GLGuiPushButton::releasing(pos, focused);
    4141    if (focused)
    42       this->emit(startLevel(this->levelID));
     42      this->startLevel.emit(this->levelID);
    4343  }
    4444
    … …  
    7777      {
    7878//        emit(released());
    79         emit(startLevel(this->levelID));
     79        startLevel.emit(this->levelID);
    8080      }
    8181      return true;

  • trunk/src/story_entities/menu/glgui_imagebutton.h

    r8740 r9406  
    2525    void release();
    2626
    27     DeclareSignal1(startLevel, int);
     27    sigslot::signal1<int> startLevel;
    2828
    2929  protected:

  • trunk/src/story_entities/movie_loader.cc

    r7919 r9406  
    2424
    2525
    26 using namespace std;
     26
    2727
    2828CREATE_FACTORY(MovieLoader, CL_MOVIE_LOADER);

  • trunk/src/story_entities/multi_player_world.cc

    r9235 r9406  
    3131
    3232
    33 using namespace std;
    34 
     33#include "glgui_handler.h"
    3534
    3635//! Register a command to print some multiplayer world infos
    … …  
    6463  if( this->dataTank)
    6564    delete this->dataTank;
     65  delete OrxGui::GLGuiHandler::getInstance( );
    6666}
    6767

  • trunk/src/story_entities/multi_player_world_data.cc

    r9235 r9406  
    4747#include "player_stats.h"
    4848
     49#include "proxy/network_settings.h"
    4950
    5051#include "glmenu_imagescreen.h"
    … …  
    5253
    5354
    54 using namespace std;
     55
    5556
    5657
    … …  
    110111{
    111112  const TiXmlElement* element = NULL;
    112  
    113   if( NetworkManager::getInstance()->isGameServer() )
     113
     114  if( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServer())
    114115  {
    115116    /* load the spawning points */
    … …  
    128129        BaseObject* created = Factory::fabricate(element);
    129130        if( created != NULL )
    130           printf("Created a Spawning Point %s: %s\n", created->getClassName(), created->getName());
     131          printf("Created a Spawning Point %s: %s\n", created->getClassCName(), created->getCName());
    131132
    132133        element = element->NextSiblingElement();
    … …  
    147148    element = element->FirstChildElement();
    148149
    149     if( NetworkManager::getInstance()->isGameServer() )
     150    if( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServer())
    150151    {
    151152      while( element != NULL)
    … …  
    154155        BaseObject* created = Factory::fabricate(element);
    155156        if( created != NULL )
    156           PRINTF(1)("Created a %s: %s (0x%8x) from %s\n", created->getClassName(), created->getName(), created->getLeafClassID(), element->Value());
     157          PRINTF(1)("Created a %s: %s (0x%8x) from %s\n", created->getClassCName(), created->getCName(), created->getLeafClassID(), element->Value());
    157158        else
    158159          PRINTF(1)("NetworkWorld: could not create this entity\n");
    … …  
    185186
    186187          if( created != NULL )
    187             PRINTF(1)("Created a %s: %s (0x%8x) from %s\n", created->getClassName(), created->getName(), created->getLeafClassID(), element->Value());
     188            PRINTF(1)("Created a %s: %s (0x%8x) from %s\n", created->getClassCName(), created->getCName(), created->getLeafClassID(), element->Value());
    188189          else
    189190            PRINTF(1)("NetworkWorld: could not create this entity\n");
    … …  
    205206
    206207
    207     if( NetworkManager::getInstance()->isGameServer())
     208    if( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServer())
    208209    {
    209210      this->localPlayer = new Player();
    … …  
    280281  GameWorldData::loadScene(root);
    281282
     283//   LoadParamXML(root, "NetworkSettings", NetworkSettings::getInstance(), NetworkSettings, loadNetworkSettings);
     284
    282285  // create server playable
    283   if ( NetworkManager::getInstance()->isGameServer() )
     286  if ( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServer())
    284287  {
    285288    NetworkGameManager::getInstance()->signalNewPlayer( 0 );
    … …  
    296299ErrorMessage MultiPlayerWorldData::unloadScene()
    297300{
     301  // delete the proxy settings
     302  delete NetworkSettings::getInstance();
     303
    298304  /* call underlying function */
    299305  return GameWorldData::unloadScene();
    … …  
    317323  {
    318324    Playable* p = dynamic_cast<Playable*>(*entity);
    319     PRINTF(0)("Got a playable, class: %s, name: %s, uid: %i\n", (*entity)->getClassName(), (*entity)->getName(), p->getUniqueID());
     325    PRINTF(0)("Got a playable, class: %s, name: %s, uid: %i\n", (*entity)->getClassCName(), (*entity)->getCName(), p->getUniqueID());
    320326  }
    321327
    … …  
    340346
    341347  PNode* cam = State::getCameraTargetNode();
    342   PRINT(0)("Camera has target - class: %s, name: %s, uid: %i\n", cam->getClassName(), cam->getName(), cam->getUniqueID());
     348  PRINT(0)("Camera has target - class: %s, name: %s, uid: %i\n", cam->getClassCName(), cam->getCName(), cam->getUniqueID());
    343349
    344350  PRINT(0)("==================================================\n");

  • trunk/src/story_entities/single_player_world.cc

    r7287 r9406  
    3030
    3131
    32 using namespace std;
     32
    3333
    3434

  • trunk/src/story_entities/single_player_world_data.cc

    r8717 r9406  
    2121
    2222
    23 using namespace std;
     23
    2424
    2525

  • trunk/src/story_entities/story_entity.cc

    r8330 r9406  
    2626
    2727
    28 using namespace std;
     28
    2929
    3030
Note: See TracChangeset for help on using the changeset viewer.