Changeset 3196 for code/trunk/src/orxonox/tools/TextureGenerator.h
- Timestamp:
- Jun 20, 2009, 9:20:47 AM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/pch (added) merged: 3114-3118,3124-3125,3127-3131,3133,3138-3194
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/tools/TextureGenerator.h
r1625 r3196 36 36 37 37 #include "OrxonoxPrereqs.h" 38 39 #include <map> 38 40 #include <string> 39 #include <map> 40 #include "util/Math.h" 41 #include "util/UtilPrereqs.h" 41 42 42 43 namespace orxonox … … 45 46 { 46 47 public: 47 static const std::string& getMaterialName( std::stringtextureName, const ColourValue& colour);48 static const std::string& getMaterialName(const std::string& textureName, const ColourValue& colour); 48 49 49 50 private:
Note: See TracChangeset
for help on using the changeset viewer.