From 51502ccd3a86430006a3e51161eb43729406f868 Mon Sep 17 00:00:00 2001 From: Rtch90 Date: Tue, 10 Apr 2012 23:38:20 +0100 Subject: [PATCH] [Add] Adding a nice sprite into the mix. --- Data/Img/Player.png | Bin 0 -> 1581 bytes Data/Img/test.bmp | Bin 120054 -> 0 bytes Data/Img/test.png | Bin 1005 -> 0 bytes src/Actor/Player.cpp | 2 +- src/Sprite/Sprite.h | 8 ++++---- 5 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 Data/Img/Player.png delete mode 100644 Data/Img/test.bmp delete mode 100644 Data/Img/test.png diff --git a/Data/Img/Player.png b/Data/Img/Player.png new file mode 100644 index 0000000000000000000000000000000000000000..2a832071ce20b7f40f365e3cdc782e6573d26444 GIT binary patch literal 1581 zcmV+|2GaS7P)Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RW3>5Hc<#XTf^YXjIKo;>* z-A)leNKO+=M)^A$FaXrqn?#dwm1ditZwwi-8EaX#aLQO)S}m?EtrqpRTTB?13MV9| z0f;4|n2n`!xl&1+wGx0(__l5(4SL{g)=EO*+w%=z@*0wz-3QCqrs!4EF1qpoJ&1^Y5D61w7?(1&Gb;^V5lm~#WwspGU zbT1NR=T!v>09>a$_`2Iv^=9IN3iSyv9<{Z#S?`0(^r+_RZl?b|wOX64<$Q8=SXHLH-fS%gnAa|68?}@Kn2n`$wXLJp zUO`cbN%ufAae=YmBu6ie0LU58k`@&Igrq^6cx4)Y>a#2#+pYHk#fLeP6cYjOB_t(5w%vf*|fP=m&0Fu`~GUR0yXU6h%ZQ}A08vuo6wWK0r zGN>{R`l{sn0JHHBvlAZOQW*%2(i4x#-+A)?mxW9h2x*it9Q=rX7w}e?Em;J zX5%61QX-@Ieram3?h^}F7-@V|#B4mo-ZQO){C>(zCdy3e6&&*W*?Xpy*?5S?M@1B_ zFw$V%C*~DUittpB#z#f;9ozc&#i*=o9%SFKt=J+F!c)Qgru<6vBtWahE)V?f*;n{u zV1Q60LPQYQ?{@Ry(JukydRB`afK)okX!wiVZq!X>_B1u0#A4}b zg_)>I2`Q`=y9{u3V1RAy?Ew7Xozkouo(f_rnoE2aWA&mG6lS7wrvQP(kilxP<8(F9 zb#V`a{iE0%4z{(oV{>s7;;vSr?2CNo4fyCn%byHC(!b}cR{&!w`D1T3-ld5}z z{iAfW^vLsWa>Pr>KbOpQwDd68uip8T?Uns5X``;Gw&U)E<9$)hIq7sY05Cb?Wm-tU zh!>};Rek`a&60BNPBS&t_S`L!#tk*NJIw?VLk7vNKw`+?bTu$J;+5gH9(bQ=At9GJ zT@5Jf2NFXDcc+=g4K=y5*jQ8u!12D=yn7PZtvmNs<+twKmq9Z_>PPA~CmVHj@lNr| zxq5B}g0y~c*^s$6rqW4FC0|iivXV&r0YZGYs=c&Yy~kR_nrb_H-n_0_I7?0zuAHl1 zIJ;S~a&CUbcO%3fmn-45`g`HfP;NKsn}PWota5NuNg0JJjPgeUUrawaPgs>3xTKT> zG@E`PU(co==stUMlFekQm`W#QFfIF+5?KLO7ccyScz7zP0?sxM%sQif(h-==QI>a$ zm7%m*f=s28O9IXcFpwBBNP{XtBugb#wYHf51#sMRQgnBkRcZ+{QF*~+mMiP#9dO)p zQat~)S3aMmGg=9xwA9^c=BJ6@8TXvb|36Ithg+W)r(^1$JO;nJJFg$-%WGtyRpz;u fsb24&y2twuLmT`AV-Ll000000NkvXXu0mjfcOvmx literal 0 HcmV?d00001 diff --git a/Data/Img/test.bmp b/Data/Img/test.bmp deleted file mode 100644 index d23f5ceb2ce924ae42edd210e3f23e3da1cccdd1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 120054 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 b?tALoad("../Data/Img/test.png"); + _playerTexture->Load("../Data/Img/Player.png"); _player->SetTexture(_playerTexture); _player->SetPosition(Vec2(800/2, 600/2)); _player->SetScale(Vec2(4.5f, 4.5f)); diff --git a/src/Sprite/Sprite.h b/src/Sprite/Sprite.h index 6e231a6..2478f5b 100644 --- a/src/Sprite/Sprite.h +++ b/src/Sprite/Sprite.h @@ -13,8 +13,8 @@ public: virtual void Draw() const; const Vec2& GetPosition() const { return position; } - float GetX(void) { return position.x; } - float GetY(void) { return position.y; } + float GetX(void) { return position.x; } + float GetY(void) { return position.y; } const Vec2& GetSize() const { return size; } const Vec2& GetScale() const { return scale; } float GetRotation() const { return rotation; } @@ -24,8 +24,8 @@ public: void SetPosition(const Vec2& position) { this->position = position; } void SetX(float xArg) { this->position.x = xArg; } void SetY(float yArg) { this->position.y = yArg; } - void SetScale(const Vec2& scale) { this->scale = scale; } - void SetRotation(float rotation) { this->rotation = rotation; } + void SetScale(const Vec2& scale) { this->scale = scale; } + void SetRotation(float rotation) { this->rotation = rotation; } void SetTexture(Texture* texture); protected: