Changeset 793 for code/branches/core

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)

Location:

code/branches/core

Files:

• bin/levels/sample.oxw (modified) (2 diffs)
• src/CMakeLists.txt (modified) (1 diff)
• src/loader/CMakeLists.txt (modified) (1 diff)
• src/loader/LevelLoader.cc (modified) (4 diffs)
• src/orxonox/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/Orxonox.cc (modified) (11 diffs)
• src/orxonox/Orxonox.h (modified) (2 diffs)
• src/orxonox/objects/Model.cc (modified) (1 diff)
• src/orxonox/objects/WorldEntity.cc (modified) (2 diffs)
• src/orxonox/objects/WorldEntity.h (modified) (1 diff)
• src/orxonox/objects/test3.cc (modified) (1 diff)
• src/orxonox/orxonox_from_oh.cc (added)

code/branches/core/bin/levels/sample.oxw

@@ -11 +11 @@
 
 
-
+<!--
  <audio>
                 <ambient>
@@ -21 +21 @@
                 </ambient>
   </audio>
-
+-->
   <!-- Keep a minimum distance of >100 to the object, otherwise the camara thinks it's in the object -->
   <!-- the value has to negative, as we want the camara behind the object -->

code/branches/core/src/CMakeLists.txt

@@ -4 +4 @@
 ADD_SUBDIRECTORY(util)
 ADD_SUBDIRECTORY(orxonox/core)
-ADD_SUBDIRECTORY(audio)
-ADD_SUBDIRECTORY(network)
-ADD_SUBDIRECTORY(loader)
+#ADD_SUBDIRECTORY(audio)
+#ADD_SUBDIRECTORY(network)
+#ADD_SUBDIRECTORY(loader)
 ADD_SUBDIRECTORY(orxonox)

code/branches/core/src/loader/CMakeLists.txt

@@ -13 +13 @@
 TARGET_LINK_LIBRARIES( loader
   util
+  core
 )

code/branches/core/src/loader/LevelLoader.cc

@@ -35 +35 @@
 #include "core/CoreIncludes.h"
 
-#include "audio/AudioManager.h"
+//#include "audio/AudioManager.h"
 #include "core/BaseObject.h"
 #include "orxonox/Orxonox.h"
@@ -99 +99 @@
     {
       TiXmlElement* loadElem;
-      TiXmlElement* audioElem;
+//      TiXmlElement* audioElem;
       TiXmlElement* worldElem;
       TiXmlElement* tElem;
@@ -139 +139 @@
 
       }
-
+/*
       // Load audio
       audio::AudioManager* auMan = orxonox::Orxonox::getSingleton()->getAudioManagerPointer();
@@ -169 +169 @@
         }
       }
-
+*/
       // Load world
       worldElem = rootElement_->FirstChildElement("world");

code/branches/core/src/orxonox/CMakeLists.txt

@@ -3 +3 @@
   Main.cc
   Orxonox.cc
-  SpaceshipSteering.cc
-  hud/HUD.cc
-  particle/ParticleInterface.cc
-  tools/BillboardSet.cc
-  tools/Light.cc
+#  SpaceshipSteering.cc
+#  hud/HUD.cc
+#  particle/ParticleInterface.cc
+#  tools/BillboardSet.cc
+#  tools/Light.cc
   tools/Mesh.cc
-  objects/Ambient.cc
-  objects/Camera.cc
-  objects/Explosion.cc
-  objects/Fighter.cc
+#  objects/Ambient.cc
+#  objects/Camera.cc
+#  objects/Explosion.cc
+#  objects/Fighter.cc
   objects/Model.cc
-  objects/NPC.cc
-  objects/Projectile.cc
-  objects/Skybox.cc
-  objects/SpaceShip.cc
-# objects/SpaceshipSteeringObject.cc
-# objects/test1.cc
-# objects/test2.cc
-# objects/test3.cc
+#  objects/NPC.cc
+#  objects/Projectile.cc
+#  objects/Skybox.cc
+#  objects/SpaceShip.cc
+#  objects/SpaceshipSteeringObject.cc
+  objects/test1.cc
+  objects/test2.cc
+  objects/test3.cc
   objects/WorldEntity.cc
-  objects/weapon/AmmunitionDump.cc
-  objects/weapon/BarrelGun.cc
-  objects/weapon/BaseWeapon.cc
-  objects/weapon/Bullet.cc
-  objects/weapon/BulletManager.cc
-  objects/weapon/WeaponStation.cc
+#  objects/weapon/AmmunitionDump.cc
+#  objects/weapon/BarrelGun.cc
+#  objects/weapon/BaseWeapon.cc
+#  objects/weapon/Bullet.cc
+#  objects/weapon/BulletManager.cc
+#  objects/weapon/WeaponStation.cc
 )
 
@@ -40 +40 @@
   util
   core
-  audio
-  network
-  loader
+#  audio
+#  network
+#  loader
 )
 

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_);
   }

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

@@ -41 +41 @@
       inline Ogre::SceneManager* getSceneManager()         { return ogre_->getSceneManager(); };
       inline GraphicsEngine* getOgrePointer()              { return ogre_; };
-      inline audio::AudioManager* getAudioManagerPointer() { return auMan_; };
+//      inline audio::AudioManager* getAudioManagerPointer() { return auMan_; };
       inline OIS::Keyboard* getKeyboard()                  { return this->keyboard_; }
       inline OIS::Mouse* getMouse()                        { return this->mouse_; }
-      inline BulletManager* getBulletMgr()                 { return this->bulletMgr_; }
+//      inline BulletManager* getBulletMgr()                 { return this->bulletMgr_; }
 
     private:
@@ -69 +69 @@
       GraphicsEngine*       ogre_;          //!< our dearest graphics engine <3
       std::string           dataPath_;      //!< path to data
-      loader::LevelLoader*  loader_;        //!< level loader builds the scene
-      audio::AudioManager*  auMan_;         //!< audio manager
-      BulletManager*        bulletMgr_;     //!< Keeps track of the thrown bullets
+//      loader::LevelLoader*  loader_;        //!< level loader builds the scene
+//      audio::AudioManager*  auMan_;         //!< audio manager
+//      BulletManager*        bulletMgr_;     //!< Keeps track of the thrown bullets
       static Orxonox*       singletonRef_;
       OIS::Keyboard*        keyboard_;

code/branches/core/src/orxonox/objects/Model.cc

@@ -71 +71 @@
 
     void Model::registerAllVariables(){
-      registerVar(&meshSrc_, meshSrc_.length() + 1, network::STRING);
+//      registerVar(&meshSrc_, meshSrc_.length() + 1, network::STRING);
     }
 }

code/branches/core/src/orxonox/objects/WorldEntity.cc

@@ -163 +163 @@
     void WorldEntity::registerAllVariables()
     {
-      // register coordinates
+/*      // register coordinates
       registerVar( (void*) &(this->getPosition().x), sizeof(this->getPosition().x), network::DATA);
       registerVar( (void*) &(this->getPosition().y), sizeof(this->getPosition().y), network::DATA);
@@ -171 +171 @@
       registerVar( (void*) &(this->getOrientation().x), sizeof(this->getOrientation().x), network::DATA);
       registerVar( (void*) &(this->getOrientation().y), sizeof(this->getOrientation().y), network::DATA);
-      registerVar( (void*) &(this->getOrientation().z), sizeof(this->getOrientation().z), network::DATA);
+      registerVar( (void*) &(this->getOrientation().z), sizeof(this->getOrientation().z), network::DATA);*/
       // not needed at the moment, because we don't have prediction yet
       /*// register velocity_

code/branches/core/src/orxonox/objects/WorldEntity.h

@@ -17 +17 @@
 namespace orxonox
 {
-  class _OrxonoxExport WorldEntity : public BaseObject, public Tickable, public network::Synchronisable
+  class _OrxonoxExport WorldEntity : public BaseObject, public Tickable//, public network::Synchronisable
   {
     public:

code/branches/core/src/orxonox/objects/test3.cc

@@ -51 +51 @@
         SetConfigValue(value_bool_, 1);
         SetConfigValue(value_string_, "This is a test");
-        SetConfigValue(value_constchar_, "This is another test");
+//        SetConfigValue(value_constchar_, "This is another test");
         SetConfigValue(value_vector2_, Vector2(101, 202));
         SetConfigValue(value_vector3_, Vector3(13, 26, 39));