diff options
| author | Yann Herklotz <ymherklotz@gmail.com> | 2017-08-24 00:25:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-24 00:25:31 +0100 |
| commit | a326354ea6fccf76665a4212bf14daeba0f52ec8 (patch) | |
| tree | 18cd2deb0c30b38d8ca7c5305735d2323259e020 /src/resourcemanager.cpp | |
| parent | 0a49874288f92c120d7e165550eb6dbbe1ef7307 (diff) | |
| parent | 5403490b941f7c031bf1aafdb91b1098f69edbf2 (diff) | |
| download | YAGE-a326354ea6fccf76665a4212bf14daeba0f52ec8.tar.gz YAGE-a326354ea6fccf76665a4212bf14daeba0f52ec8.zip | |
Merge pull request #3 from ymherklotz/developv0.1.0
Merge develop to master
Diffstat (limited to 'src/resourcemanager.cpp')
| -rw-r--r-- | src/resourcemanager.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/resourcemanager.cpp b/src/resourcemanager.cpp index 15fb606f..8444161f 100644 --- a/src/resourcemanager.cpp +++ b/src/resourcemanager.cpp @@ -8,12 +8,14 @@ #include "resourcemanager.hpp" -namespace yage { +namespace yage +{ TextureCache ResourceManager::texture_cache_; -Texture ResourceManager::getTexture(const std::string& texture_path) { +Texture ResourceManager::getTexture(const std::string &texture_path) +{ return texture_cache_.getTexture(texture_path); } -} // yage +} // yage |