Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 9, 2005, 11:29:19 AM (20 years ago)
Author:
bensch
Message:

orxonox/branches/heightMap: merged the Trunk back into branches/heightMap:
merged with Command
svn merge -r 3918:HEAD trunk branches/heightMap
conflicts resolved in favor of the Trunk

Location:
orxonox/branches/heightMap
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/heightMap

    • Property svn:externals

      •  

        old new  
        1 data http://svn.orxonox.ethz.ch/data
         1

  • orxonox/branches/heightMap/src/util/resource_manager.h

    r3911 r4122  
    6565
    6666  bool setDataDir(const char* dataDir);
     67  /** \returns the Name of the data directory */
     68  inline const char*  getDataDir(void) {return this->dataDir;}
     69  bool checkDataDir(const char* fileInside);
    6770  bool addImageDir(char* imageDir);
    6871  void* load(const char* fileName, ResourcePriority prio = RP_NO,
    … …  
    7376  bool unload(Resource* resource, ResourcePriority = RP_NO);
    7477  bool unloadAllByPriority(ResourcePriority prio);
     78
    7579  void debug(void);
     80
     81  // utility functions of this class
     82  static bool isDir(const char* directory);
     83  static bool isFile(const char* fileName);
     84  static bool touchFile(const char* fileName);
     85  static bool deleteFile(const char* fileName);
     86  static char* homeDirCheck(const char* name);
    7687
    7788 private:
    … …  
    8798  Resource* locateResourceByPointer(const void* pointer);
    8899 
    89   bool isDir(const char* directory);
    90   bool isFile(const char* directory);
    91 
    92100};
    93101
Note: See TracChangeset for help on using the changeset viewer.