Browse Source

Brought debug facilities from Corrade::Utility to Magnum namespace.

These classes are used so frequently that it is counterproductive to not
have them here.
vectorfields
Vladimír Vondruš 14 years ago
parent
commit
39a313a357
  1. 1
      src/AbstractShaderProgram.cpp
  2. 2
      src/Contexts/GlutContext.cpp
  3. 2
      src/Contexts/Sdl2Context.cpp
  4. 5
      src/Magnum.h
  5. 1
      src/MeshTools/Test/CombineIndexedArraysTest.cpp
  6. 2
      src/MeshTools/Test/CompressIndicesTest.cpp
  7. 1
      src/MeshTools/Test/FlipNormalsTest.cpp
  8. 1
      src/MeshTools/Test/GenerateFlatNormalsTest.cpp
  9. 2
      src/MeshTools/Test/InterleaveTest.cpp
  10. 1
      src/MeshTools/Test/SubdivideTest.cpp
  11. 1
      src/Primitives/UVSphere.cpp
  12. 1
      src/Shader.cpp
  13. 4
      src/Shaders/PhongShader.cpp
  14. 2
      src/SizeTraits.h
  15. 1
      src/Test/ObjectTest.cpp
  16. 1
      src/Trade/AbstractImporter.cpp

1
src/AbstractShaderProgram.cpp

@ -20,7 +20,6 @@
#define LINKER_MESSAGE_MAX_LENGTH 1024
using namespace std;
using namespace Corrade::Utility;
namespace Magnum {

2
src/Contexts/GlutContext.cpp

@ -15,8 +15,6 @@
#include "GlutContext.h"
using namespace Corrade::Utility;
namespace Magnum { namespace Contexts {
GlutContext* GlutContext::instance = nullptr;

2
src/Contexts/Sdl2Context.cpp

@ -15,8 +15,6 @@
#include "Sdl2Context.h"
using namespace Corrade::Utility;
namespace Magnum { namespace Contexts {
Sdl2Context::Sdl2Context(int argc, char** argv, const std::string& name, const Math::Vector2<GLsizei>& size): _redraw(true) {

5
src/Magnum.h

@ -27,6 +27,11 @@
namespace Magnum {
/* Bring debugging facility from Corrade::Utility namespace */
using Corrade::Utility::Debug;
using Corrade::Utility::Warning;
using Corrade::Utility::Error;
/** @brief Two-component floating-point vector */
typedef Math::Vector2<GLfloat> Vector2;

1
src/MeshTools/Test/CombineIndexedArraysTest.cpp

@ -23,7 +23,6 @@
QTEST_APPLESS_MAIN(Magnum::MeshTools::Test::CombineIndexedArraysTest)
using namespace std;
using namespace Corrade::Utility;
namespace Magnum { namespace MeshTools { namespace Test {

2
src/MeshTools/Test/CompressIndicesTest.cpp

@ -23,7 +23,7 @@
QTEST_APPLESS_MAIN(Magnum::MeshTools::Test::CompressIndicesTest)
using namespace std;
using namespace Corrade::Utility;
using Corrade::Utility::Endianness;
namespace Magnum { namespace MeshTools { namespace Test {

1
src/MeshTools/Test/FlipNormalsTest.cpp

@ -22,7 +22,6 @@
QTEST_APPLESS_MAIN(Magnum::MeshTools::Test::FlipNormalsTest)
using namespace std;
using namespace Corrade::Utility;
namespace Magnum { namespace MeshTools { namespace Test {

1
src/MeshTools/Test/GenerateFlatNormalsTest.cpp

@ -22,7 +22,6 @@
QTEST_APPLESS_MAIN(Magnum::MeshTools::Test::GenerateFlatNormalsTest)
using namespace std;
using namespace Corrade::Utility;
namespace Magnum { namespace MeshTools { namespace Test {

2
src/MeshTools/Test/InterleaveTest.cpp

@ -25,7 +25,7 @@
QTEST_APPLESS_MAIN(Magnum::MeshTools::Test::InterleaveTest)
using namespace std;
using namespace Corrade::Utility;
using Corrade::Utility::Endianness;
namespace Magnum { namespace MeshTools { namespace Test {

1
src/MeshTools/Test/SubdivideTest.cpp

@ -24,7 +24,6 @@
QTEST_APPLESS_MAIN(Magnum::MeshTools::Test::SubdivideTest)
using namespace std;
using namespace Corrade::Utility;
namespace Magnum { namespace MeshTools { namespace Test {

1
src/Primitives/UVSphere.cpp

@ -16,7 +16,6 @@
#include "UVSphere.h"
using namespace std;
using namespace Corrade::Utility;
namespace Magnum { namespace Primitives {

1
src/Shader.cpp

@ -20,7 +20,6 @@
#define COMPILER_MESSAGE_MAX_LENGTH 1024
using namespace std;
using namespace Corrade::Utility;
namespace Magnum {

4
src/Shaders/PhongShader.cpp

@ -17,12 +17,10 @@
#include "Utility/Resource.h"
using namespace Corrade::Utility;
namespace Magnum { namespace Shaders {
PhongShader::PhongShader() {
Resource rs("shaders");
Corrade::Utility::Resource rs("shaders");
attachShader(Shader::fromData(Shader::Type::Vertex, rs.get("PhongShader.vert")));
attachShader(Shader::fromData(Shader::Type::Fragment, rs.get("PhongShader.frag")));

2
src/SizeTraits.h

@ -124,7 +124,7 @@ template<class Base> struct SizeBasedCall: public Base {
return Base::template run<GLuint>(std::forward<Args>(arguments)...);
}
Corrade::Utility::Error() << "SizeBasedCall: no type able to index" << size << "elements.";
Error() << "SizeBasedCall: no type able to index" << size << "elements.";
return decltype(Base::template run<GLubyte>(std::forward<Args>(arguments)...))();
}

1
src/Test/ObjectTest.cpp

@ -21,7 +21,6 @@
#include <QtTest/QTest>
using namespace std;
using namespace Corrade::Utility;
QTEST_APPLESS_MAIN(Magnum::Test::ObjectTest)

1
src/Trade/AbstractImporter.cpp

@ -16,7 +16,6 @@
#include "AbstractImporter.h"
using namespace std;
using namespace Corrade::Utility;
namespace Magnum { namespace Trade {

Loading…
Cancel
Save