aboutsummaryrefslogtreecommitdiffstats
path: root/yage/core/sprite.cpp
diff options
context:
space:
mode:
authorYann Herklotz <ymherklotz@gmail.com>2017-12-23 01:42:15 +0000
committerYann Herklotz <ymherklotz@gmail.com>2017-12-23 01:42:15 +0000
commitcf4c73f2a75b470a4d4c4167105f92bc46f1926c (patch)
treea697de87564846e784fd1256d71c94270d8ec51d /yage/core/sprite.cpp
parent278757a11e50e94e234f339d9d072a0d837dcb06 (diff)
parentddd26ed83d3ac0335562f762ced273a1d62bd959 (diff)
downloadYAGE-cf4c73f2a75b470a4d4c4167105f92bc46f1926c.tar.gz
YAGE-cf4c73f2a75b470a4d4c4167105f92bc46f1926c.zip
Merge branch 'develop'v0.1.3
Diffstat (limited to 'yage/core/sprite.cpp')
-rw-r--r--yage/core/sprite.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/yage/core/sprite.cpp b/yage/core/sprite.cpp
index a663c379..6862f910 100644
--- a/yage/core/sprite.cpp
+++ b/yage/core/sprite.cpp
@@ -25,10 +25,10 @@ Sprite::~Sprite()
void Sprite::init(float x, float y, float width, float height,
const std::string &texture_path)
{
- x_ = x;
- y_ = y;
- width_ = width;
- height_ = height;
+ x_ = x;
+ y_ = y;
+ width_ = width;
+ height_ = height;
texture_ = ResourceManager::getTexture(texture_path);
if (vbo_id_ == 0) {