From 34ba34e8a6b5c9f3156d29aa4356abb4c5c07ea2 Mon Sep 17 00:00:00 2001 From: RagingRabbit Date: Sat, 15 Apr 2017 22:21:09 +0200 Subject: [PATCH] changed wall sprite, fixed wall tile heights, made stone wall 2 units high --- CTestTestfile.cmake | 7 +++++++ res/textures/tiles/atlas.png | Bin 10001 -> 8372 bytes src/level/LevelRenderer.cpp | 7 +++---- src/level/LevelRenderer.h | 2 +- src/level/Tile/Tile.cpp | 2 +- src/level/Tile/WallTile.cpp | 7 ++++--- 6 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 CTestTestfile.cmake diff --git a/CTestTestfile.cmake b/CTestTestfile.cmake new file mode 100644 index 0000000..29326bc --- /dev/null +++ b/CTestTestfile.cmake @@ -0,0 +1,7 @@ +# CMake generated Testfile for +# Source directory: C:/Users/faris/Community-Game +# Build directory: C:/Users/faris/Community-Game +# +# This file includes the relevant testing commands required for +# testing this directory and lists subdirectories to be tested as well. +subdirs("deps/SFML") diff --git a/res/textures/tiles/atlas.png b/res/textures/tiles/atlas.png index f60f5c6c3649d246e78f9cce0bb668c60a96f96a..ba3913e77c4e489f4eb3d3d9f0a992ff11236249 100644 GIT binary patch literal 8372 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 literal 10001 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 HC%^s&U?{Gz diff --git a/src/level/LevelRenderer.cpp b/src/level/LevelRenderer.cpp index 206c992..3a6ecfb 100644 --- a/src/level/LevelRenderer.cpp +++ b/src/level/LevelRenderer.cpp @@ -12,17 +12,16 @@ namespace Level renderWindow = window; } - void LevelRenderer::renderWallTileSide(uint32 x, uint32 y, sf::Sprite& sprite) + void LevelRenderer::renderWallTileSide(uint32 x, uint32 y, sf::Sprite& sprite, float height) { sf::Vector3f tilePosition(static_cast(x), static_cast(y) + 32.0f, 0); - sprite.setOrigin(0, 32.0f); + sprite.setOrigin(0, height + 1.0f * (1 - sprite.getScale().y) * sprite.getTextureRect().height); sprites.push_back(std::make_pair(tilePosition, &sprite)); } void LevelRenderer::renderWallTileTop(uint32 x, uint32 y, float height, sf::Sprite& sprite) { - sf::Vector3f tilePosition(static_cast(x), static_cast(y + 32), height); - sprite.setOrigin(0, 32); + sf::Vector3f tilePosition(static_cast(x), static_cast(y), height); sprites.push_back(std::make_pair(tilePosition, &sprite)); } diff --git a/src/level/LevelRenderer.h b/src/level/LevelRenderer.h index 49f6e31..ff4b096 100644 --- a/src/level/LevelRenderer.h +++ b/src/level/LevelRenderer.h @@ -17,7 +17,7 @@ namespace Level public: static void setRenderWindow(sf::RenderWindow* window); - static void renderWallTileSide(uint32 x, uint32 y, sf::Sprite& sprite); + static void renderWallTileSide(uint32 x, uint32 y, sf::Sprite& sprite, float height); static void renderWallTileTop(uint32 x, uint32 y, float height, sf::Sprite& sprite); static void renderEntitySprite(float x, float y, sf::Sprite& sprite); static void drawAll(); diff --git a/src/level/Tile/Tile.cpp b/src/level/Tile/Tile.cpp index 00543bd..f92f853 100644 --- a/src/level/Tile/Tile.cpp +++ b/src/level/Tile/Tile.cpp @@ -26,7 +26,7 @@ namespace Tile fMedStone = std::make_unique(1, sf::Sprite(*tileset, sf::IntRect(0, static_cast(TILE_SIZE) * 2, static_cast(TILE_SIZE), static_cast(TILE_SIZE))), false); fDarkStone = std::make_unique(2, sf::Sprite(*tileset, sf::IntRect(0, static_cast(TILE_SIZE) * 3, static_cast(TILE_SIZE), static_cast(TILE_SIZE))), false); stoneWall = std::make_unique(3, sf::Sprite(*tileset, sf::IntRect(0, static_cast(TILE_SIZE) * 4, static_cast(TILE_SIZE), static_cast(TILE_SIZE))), - sf::Sprite(*tileset, sf::IntRect(0, 160, static_cast(TILE_SIZE), static_cast(TILE_SIZE))), TILE_SIZE, true); + sf::Sprite(*tileset, sf::IntRect(0, 160, static_cast(TILE_SIZE), static_cast(2 * TILE_SIZE))), 2 * TILE_SIZE, true); } Tile::Tile(byte id, sf::Sprite sprite, bool solid) diff --git a/src/level/Tile/WallTile.cpp b/src/level/Tile/WallTile.cpp index 8367bfc..a9a9d09 100644 --- a/src/level/Tile/WallTile.cpp +++ b/src/level/Tile/WallTile.cpp @@ -16,11 +16,12 @@ namespace Tile void WallTile::render(uint32 x, uint32 y, Level& level, sf::RenderWindow& window) { - LevelRenderer::renderWallTileTop(x * static_cast(TILE_SIZE), y * static_cast(TILE_SIZE), 32, m_sprite); + LevelRenderer::renderWallTileTop(x * static_cast(TILE_SIZE), y * static_cast(TILE_SIZE), m_height, m_sprite); Tile* nextTile = level.getTile(x, y + 1); - if (nextTile == nullptr || !nextTile->isSolid()) + if (nextTile == nullptr || !nextTile->isSolid() || (nextTile->isSolid() && ((WallTile*)nextTile)->m_height < m_height)) { - LevelRenderer::renderWallTileSide(x * static_cast(TILE_SIZE), y * static_cast(TILE_SIZE), m_spriteSide); + m_spriteSide.setScale(1, m_height / m_spriteSide.getTextureRect().height); + LevelRenderer::renderWallTileSide(x * static_cast(TILE_SIZE), y * static_cast(TILE_SIZE), m_spriteSide, m_height); } } }} \ No newline at end of file