diff --git a/Data/Img/Player.png b/Data/Img/Player.png new file mode 100644 index 0000000..2a83207 Binary files /dev/null and b/Data/Img/Player.png differ diff --git a/Data/Img/test.bmp b/Data/Img/test.bmp deleted file mode 100644 index d23f5ce..0000000 Binary files a/Data/Img/test.bmp and /dev/null differ diff --git a/Data/Img/test.png b/Data/Img/test.png deleted file mode 100644 index af9a966..0000000 Binary files a/Data/Img/test.png and /dev/null differ diff --git a/src/Actor/Player.cpp b/src/Actor/Player.cpp index 14c6f5c..c76c97a 100644 --- a/src/Actor/Player.cpp +++ b/src/Actor/Player.cpp @@ -12,7 +12,7 @@ Player::~Player(void) { void Player::Prepare(void) { _player = new Sprite(); _playerTexture = new Texture(); - _playerTexture->Load("../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: