diff options
| author | Yann Herklotz <ymherklotz@gmail.com> | 2018-01-06 11:30:24 +0000 |
|---|---|---|
| committer | Yann Herklotz <ymherklotz@gmail.com> | 2018-01-06 11:30:24 +0000 |
| commit | c7090180503f263c60ec34844992e0e8d4bea85a (patch) | |
| tree | 6ecc5b2e16856db49de056738b36e1ba103d3049 /yage/core/resourcemanager.cpp | |
| parent | cf4c73f2a75b470a4d4c4167105f92bc46f1926c (diff) | |
| parent | 07012cf0982d3f86aebe83b5bdc4a67332c635da (diff) | |
| download | YAGE-c7090180503f263c60ec34844992e0e8d4bea85a.tar.gz YAGE-c7090180503f263c60ec34844992e0e8d4bea85a.zip | |
Merge branch 'develop'
Diffstat (limited to 'yage/core/resourcemanager.cpp')
| -rw-r--r-- | yage/core/resourcemanager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/yage/core/resourcemanager.cpp b/yage/core/resourcemanager.cpp index c585a235..ec3761b8 100644 --- a/yage/core/resourcemanager.cpp +++ b/yage/core/resourcemanager.cpp @@ -7,16 +7,16 @@ */ #include "resourcemanager.h" -#include "texture.h" +#include "../data/texture.h" namespace yage { TextureCache ResourceManager::texture_cache_; -Texture ResourceManager::getTexture(const std::string &texture_path) +Texture ResourceManager::getTexture(const std::string &texture_path, int x, int y) { - return texture_cache_.getTexture(texture_path); + return texture_cache_.getTexture(texture_path, x, y); } } // namespace yage |