From b8b3c5eb15fe990182e76a738953f444ccfbe06c Mon Sep 17 00:00:00 2001 From: Daniel Karbach Date: Sat, 6 Oct 2012 23:01:31 +0200 Subject: [PATCH] use sdl utility functions for debug drawing --- src/map/Area.cpp | 40 ++++++++-------------------------------- 1 file changed, 8 insertions(+), 32 deletions(-) diff --git a/src/map/Area.cpp b/src/map/Area.cpp index 84dc8a6..6b3f9b1 100644 --- a/src/map/Area.cpp +++ b/src/map/Area.cpp @@ -9,6 +9,7 @@ #include "Tile.h" #include "../graphics/Sprite.h" +#include "../sdl/utility.h" #include @@ -49,16 +50,10 @@ void Area::RenderDebug(SDL_Surface *dest, const graphics::Sprite *tileset, const destRect.x = inOffset.X(); destRect.y = inOffset.Y(); destRect.w = Width() * tileset->Width(); - destRect.h = 1; - SDL_FillRect(dest, &destRect, SDL_MapRGB(dest->format, 0x00, 0x00, 0xFF)); - destRect.y += Height() * tileset->Height() - 1; - SDL_FillRect(dest, &destRect, SDL_MapRGB(dest->format, 0x00, 0x00, 0xFF)); - destRect.y = inOffset.Y(); - destRect.w = 1; destRect.h = Height() * tileset->Height(); - SDL_FillRect(dest, &destRect, SDL_MapRGB(dest->format, 0x00, 0x00, 0xFF)); - destRect.x += Width() * tileset->Width() - 1; - SDL_FillRect(dest, &destRect, SDL_MapRGB(dest->format, 0x00, 0x00, 0xFF)); + sdl::OutlineRect(dest, &destRect, SDL_MapRGB(dest->format, 0x00, 0x00, 0xFF)); + + Uint32 color(SDL_MapRGB(dest->format, 0xFF, 0x00, 0x00)); for (int i(0); i < numTiles; ++i) { Vector offset( @@ -67,35 +62,16 @@ void Area::RenderDebug(SDL_Surface *dest, const graphics::Sprite *tileset, const const Tile &tile(tiles[i]); if (tile.BlocksNorth()) { - destRect.x = offset.X(); - destRect.y = offset.Y(); - destRect.w = tileset->Width(); - destRect.h = 1; - SDL_FillRect(dest, &destRect, SDL_MapRGB(dest->format, 0xFF, 0x00, 0x00)); + sdl::HorizontalLine(dest, offset, tileset->Width(), color); } - if (tile.BlocksEast()) { - destRect.x = offset.X() + tileset->Width() - 1; - destRect.y = offset.Y(); - destRect.w = 1; - destRect.h = tileset->Height(); - SDL_FillRect(dest, &destRect, SDL_MapRGB(dest->format, 0xFF, 0x00, 0x00)); + sdl::VerticalLine(dest, Vector(offset.X() + tileset->Width() - 1, offset.Y()), tileset->Height(), color); } - if (tile.BlocksSouth()) { - destRect.x = offset.X(); - destRect.y = offset.Y() + tileset->Height() - 1; - destRect.w = tileset->Width(); - destRect.h = 1; - SDL_FillRect(dest, &destRect, SDL_MapRGB(dest->format, 0xFF, 0x00, 0x00)); + sdl::HorizontalLine(dest, Vector(offset.X(), offset.Y() + tileset->Height() - 1), tileset->Width(), color); } - if (tile.BlocksWest()) { - destRect.x = offset.X(); - destRect.y = offset.Y(); - destRect.w = 1; - destRect.h = tileset->Height(); - SDL_FillRect(dest, &destRect, SDL_MapRGB(dest->format, 0xFF, 0x00, 0x00)); + sdl::VerticalLine(dest, offset, tileset->Height(), color); } } } -- 2.39.2