From 9a3f97b99099b4a21122ebab48da34a6a1440912 Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Tue, 25 Sep 2012 18:20:45 +0200 Subject: [PATCH] Added output operator for Vector2f, minor fixes. --- source/util/Log.h | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/source/util/Log.h b/source/util/Log.h index d915219..b85e500 100644 --- a/source/util/Log.h +++ b/source/util/Log.h @@ -10,12 +10,14 @@ #include +#include "Vector.h" + /** * Logging functions for different levels. * * @code * LOG_E("something bad happened"); - * LOG_I("takeoff" << 3 << 2 << 1); + * LOG_I(1 << 2 << 3 << "takeoff"); * @endcode */ @@ -23,24 +25,33 @@ * \def LOG_E(str) * Log an error to the error stream. */ -#define LOG_E(str) std::cout << __FILE__ << ":" << __LINE__ << " " << "Error: " << str << "\"" << std::endl +#define LOG_E(str) std::cout << __FILE__ << ":" << __LINE__ << " " << "Error: " << str << std::endl /** * \def LOG_E(str) * Log a warning to the output stream. */ -#define LOG_W(str) std::cout << __FILE__ << ":" << __LINE__ << " " << "Warning: " << str << "\"" << std::endl +#define LOG_W(str) std::cout << __FILE__ << ":" << __LINE__ << " " << "Warning: " << str << std::endl /** * \def LOG_E(str) * Log a debug message to the output stream. */ -#define LOG_D(str) std::cout << __FILE__ << ":" << __LINE__ << " " << "Debug: " << str << "" << std::endl +#define LOG_D(str) std::cout << __FILE__ << ":" << __LINE__ << " " << "Debug: " << str << std::endl /** * \def LOG_E(str) * Log an info to the output stream. */ -#define LOG_I(str) std::cout << __FILE__ << ":" << __LINE__ << " " << "Info: " << str << "\"" << std::endl +#define LOG_I(str) std::cout << __FILE__ << ":" << __LINE__ << " " << "Info: " << str << std::endl + +/** + * Adds an output operator specalization for Vector2f + */ +inline std::ostream& +operator<<(std::ostream& os, const Vector2f& vector) { + os << "(" << vector.x << ", " << vector.y << ")"; + return os; +} #endif /* DG_LOG_H_ */