ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Adapted to Corrade::Utility::Debug changes.

pull/110/head
Vladimír Vondruš 11 years ago
parent
0aa16595eb
commit
670c9d0763
13 changed files with 68 additions and 105 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      src/Magnum/AbstractShaderProgram.cpp
  2. 9
      src/Magnum/Array.h
  3. 12
      src/Magnum/Math/Angle.h
  4. 9
      src/Magnum/Math/BoolVector.h
  5. 8
      src/Magnum/Math/Complex.h
  6. 8
      src/Magnum/Math/Dual.h
  7. 12
      src/Magnum/Math/DualComplex.h
  8. 18
      src/Magnum/Math/DualQuaternion.h
  9. 10
      src/Magnum/Math/Quaternion.h
  10. 17
      src/Magnum/Math/Range.h
  11. 11
      src/Magnum/Math/RectangularMatrix.h
  12. 9
      src/Magnum/Math/Vector.h
  13. 28
      src/Magnum/Shader.cpp

22
src/Magnum/AbstractShaderProgram.cpp
Unescape View File

@ -361,35 +361,29 @@ bool AbstractShaderProgram::link(std::initializer_list<std::reference_wrapper<Ab
/* Show error log */
if(!success) {
Error out;
out.setFlag(Debug::NewLineAtTheEnd, false);
out.setFlag(Debug::SpaceAfterEachValue, false);
auto out = Error::noNewlineAtTheEnd();
out << "AbstractShaderProgram::link(): linking";
if(shaders.size() != 1) {
#if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID)
out << " of shader " << std::to_string(i);
out << "of shader" << std::to_string(i);
#else
out << " of shader " << converter.str();
out << "of shader" << 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::isProgramLinkLogEmpty(message)) {
Warning out;
out.setFlag(Debug::NewLineAtTheEnd, false);
out.setFlag(Debug::SpaceAfterEachValue, false);
auto out = Warning::noNewlineAtTheEnd();
out << "AbstractShaderProgram::link(): linking";
if(shaders.size() != 1) {
#if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID)
out << " of shader " << std::to_string(i);
out << "of shader" << std::to_string(i);
#else
out << " of shader " << converter.str();
out << "of shader" << 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 */

9
src/Magnum/Array.h
Unescape View File

@ -205,15 +205,12 @@ template<class T> class Array3D: public Array<3, T> {
/** @debugoperator{Magnum::Array} */
template<UnsignedInt dimensions, class T> Debug& operator<<(Debug& debug, const Array<dimensions, T>& 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} */

12
src/Magnum/Math/Angle.h
Unescape View File

@ -238,20 +238,12 @@ template<class T> constexpr Rad<T>::Rad(Unit<Deg, T> value): Unit<Math::Rad, T>(
/** @debugoperator{Magnum::Math::Rad} */
template<class T> Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& debug, const Unit<Rad, T>& 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<class T> Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& debug, const Unit<Deg, T>& 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 */

9
src/Magnum/Math/BoolVector.h
Unescape View File

@ -224,15 +224,12 @@ template<std::size_t size> class BoolVector {
/** @debugoperator{Magnum::Math::BoolVector} */
template<std::size_t size> Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& debug, const BoolVector<size>& 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<std::size_t size> inline bool BoolVector<size>::operator==(const BoolVector< size >& other) const {

8
src/Magnum/Math/Complex.h
Unescape View File

@ -477,11 +477,9 @@ template<class T> inline Complex<T> operator/(T scalar, const Complex<T>& comple
/** @debugoperator{Magnum::Math::Complex} */
template<class T> Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& debug, const Complex<T>& 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 */

8
src/Magnum/Math/Dual.h
Unescape View File

@ -210,11 +210,9 @@ template<class T> class Dual {
/** @debugoperator{Magnum::Math::Dual} */
template<class T> Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& debug, const Dual<T>& 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

12
src/Magnum/Math/DualComplex.h
Unescape View File

@ -370,12 +370,12 @@ template<class T> class DualComplex: public Dual<Complex<T>> {
/** @debugoperator{Magnum::Math::DualQuaternion} */
template<class T> Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& debug, const DualComplex<T>& 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 */

18
src/Magnum/Math/DualQuaternion.h
Unescape View File

@ -359,14 +359,16 @@ template<class T> class DualQuaternion: public Dual<Quaternion<T>> {
/** @debugoperator{Magnum::Math::DualQuaternion} */
template<class T> Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& debug, const DualQuaternion<T>& 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 */

10
src/Magnum/Math/Quaternion.h
Unescape View File

@ -533,11 +533,11 @@ template<class T> inline Quaternion<T> operator/(T scalar, const Quaternion<T>&
/** @debugoperator{Magnum::Math::Quaternion} */
template<class T> Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& debug, const Quaternion<T>& 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 */

17
src/Magnum/Math/Range.h
Unescape View File

@ -530,15 +530,14 @@ template<class T> class Range3D: public Range<3, T> {
/** @debugoperator{Magnum::Math::Range} */
template<UnsignedInt dimensions, class T> Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& debug, const Range<dimensions, T>& 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<UnsignedInt dimensions, class T> Range<dimensions, T> Range<dimensions, T>::translated(const VectorType& vector) const {

11
src/Magnum/Math/RectangularMatrix.h
Unescape View File

@ -527,18 +527,15 @@ template<std::size_t size, std::size_t cols, class T> inline RectangularMatrix<c
/** @debugoperator{Magnum::Math::RectangularMatrix} */
template<std::size_t cols, std::size_t rows, class T> Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& debug, const Magnum::Math::RectangularMatrix<cols, rows, T>& 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

9
src/Magnum/Math/Vector.h
Unescape View File

@ -1070,15 +1070,12 @@ operator/(const Vector<size, Integral>& a, const Vector<size, FloatingPoint>& b)
/** @debugoperator{Magnum::Math::Vector} */
template<std::size_t size, class T> Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& debug, const Vector<size, T>& 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 */

28
src/Magnum/Shader.cpp
Unescape View File

@ -856,37 +856,29 @@ bool Shader::compile(std::initializer_list<std::reference_wrapper<Shader>> 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 */

Write Preview
Loading…
Cancel
Save