Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 637


Ignore:
Timestamp:
Dec 19, 2007, 1:49:24 AM (17 years ago)
Author:
rgrieder
Message:
 
Location:
code/branches/FICN/src/orxonox
Files:
18 added
8 edited

Legend:

Unmodified
Added
Removed

  • code/branches/FICN/src/orxonox/Orxonox.cc

    r627 r637  
    6868#include "core/Debug.h"
    6969#include "hud/HUD.h"
     70#include "objects/weapon_system/bullet_manager.h"
    7071
    7172#include "GraphicsEngine.h"
    … …  
    166167    ar.checkArgument("data", this->dataPath_, false);
    167168    ar.checkArgument("ip", serverIp_, false);
     169    //mode = "presentation";
    168170    if(ar.errorHandling()) die();
    169171    if(mode == std::string("server"))
    … …  
    372374    auMan_ = new audio::AudioManager();
    373375
     376    bulletMgr_ = new BulletManager();
     377
    374378    // load this file from config
    375379    loader_ = new loader::LevelLoader("sample.oxw");
    … …  
    382386    orxonoxHud->setEnergyDistr(20,20,60);
    383387    hudOverlay->show();
    384 
    385388
    386389        /*

  • code/branches/FICN/src/orxonox/Orxonox.h

    r612 r637  
    3636      void die(/* some error code */);
    3737      static Orxonox* getSingleton();
    38       inline Ogre::SceneManager* getSceneManager() { return ogre_->getSceneManager(); };
    39       inline GraphicsEngine* getOgrePointer() { return ogre_; };
     38      inline Ogre::SceneManager* getSceneManager()         { return ogre_->getSceneManager(); };
     39      inline GraphicsEngine* getOgrePointer()              { return ogre_; };
    4040      inline audio::AudioManager* getAudioManagerPointer() { return auMan_; };
    41       inline OIS::Keyboard* getKeyboard() { return this->keyboard_; }
    42       inline OIS::Mouse* getMouse() { return this->mouse_; }
     41      inline OIS::Keyboard* getKeyboard()                  { return this->keyboard_; }
     42      inline OIS::Mouse* getMouse()                        { return this->mouse_; }
     43      inline BulletManager* getBulletMgr()                 { return this->bulletMgr_; }
    4344
    4445    private:
    … …  
    6768      loader::LevelLoader*  loader_;    //!< level loader builds the scene
    6869      audio::AudioManager*  auMan_;     //!< audio manager
     70      BulletManager*        bulletMgr_; //!< Keeps track of the thrown bullets
    6971      static Orxonox*       singletonRef_;
    7072      OIS::Keyboard*        keyboard_;

  • code/branches/FICN/src/orxonox/OrxonoxPrereqs.h

    r616 r637  
    102102  template <class T>
    103103  class SubclassIdentifier;
     104
     105  class AmmunitionDump;
     106  class Bullet;
     107  class BulletManager;
     108  class BaseWeapon;
     109  class BarrelGun;
     110  class WeaponStation;
    104111}
    105112

  • code/branches/FICN/src/orxonox/objects/BaseEntity.h

    r590 r637  
    33
    44#include "WorldEntity.h"
    5 #include "../../tinyxml/tinyxml.h"
     5#include <tinyxml/tinyxml.h>
    66
    77namespace orxonox

  • code/branches/FICN/src/orxonox/objects/BaseObject.cc

    r513 r637  
    5151    {
    5252    }
     53
     54    /**
     55        @brief load general xml paramters
     56    */
     57    void BaseObject::loadParams(TiXmlElement* xmlElem)
     58    {
     59        if (xmlElem->Attribute("name"))
     60        {
     61            this->setName(xmlElem->Attribute("mesh"));
     62        }
     63    }
    5364}

  • code/branches/FICN/src/orxonox/objects/BaseObject.h

    r496 r637  
    2020            BaseObject();
    2121            virtual ~BaseObject();
    22             virtual void loadParams(TiXmlElement* xmlElem) {}
     22            virtual void loadParams(TiXmlElement* xmlElem);
    2323    };
    2424}

  • code/branches/FICN/src/orxonox/objects/WorldEntity.cc

    r633 r637  
    8585    {
    8686        BaseObject::loadParams(xmlElem);
    87 
    88         if (xmlElem->Attribute("name"))
    89         {
    90             this->setName(xmlElem->Attribute("mesh"));
    91         }
    9287
    9388        if (xmlElem->Attribute("position"))

  • code/branches/FICN/src/orxonox/objects/WorldEntity.h

    r630 r637  
    22#define _WorldEntity_H__
    33
     4#include <OgreSceneManager.h>
     5#include <OgreSceneNode.h>
     6
     7#include "network/Synchronisable.h"
     8#include "tinyxml/tinyxml.h"
     9#include "../core/CoreIncludes.h"
    410#include "BaseObject.h"
    511#include "Tickable.h"
    6 #include "../core/CoreIncludes.h"
    7 #include "OgreSceneManager.h"
    8 #include "OgreSceneNode.h"
    912#include "Mesh.h"
    10 #include "network/Synchronisable.h"
    11 #include "tinyxml/tinyxml.h"
    1213
    1314namespace orxonox
Note: See TracChangeset for help on using the changeset viewer.