Changeset 4166 in orxonox.OLD for orxonox/trunk
- Timestamp:
- May 11, 2005, 3:07:34 PM (20 years ago)
- Location:
- orxonox/trunk/src
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/trunk/src/subprojects/benchmark.cc
r4131 r4166 463 463 #else 464 464 465 #include "debug.h" 466 465 467 int startBenchmarks() 466 468 { -
orxonox/trunk/src/track_manager.cc
r4017 r4166 29 29 30 30 using namespace std; 31 32 CREATE_FACTORY(TrackManager);33 31 34 32 /** … … 405 403 406 404 */ 407 TrackManager::TrackManager( TiXmlElement* root)405 bool TrackManager::load( TiXmlElement* root) 408 406 { 409 407 -
orxonox/trunk/src/track_manager.h
r4017 r4166 153 153 static TrackManager* getInstance(void); 154 154 155 TrackManager(TiXmlElement* root);155 bool load(TiXmlElement* root); 156 156 157 157 // Methods to change the Path (initialisation) -
orxonox/trunk/src/util/resource_manager.cc
r4116 r4166 584 584 } 585 585 586 /** 587 \brief touches a File on the disk (thereby creating it) 588 \param fileName The file to touch 589 */ 586 590 bool ResourceManager::touchFile(const char* fileName) 587 591 { … … 599 603 } 600 604 605 /** 606 \brief deletes a File from disk 607 \param fileName the File to delete 608 */ 601 609 bool ResourceManager::deleteFile(const char* fileName) 602 610 { … … 606 614 } 607 615 616 /** 617 \param fileName the Name of the file to check 618 \returns The name of the file, including the HomeDir 619 IMPORTANT: this has to be deleted from the outside 620 */ 608 621 char* ResourceManager::homeDirCheck(const char* name) 609 622 { … … 628 641 } 629 642 643 /** 644 \param fileName the Name of the File to check 645 \returns The full name of the file, including the DataDir 646 IMPORTANT: this has to be deleted from the outside 647 */ 648 char* ResourceManager::getFullName(const char* fileName) 649 { 650 char* retName = new char[strlen(ResourceManager::getInstance()->getDataDir()) + strlen(fileName)+1]; 651 sprintf(retName, "%s%s", ResourceManager::getInstance()->getDataDir(), fileName); 652 return retName; 653 } 630 654 631 655 -
orxonox/trunk/src/util/resource_manager.h
r4115 r4166 18 18 19 19 //! An eumerator for different fileTypes the resourceManager supports \todo WAV, MP3, OGG support 20 enum ResourceType {OBJ, PRIM, WAV, MP3, OGG, TTF, IMAGE}; 20 enum ResourceType {OBJ, 21 PRIM, 22 WAV, 23 MP3, 24 OGG, 25 TTF, 26 IMAGE}; 21 27 //! An enumerator for different UNLOAD-types. 22 28 /** … … 26 32 RP_GAME: will be unloaded at the end of the whole Game (when closing orxonox) 27 33 */ 28 enum ResourcePriority {RP_NO = 0, RP_LEVEL = 1, RP_CAMPAIGN = 2, RP_GAME = 3}; 34 enum ResourcePriority {RP_NO = 0, 35 RP_LEVEL = 1, 36 RP_CAMPAIGN = 2, 37 RP_GAME = 3}; 29 38 30 39 //! A Struct that keeps track about A resource its name its Type, and so on … … 66 75 bool setDataDir(const char* dataDir); 67 76 /** \returns the Name of the data directory */ 68 inline const char* getDataDir(void) {return this->dataDir;} 77 inline const char* getDataDir(void) const {return this->dataDir;} 78 69 79 bool checkDataDir(const char* fileInside); 70 80 bool addImageDir(char* imageDir); … … 84 94 static bool touchFile(const char* fileName); 85 95 static bool deleteFile(const char* fileName); 86 static char* homeDirCheck(const char* name); 96 static char* homeDirCheck(const char* fileName); 97 static char* getFullName(const char* fileName); 87 98 88 99 private:
Note: See TracChangeset
for help on using the changeset viewer.