From 670c9d0763dfa6cd9228cece94d6285e6d1abad6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 28 Sep 2015 17:56:44 +0200 Subject: [PATCH] Adapted to Corrade::Utility::Debug changes. --- src/Magnum/AbstractShaderProgram.cpp | 22 ++++++++-------------- src/Magnum/Array.h | 9 +++------ src/Magnum/Math/Angle.h | 12 ++---------- src/Magnum/Math/BoolVector.h | 9 +++------ src/Magnum/Math/Complex.h | 8 +++----- src/Magnum/Math/Dual.h | 8 +++----- src/Magnum/Math/DualComplex.h | 12 ++++++------ src/Magnum/Math/DualQuaternion.h | 18 ++++++++++-------- src/Magnum/Math/Quaternion.h | 10 +++++----- src/Magnum/Math/Range.h | 17 ++++++++--------- src/Magnum/Math/RectangularMatrix.h | 11 ++++------- src/Magnum/Math/Vector.h | 9 +++------ src/Magnum/Shader.cpp | 28 ++++++++++------------------ 13 files changed, 68 insertions(+), 105 deletions(-) diff --git a/src/Magnum/AbstractShaderProgram.cpp b/src/Magnum/AbstractShaderProgram.cpp index a11bc1cd2..88f825150 100644 --- a/src/Magnum/AbstractShaderProgram.cpp +++ b/src/Magnum/AbstractShaderProgram.cpp @@ -361,35 +361,29 @@ bool AbstractShaderProgram::link(std::initializer_list class Array3D: public Array<3, T> { /** @debugoperator{Magnum::Array} */ template Debug& operator<<(Debug& debug, const Array& value) { - debug << "Array("; - debug.setFlag(Debug::SpaceAfterEachValue, false); + debug << "Array(" << Corrade::Utility::Debug::nospace; for(UnsignedInt i = 0; i != dimensions; ++i) { - if(i != 0) debug << ", "; + if(i != 0) debug << ","; debug << value[i]; } - debug << ")"; - debug.setFlag(Debug::SpaceAfterEachValue, true); - return debug; + return debug << Corrade::Utility::Debug::nospace << ")"; } /** @debugoperator{Magnum::Array1D} */ diff --git a/src/Magnum/Math/Angle.h b/src/Magnum/Math/Angle.h index 6bd1cd45b..d791debfd 100644 --- a/src/Magnum/Math/Angle.h +++ b/src/Magnum/Math/Angle.h @@ -238,20 +238,12 @@ template constexpr Rad::Rad(Unit value): Unit( /** @debugoperator{Magnum::Math::Rad} */ template Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& debug, const Unit& value) { - debug << "Rad("; - debug.setFlag(Corrade::Utility::Debug::SpaceAfterEachValue, false); - debug << T(value) << ")"; - debug.setFlag(Corrade::Utility::Debug::SpaceAfterEachValue, true); - return debug; + return debug << "Rad(" << Corrade::Utility::Debug::nospace << T(value) << Corrade::Utility::Debug::nospace << ")"; } /** @debugoperator{Magnum::Math::Deg} */ template Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& debug, const Unit& value) { - debug << "Deg("; - debug.setFlag(Corrade::Utility::Debug::SpaceAfterEachValue, false); - debug << T(value) << ")"; - debug.setFlag(Corrade::Utility::Debug::SpaceAfterEachValue, true); - return debug; + return debug << "Deg(" << Corrade::Utility::Debug::nospace << T(value) << Corrade::Utility::Debug::nospace << ")"; } /* Explicit instantiation for commonly used types */ diff --git a/src/Magnum/Math/BoolVector.h b/src/Magnum/Math/BoolVector.h index 3acd12e20..8641abad1 100644 --- a/src/Magnum/Math/BoolVector.h +++ b/src/Magnum/Math/BoolVector.h @@ -224,15 +224,12 @@ template class BoolVector { /** @debugoperator{Magnum::Math::BoolVector} */ template Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& debug, const BoolVector& value) { - debug << "BoolVector("; - debug.setFlag(Corrade::Utility::Debug::SpaceAfterEachValue, false); + debug << "BoolVector(" << Corrade::Utility::Debug::nospace; for(std::size_t i = 0; i != size; ++i) { - if(i && !(i%8)) debug << " "; + if(!i || (i%8)) debug << Corrade::Utility::Debug::nospace; debug << (value[i] ? "1" : "0"); } - debug << ")"; - debug.setFlag(Corrade::Utility::Debug::SpaceAfterEachValue, true); - return debug; + return debug << Corrade::Utility::Debug::nospace << ")"; } template inline bool BoolVector::operator==(const BoolVector< size >& other) const { diff --git a/src/Magnum/Math/Complex.h b/src/Magnum/Math/Complex.h index fac9476d1..b50c2afac 100644 --- a/src/Magnum/Math/Complex.h +++ b/src/Magnum/Math/Complex.h @@ -477,11 +477,9 @@ template inline Complex operator/(T scalar, const Complex& comple /** @debugoperator{Magnum::Math::Complex} */ template Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& debug, const Complex& value) { - debug << "Complex("; - debug.setFlag(Corrade::Utility::Debug::SpaceAfterEachValue, false); - debug << value.real() << ", " << value.imaginary() << ")"; - debug.setFlag(Corrade::Utility::Debug::SpaceAfterEachValue, true); - return debug; + return debug << "Complex(" << Corrade::Utility::Debug::nospace + << value.real() << Corrade::Utility::Debug::nospace << "," + << value.imaginary() << Corrade::Utility::Debug::nospace << ")"; } /* Explicit instantiation for commonly used types */ diff --git a/src/Magnum/Math/Dual.h b/src/Magnum/Math/Dual.h index 038f2e7df..dccd1afe8 100644 --- a/src/Magnum/Math/Dual.h +++ b/src/Magnum/Math/Dual.h @@ -210,11 +210,9 @@ template class Dual { /** @debugoperator{Magnum::Math::Dual} */ template Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& debug, const Dual& value) { - debug << "Dual("; - debug.setFlag(Corrade::Utility::Debug::SpaceAfterEachValue, false); - debug << value.real() << ", " << value.dual() << ")"; - debug.setFlag(Corrade::Utility::Debug::SpaceAfterEachValue, true); - return debug; + return debug << "Dual(" << Corrade::Utility::Debug::nospace + << value.real() << Corrade::Utility::Debug::nospace << "," + << value.dual() << Corrade::Utility::Debug::nospace << ")"; } /** @relates Dual diff --git a/src/Magnum/Math/DualComplex.h b/src/Magnum/Math/DualComplex.h index f3082c0c4..d9d2ac98e 100644 --- a/src/Magnum/Math/DualComplex.h +++ b/src/Magnum/Math/DualComplex.h @@ -370,12 +370,12 @@ template class DualComplex: public Dual> { /** @debugoperator{Magnum::Math::DualQuaternion} */ template Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& debug, const DualComplex& value) { - debug << "DualComplex({"; - debug.setFlag(Corrade::Utility::Debug::SpaceAfterEachValue, false); - debug << value.real().real() << ", " << value.real().imaginary() << "}, {" - << value.dual().real() << ", " << value.dual().imaginary() << "})"; - debug.setFlag(Corrade::Utility::Debug::SpaceAfterEachValue, true); - return debug; + return debug << "DualComplex({" << Corrade::Utility::Debug::nospace + << value.real().real() << Corrade::Utility::Debug::nospace << "," + << value.real().imaginary() << Corrade::Utility::Debug::nospace << "}, {" + << Corrade::Utility::Debug::nospace + << value.dual().real() << Corrade::Utility::Debug::nospace << "," + << value.dual().imaginary() << Corrade::Utility::Debug::nospace << "})"; } /* Explicit instantiation for commonly used types */ diff --git a/src/Magnum/Math/DualQuaternion.h b/src/Magnum/Math/DualQuaternion.h index 9c7af521c..154afb96f 100644 --- a/src/Magnum/Math/DualQuaternion.h +++ b/src/Magnum/Math/DualQuaternion.h @@ -359,14 +359,16 @@ template class DualQuaternion: public Dual> { /** @debugoperator{Magnum::Math::DualQuaternion} */ template Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& debug, const DualQuaternion& value) { - debug << "DualQuaternion({{"; - debug.setFlag(Corrade::Utility::Debug::SpaceAfterEachValue, false); - debug << value.real().vector().x() << ", " << value.real().vector().y() << ", " << value.real().vector().z() - << "}, " << value.real().scalar() << "}, {{" - << value.dual().vector().x() << ", " << value.dual().vector().y() << ", " << value.dual().vector().z() - << "}, " << value.dual().scalar() << "})"; - debug.setFlag(Corrade::Utility::Debug::SpaceAfterEachValue, true); - return debug; + return debug << "DualQuaternion({{" << Corrade::Utility::Debug::nospace + << value.real().vector().x() << Corrade::Utility::Debug::nospace << "," + << value.real().vector().y() << Corrade::Utility::Debug::nospace << "," + << value.real().vector().z() << Corrade::Utility::Debug::nospace << "}," + << value.real().scalar() << Corrade::Utility::Debug::nospace << "}, {{" + << Corrade::Utility::Debug::nospace + << value.dual().vector().x() << Corrade::Utility::Debug::nospace << "," + << value.dual().vector().y() << Corrade::Utility::Debug::nospace << "," + << value.dual().vector().z() << Corrade::Utility::Debug::nospace << "}," + << value.dual().scalar() << Corrade::Utility::Debug::nospace << "})"; } /* Explicit instantiation for commonly used types */ diff --git a/src/Magnum/Math/Quaternion.h b/src/Magnum/Math/Quaternion.h index ca633ab78..b3617931b 100644 --- a/src/Magnum/Math/Quaternion.h +++ b/src/Magnum/Math/Quaternion.h @@ -533,11 +533,11 @@ template inline Quaternion operator/(T scalar, const Quaternion& /** @debugoperator{Magnum::Math::Quaternion} */ template Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& debug, const Quaternion& value) { - debug << "Quaternion({"; - debug.setFlag(Corrade::Utility::Debug::SpaceAfterEachValue, false); - debug << value.vector().x() << ", " << value.vector().y() << ", " << value.vector().z() << "}, " << value.scalar() << ")"; - debug.setFlag(Corrade::Utility::Debug::SpaceAfterEachValue, true); - return debug; + return debug << "Quaternion({" << Corrade::Utility::Debug::nospace + << value.vector().x() << Corrade::Utility::Debug::nospace << "," + << value.vector().y() << Corrade::Utility::Debug::nospace << "," + << value.vector().z() << Corrade::Utility::Debug::nospace << "}," + << value.scalar() << Corrade::Utility::Debug::nospace << ")"; } /* Explicit instantiation for commonly used types */ diff --git a/src/Magnum/Math/Range.h b/src/Magnum/Math/Range.h index baee7986a..e8f33a4b1 100644 --- a/src/Magnum/Math/Range.h +++ b/src/Magnum/Math/Range.h @@ -530,15 +530,14 @@ template class Range3D: public Range<3, T> { /** @debugoperator{Magnum::Math::Range} */ template Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& debug, const Range& value) { - debug << "Range({"; - debug.setFlag(Corrade::Utility::Debug::SpaceAfterEachValue, false); - debug << value.min()[0]; - for(UnsignedInt i = 1; i != dimensions; ++i) debug << ", " << value.min()[i]; - debug << "}, {" << value.max()[0]; - for(UnsignedInt i = 1; i != dimensions; ++i) debug << ", " << value.max()[i]; - debug << "})"; - debug.setFlag(Corrade::Utility::Debug::SpaceAfterEachValue, true); - return debug; + debug << "Range({" << Corrade::Utility::Debug::nospace << value.min()[0]; + for(UnsignedInt i = 1; i != dimensions; ++i) + debug << Corrade::Utility::Debug::nospace << "," << value.min()[i]; + debug << Corrade::Utility::Debug::nospace << "}, {" + << Corrade::Utility::Debug::nospace << value.max()[0]; + for(UnsignedInt i = 1; i != dimensions; ++i) + debug << Corrade::Utility::Debug::nospace << "," << value.max()[i]; + return debug << Corrade::Utility::Debug::nospace << "})"; } template Range Range::translated(const VectorType& vector) const { diff --git a/src/Magnum/Math/RectangularMatrix.h b/src/Magnum/Math/RectangularMatrix.h index b7b333c97..373e9ef2b 100644 --- a/src/Magnum/Math/RectangularMatrix.h +++ b/src/Magnum/Math/RectangularMatrix.h @@ -527,18 +527,15 @@ template inline RectangularMatrix Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& debug, const Magnum::Math::RectangularMatrix& value) { - debug << "Matrix("; - debug.setFlag(Corrade::Utility::Debug::SpaceAfterEachValue, false); + debug << "Matrix(" << Corrade::Utility::Debug::nospace; for(std::size_t row = 0; row != rows; ++row) { - if(row != 0) debug << ",\n "; + if(row != 0) debug << Corrade::Utility::Debug::nospace << ",\n "; for(std::size_t col = 0; col != cols; ++col) { - if(col != 0) debug << ", "; + if(col != 0) debug << Corrade::Utility::Debug::nospace << ","; debug << value[col][row]; } } - debug << ")"; - debug.setFlag(Corrade::Utility::Debug::SpaceAfterEachValue, true); - return debug; + return debug << Corrade::Utility::Debug::nospace << ")"; } #ifndef DOXYGEN_GENERATING_OUTPUT diff --git a/src/Magnum/Math/Vector.h b/src/Magnum/Math/Vector.h index 25fcc0836..c9c29d255 100644 --- a/src/Magnum/Math/Vector.h +++ b/src/Magnum/Math/Vector.h @@ -1070,15 +1070,12 @@ operator/(const Vector& a, const Vector& b) /** @debugoperator{Magnum::Math::Vector} */ template Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& debug, const Vector& value) { - debug << "Vector("; - debug.setFlag(Corrade::Utility::Debug::SpaceAfterEachValue, false); + debug << "Vector(" << Corrade::Utility::Debug::nospace; for(std::size_t i = 0; i != size; ++i) { - if(i != 0) debug << ", "; + if(i != 0) debug << Corrade::Utility::Debug::nospace << ","; debug << value[i]; } - debug << ")"; - debug.setFlag(Corrade::Utility::Debug::SpaceAfterEachValue, true); - return debug; + return debug << Corrade::Utility::Debug::nospace << ")"; } /* Explicit instantiation for types used in OpenGL */ diff --git a/src/Magnum/Shader.cpp b/src/Magnum/Shader.cpp index 21850f51a..cd4d6556b 100644 --- a/src/Magnum/Shader.cpp +++ b/src/Magnum/Shader.cpp @@ -856,37 +856,29 @@ bool Shader::compile(std::initializer_list> shade /* Show error log */ if(!success) { - Error out; - out.setFlag(Debug::NewLineAtTheEnd, false); - out.setFlag(Debug::SpaceAfterEachValue, false); - out << "Shader::compile(): compilation of " << shaderName(shader._type) - << " shader"; + auto out = Error::noNewlineAtTheEnd(); + out << "Shader::compile(): compilation of" << shaderName(shader._type) << "shader"; if(shaders.size() != 1) { #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID) - out << " " << std::to_string(i); + out << std::to_string(i); #else - out << " " << converter.str(); + out << converter.str(); #endif } - out << " failed with the following message:\n" - << message; + out << "failed with the following message:" << Debug::newline << message; /* Or just warnings, if any */ } else if(!message.empty() && !Implementation::isShaderCompilationLogEmpty(message)) { - Warning out; - out.setFlag(Debug::NewLineAtTheEnd, false); - out.setFlag(Debug::SpaceAfterEachValue, false); - out << "Shader::compile(): compilation of " << shaderName(shader._type) - << " shader"; + auto out = Warning::noNewlineAtTheEnd(); + out << "Shader::compile(): compilation of" << shaderName(shader._type) << "shader"; if(shaders.size() != 1) { #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID) - out << " " << std::to_string(i); + out << std::to_string(i); #else - out << " " << converter.str(); + out << converter.str(); #endif } - out << " succeeded with the following message:\n" - << message; + out << "succeeded with the following message:" << Debug::newline << message; } /* Success of all depends on each of them */