Changeset 6926 for code/branches/presentation3/src/orxonox/Level.h
- Timestamp:
- May 20, 2010, 10:23:22 AM (14 years ago)
- Location:
- code/branches/presentation3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation3
- Property svn:mergeinfo changed
/code/branches/lod (added) merged: 6691,6724,6786-6787,6794,6828-6829,6838-6839,6843,6852,6877,6881,6909,6911
- Property svn:mergeinfo changed
-
code/branches/presentation3/src/orxonox/Level.h
r5929 r6926 34 34 #include <list> 35 35 #include <string> 36 #include <map> 36 37 #include "core/BaseObject.h" 37 38 #include "network/synchronisable/Synchronisable.h" 39 #include "graphics/MeshLodInformation.h" 38 40 39 41 namespace orxonox … … 55 57 void playerEntered(PlayerInfo* player); 56 58 void playerLeft(PlayerInfo* player); 59 60 MeshLodInformation* getLodInfo(std::string meshName) const; 61 57 62 58 63 private: 59 64 void addObject(BaseObject* object); 60 65 BaseObject* getObject(unsigned int index) const; 66 67 void addLodInfo(MeshLodInformation* object); 68 // const MeshLodInformation* getLodInfo(std::string meshName) const; 69 // MeshLodInformation* getLodInfo(unsigned int index) const; 61 70 62 71 void setGametypeString(const std::string& gametype); … … 66 75 void networkcallback_applyXMLFile(); 67 76 68 std::string description_; 69 std::string gametype_; 70 std::string xmlfilename_; 71 XMLFile* xmlfile_; 72 std::list<BaseObject*> objects_; 77 std::string description_; 78 std::string gametype_; 79 std::string xmlfilename_; 80 XMLFile* xmlfile_; 81 std::list<BaseObject*> objects_; 82 std::map<std::string,MeshLodInformation*> lodInformation_; 73 83 }; 74 84 }
Note: See TracChangeset
for help on using the changeset viewer.