nutomic/dungeon-gunner
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Added logging on area generation.

Browse source
This commit is contained in:
Felix Ableitner 2013-05-26 20:57:37 +02:00
parent b9dc5b90d2
commit b47b323180
2 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
source/generator/Generator.cpp
View file

@ -19,6 +19,7 @@
#include "simplexnoise.h" #include "simplexnoise.h"
#include "../Pathfinder.h" #include "../Pathfinder.h"
#include "../World.h" #include "../World.h"
#include "../util/Log.h"
/// Seed for usage with simplexnoise.h /// Seed for usage with simplexnoise.h
uint8_t perm[512]; uint8_t perm[512];
@ -81,9 +82,11 @@ Generator::generateCurrentAreaIfNeeded(const sf::Vector2f& position) {
closed.insert(current); closed.insert(current);
if (!mGenerated[current.x][current.y] && distance <= GENERATE_AREA_RANGE) { if (!mGenerated[current.x][current.y] && distance <= GENERATE_AREA_RANGE) {
mGenerated[current.x][current.y] = true; mGenerated[current.x][current.y] = true;
generateTiles(sf::IntRect(current * GENERATE_AREA_SIZE - sf::IntRect area(current * GENERATE_AREA_SIZE -
sf::Vector2i(GENERATE_AREA_SIZE, GENERATE_AREA_SIZE) / 2, sf::Vector2i(GENERATE_AREA_SIZE, GENERATE_AREA_SIZE) / 2,
sf::Vector2i(GENERATE_AREA_SIZE, GENERATE_AREA_SIZE))); sf::Vector2i(GENERATE_AREA_SIZE, GENERATE_AREA_SIZE));
LOG_I("Generating area " << area);
generateTiles(area);
} }
if (mGenerated[current.x][current.y] && distance <= GENERATE_AREA_RANGE) { if (mGenerated[current.x][current.y] && distance <= GENERATE_AREA_RANGE) {
if (closed.find(sf::Vector2i(current.x + 1, current.y)) == closed.end()) if (closed.find(sf::Vector2i(current.x + 1, current.y)) == closed.end())

23
source/util/Log.h
View file

@ -10,6 +10,9 @@
#include <iostream> #include <iostream>
#include <SFML/System/Vector2.hpp>
#include <SFML/Graphics/Rect.hpp>
/** /**
* Logging functions for different levels. * Logging functions for different levels.
* *
@ -61,4 +64,24 @@ operator<<(std::ostream& os, const sf::Vector2i& vector) {
return os; return os;
} }
/**
* Adds an output operator specalization for sf::FloatRect
*/
inline std::ostream&
operator<<(std::ostream& os, const sf::FloatRect& rect) {
os << "(x: " << rect.left << ", y: " << rect.top << ", w: " <<
rect.width << ", h: " << rect.height << ")";
return os;
}
/**
* Adds an output operator specalization for sf::IntRect
*/
inline std::ostream&
operator<<(std::ostream& os, const sf::IntRect& rect) {
os << "(x: " << rect.left << ", y: " << rect.top << ", w: " <<
rect.width << ", h: " << rect.height << ")";
return os;
}
#endif /* DG_LOG_H_ */ #endif /* DG_LOG_H_ */