Changeset 3153 for code/branches/pch/src/orxonox/tools
- Timestamp:
- Jun 13, 2009, 4:12:45 PM (15 years ago)
- Location:
- code/branches/pch/src/orxonox/tools
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/pch/src/orxonox/tools/TextureGenerator.cc
r3145 r3153 65 65 unsigned int TextureGenerator::materialCount_s = 0; 66 66 67 /*static*/ const std::string& TextureGenerator::getMaterialName( std::stringtextureName, const ColourValue& colour)67 /*static*/ const std::string& TextureGenerator::getMaterialName(const std::string& textureName, const ColourValue& colour) 68 68 { 69 69 std::map<ColourValue, std::string>& colourMap = materials_s[textureName]; -
code/branches/pch/src/orxonox/tools/TextureGenerator.h
r3131 r3153 46 46 { 47 47 public: 48 static const std::string& getMaterialName( std::stringtextureName, const ColourValue& colour);48 static const std::string& getMaterialName(const std::string& textureName, const ColourValue& colour); 49 49 50 50 private:
Note: See TracChangeset
for help on using the changeset viewer.