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.h | |
parent | cf4c73f2a75b470a4d4c4167105f92bc46f1926c (diff) | |
parent | 07012cf0982d3f86aebe83b5bdc4a67332c635da (diff) | |
download | YAGE-c7090180503f263c60ec34844992e0e8d4bea85a.tar.gz YAGE-c7090180503f263c60ec34844992e0e8d4bea85a.zip |
Merge branch 'develop'
Diffstat (limited to 'yage/core/resourcemanager.h')
-rw-r--r-- | yage/core/resourcemanager.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/yage/core/resourcemanager.h b/yage/core/resourcemanager.h index a0249436..11a16f63 100644 --- a/yage/core/resourcemanager.h +++ b/yage/core/resourcemanager.h @@ -24,7 +24,7 @@ namespace yage { -class Texture; +struct Texture; class ResourceManager { @@ -32,7 +32,8 @@ private: static TextureCache texture_cache_; public: - static Texture getTexture(const std::string &texture_path); + static Texture getTexture(const std::string &texture_path, int x = 1, + int y = 1); }; } // namespace yage |