Changeset 637 for code/branches/FICN/src/orxonox
- Timestamp:
- Dec 19, 2007, 1:49:24 AM (17 years ago)
- Location:
- code/branches/FICN/src/orxonox
- Files:
-
- 18 added
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/FICN/src/orxonox/Orxonox.cc
r627 r637 68 68 #include "core/Debug.h" 69 69 #include "hud/HUD.h" 70 #include "objects/weapon_system/bullet_manager.h" 70 71 71 72 #include "GraphicsEngine.h" … … 166 167 ar.checkArgument("data", this->dataPath_, false); 167 168 ar.checkArgument("ip", serverIp_, false); 169 //mode = "presentation"; 168 170 if(ar.errorHandling()) die(); 169 171 if(mode == std::string("server")) … … 372 374 auMan_ = new audio::AudioManager(); 373 375 376 bulletMgr_ = new BulletManager(); 377 374 378 // load this file from config 375 379 loader_ = new loader::LevelLoader("sample.oxw"); … … 382 386 orxonoxHud->setEnergyDistr(20,20,60); 383 387 hudOverlay->show(); 384 385 388 386 389 /* -
code/branches/FICN/src/orxonox/Orxonox.h
r612 r637 36 36 void die(/* some error code */); 37 37 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_; }; 40 40 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_; } 43 44 44 45 private: … … 67 68 loader::LevelLoader* loader_; //!< level loader builds the scene 68 69 audio::AudioManager* auMan_; //!< audio manager 70 BulletManager* bulletMgr_; //!< Keeps track of the thrown bullets 69 71 static Orxonox* singletonRef_; 70 72 OIS::Keyboard* keyboard_; -
code/branches/FICN/src/orxonox/OrxonoxPrereqs.h
r616 r637 102 102 template <class T> 103 103 class SubclassIdentifier; 104 105 class AmmunitionDump; 106 class Bullet; 107 class BulletManager; 108 class BaseWeapon; 109 class BarrelGun; 110 class WeaponStation; 104 111 } 105 112 -
code/branches/FICN/src/orxonox/objects/BaseEntity.h
r590 r637 3 3 4 4 #include "WorldEntity.h" 5 #include "../../tinyxml/tinyxml.h"5 #include <tinyxml/tinyxml.h> 6 6 7 7 namespace orxonox -
code/branches/FICN/src/orxonox/objects/BaseObject.cc
r513 r637 51 51 { 52 52 } 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 } 53 64 } -
code/branches/FICN/src/orxonox/objects/BaseObject.h
r496 r637 20 20 BaseObject(); 21 21 virtual ~BaseObject(); 22 virtual void loadParams(TiXmlElement* xmlElem) {}22 virtual void loadParams(TiXmlElement* xmlElem); 23 23 }; 24 24 } -
code/branches/FICN/src/orxonox/objects/WorldEntity.cc
r633 r637 85 85 { 86 86 BaseObject::loadParams(xmlElem); 87 88 if (xmlElem->Attribute("name"))89 {90 this->setName(xmlElem->Attribute("mesh"));91 }92 87 93 88 if (xmlElem->Attribute("position")) -
code/branches/FICN/src/orxonox/objects/WorldEntity.h
r630 r637 2 2 #define _WorldEntity_H__ 3 3 4 #include <OgreSceneManager.h> 5 #include <OgreSceneNode.h> 6 7 #include "network/Synchronisable.h" 8 #include "tinyxml/tinyxml.h" 9 #include "../core/CoreIncludes.h" 4 10 #include "BaseObject.h" 5 11 #include "Tickable.h" 6 #include "../core/CoreIncludes.h"7 #include "OgreSceneManager.h"8 #include "OgreSceneNode.h"9 12 #include "Mesh.h" 10 #include "network/Synchronisable.h"11 #include "tinyxml/tinyxml.h"12 13 13 14 namespace orxonox
Note: See TracChangeset
for help on using the changeset viewer.