Changeset 793 for code/branches/core/src/orxonox/Orxonox.cc

Timestamp:

Feb 9, 2008, 10:55:17 PM (17 years ago)

Author:

landauf

Message:

reduced the build-script of the core branch to the minimum (utils, core, orxonox + test objects)

File:

• code/branches/core/src/orxonox/Orxonox.cc (modified) (11 diffs)

code/branches/core/src/orxonox/Orxonox.cc

@@ -57 +57 @@
 
 // loader and audio
-#include "loader/LevelLoader.h"
-#include "audio/AudioManager.h"
+//#include "loader/LevelLoader.h"
+//#include "audio/AudioManager.h"
 
 // network
-#include "network/Server.h"
-#include "network/Client.h"
-#include "network/NetworkFrameListener.h"
+//#include "network/Server.h"
+//#include "network/Client.h"
+//#include "network/NetworkFrameListener.h"
 
 // objects
 #include "objects/Tickable.h"
 #include "tools/Timer.h"
-#include "objects/NPC.h"
+//#include "objects/NPC.h"
 #include "core/ArgReader.h"
 #include "core/Factory.h"
 #include "core/Debug.h"
-#include "hud/HUD.h"
-#include "objects/weapon/BulletManager.h"
+//#include "hud/HUD.h"
+//#include "objects/weapon/BulletManager.h"
 #include "GraphicsEngine.h"
 
@@ -84 +84 @@
   {
     public:
-      OrxListener(OIS::Keyboard *keyboard, audio::AudioManager*  auMan, gameMode mode)
+      OrxListener(OIS::Keyboard *keyboard/*, audio::AudioManager*  auMan*/, gameMode mode)
       {
         mKeyboard = keyboard;
         mode_=mode;
-        auMan_ = auMan;
+//        auMan_ = auMan;
       }
 
       bool frameStarted(const Ogre::FrameEvent& evt)
       {
-        auMan_->update();
+//        auMan_->update();
         updateAI();
 
-        if(mode_ == PRESENTATION)
+/*        if(mode_ == PRESENTATION)
           server_g->tick(evt.timeSinceLastFrame);
         else if(mode_ == CLIENT)
           client_g->tick(evt.timeSinceLastFrame);
-
+*/
         usleep(10);
 
@@ -108 +108 @@
 
       void updateAI()
-      {
+      {/*
         for(Iterator<NPC> it = ObjectList<NPC>::start(); it; ++it)
         {
           it->update();
-        }
+        }*/
       }
 
@@ -118 +118 @@
       gameMode mode_;
       OIS::Keyboard *mKeyboard;
-      audio::AudioManager*  auMan_;
+//      audio::AudioManager*  auMan_;
   };
 
@@ -131 +131 @@
     this->ogre_ = new GraphicsEngine();
     this->dataPath_ = "";
-    this->loader_ = 0;
-    this->auMan_ = 0;
+//    this->loader_ = 0;
+//    this->auMan_ = 0;
     this->singletonRef_ = 0;
     this->keyboard_ = 0;
@@ -213 +213 @@
       //ogre_->getRoot()->addFrameListener(new network::ServerFrameListener());
       //std::cout << "could not add framelistener" << std::endl;
-      server_g->open();
+//      server_g->open();
       break;
     case CLIENT:
-      client_g->establishConnection();
+//      client_g->establishConnection();
       break;
     case SERVER:
@@ -279 +279 @@
     createFrameListener();
     try{
-      server_g = new network::Server(); //!< add port and bindadress
-      server_g->open(); //!< open server and create listener thread
-      if(ogre_ && ogre_->getRoot())
-        ogre_->getRoot()->addFrameListener(new network::ServerFrameListener()); // adds a framelistener for the server
+//      server_g = new network::Server(); //!< add port and bindadress
+//      server_g->open(); //!< open server and create listener thread
+//      if(ogre_ && ogre_->getRoot())
+//        ogre_->getRoot()->addFrameListener(new network::ServerFrameListener()); // adds a framelistener for the server
       COUT(3) << "Info: network framelistener added" << std::endl;
     }
@@ -303 +303 @@
     ogre_->setConfigPath(path);
     ogre_->setup();
-    server_g = new network::Server(); // FIXME add some settings if wanted
+//    server_g = new network::Server(); // FIXME add some settings if wanted
     if(!ogre_->load()) die(/* unable to load */);
     // FIXME add network framelistener
@@ -313 +313 @@
     ogre_->setConfigPath(path);
     ogre_->setup();
-    if(serverIp_.compare("")==0)
+/*    if(serverIp_.compare("")==0)
       client_g = new network::Client();
     else
-      client_g = new network::Client(serverIp_, 55556);
+      client_g = new network::Client(serverIp_, 55556);*/
     if(!ogre_->load()) die(/* unable to load */);
-    ogre_->getRoot()->addFrameListener(new network::ClientFrameListener());
+//    ogre_->getRoot()->addFrameListener(new network::ClientFrameListener());
   }
 
@@ -374 +374 @@
   {
         // Init audio
-    auMan_ = new audio::AudioManager();
-
-    bulletMgr_ = new BulletManager();
+//    auMan_ = new audio::AudioManager();
+
+//    bulletMgr_ = new BulletManager();
 
     // load this file from config
-    loader_ = new loader::LevelLoader("sample.oxw");
-    loader_->loadLevel();
-
-    Ogre::Overlay* hudOverlay = Ogre::OverlayManager::getSingleton().getByName("Orxonox/HUD1.2");
-    HUD* orxonoxHud;
-    orxonoxHud = new HUD();
-    orxonoxHud->setEnergyValue(20);
-    orxonoxHud->setEnergyDistr(20,20,60);
-    hudOverlay->show();
+//    loader_ = new loader::LevelLoader("sample.oxw");
+//    loader_->loadLevel();
+
+//    Ogre::Overlay* hudOverlay = Ogre::OverlayManager::getSingleton().getByName("Orxonox/HUD1.2");
+//    HUD* orxonoxHud;
+//    orxonoxHud = new HUD();
+//    orxonoxHud->setEnergyValue(20);
+//    orxonoxHud->setEnergyDistr(20,20,60);
+//    hudOverlay->show();
 
         /*
@@ -458 +458 @@
 
     //if(mode_!=CLIENT) // FIXME just a hack ------- remove this in future
-      frameListener_ = new OrxListener(keyboard_, auMan_, mode_);
+      frameListener_ = new OrxListener(keyboard_/*, auMan_*/, mode_);
     ogre_->getRoot()->addFrameListener(frameListener_);
   }