Use CORRADE_ASSERT() instead of cassert and direct error output.

Unlike previous solution this can be compiled without any impact on
performance at all.

src/AbstractShaderProgram.cpp

@@ -15,7 +15,6 @@
 
 #include "AbstractShaderProgram.h"
 
-#include <cassert>
 #include <fstream>
 
 #define LINKER_MESSAGE_MAX_LENGTH 1024
@@ -51,19 +50,13 @@ bool AbstractShaderProgram::attachShader(Shader* shader) {
 }
 
 void AbstractShaderProgram::bindAttribute(GLuint location, const string& name) {
-    if(state != Initialized) {
+    CORRADE_ASSERT(state == Initialized, "AbstractShaderProgram: attribute cannot be bound after linking.", )
-        Error() << "AbstractShaderProgram: attribute cannot be bound after linking.";
-        assert(0);
-    }
 
     glBindAttribLocation(program, location, name.c_str());
 }
 
 void AbstractShaderProgram::bindFragmentDataLocation(GLuint location, const std::string& name) {
-    if(state != Initialized) {
+    CORRADE_ASSERT(state == Initialized, "AbstractShaderProgram: fragment data location cannot be bound after linking.", )
-        Error() << "AbstractShaderProgram: fragment data location cannot be bound after linking.";
-        assert(0);
-    }
 
     glBindFragDataLocation(program, location, name.c_str());
 }
@@ -102,11 +95,7 @@ void AbstractShaderProgram::link() {
 }
 
 GLint AbstractShaderProgram::uniformLocation(const std::string& name) {
-    if(state != Linked) {
+    CORRADE_ASSERT(state == Linked, "AbstractShaderProgram: uniform location cannot be retrieved before linking.", -1)
-        Error() << "AbstractShaderProgram: uniform location cannot be retrieved before linking.";
-        assert(0);
-        return -1;
-    }
 
     GLint location = glGetUniformLocation(program, name.c_str());
     if(location == -1)

src/IndexedMesh.cpp

@@ -15,11 +15,6 @@
 
 #include "IndexedMesh.h"
 
-#include <cassert>
-
-using namespace std;
-using namespace Corrade::Utility;
-
 namespace Magnum {
 
 void IndexedMesh::draw() {
@@ -37,10 +32,7 @@ void IndexedMesh::draw() {
 void IndexedMesh::finalize() {
     if(isFinalized()) return;
 
-    if(!_indexCount) {
+    CORRADE_ASSERT(_indexCount, "IndexedMesh: the mesh has zero index count!", )
-        Error() << "IndexedMesh: the mesh has zero index count!";
-        assert(0);
-    }
 
     /* Finalize attribute positions */
     Mesh::finalize();

src/Mesh.cpp

@@ -16,11 +16,7 @@
 #include "Mesh.h"
 #include "Buffer.h"
 
-#include <cassert>
-#include <iostream>
-
 using namespace std;
-using namespace Corrade::Utility;
 
 namespace Magnum {
 
@@ -57,10 +53,7 @@ void Mesh::finalize() {
     /* Already finalized */
     if(finalized) return;
 
-    if(!_vertexCount) {
+    CORRADE_ASSERT(_vertexCount, "Mesh: the mesh has zero vertex count!", )
-        Error() << "Mesh: the mesh has zero vertex count!";
-        assert(0);
-    }
 
     /* Enable vertex arrays for all attributes */
     for(set<GLuint>::const_iterator it = _attributes.begin(); it != _attributes.end(); ++it)

src/MeshTools/CMakeLists.txt

@@ -16,5 +16,11 @@ install(TARGETS MagnumMeshTools DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})
 
 if(BUILD_TESTS)
     enable_testing()
+
+    # Library with graceful assert for testing
+    add_library(MagnumMeshToolsTestLib SHARED ${MagnumMeshTools_SRCS})
+    set_target_properties(MagnumMeshToolsTestLib PROPERTIES COMPILE_FLAGS -DCORRADE_GRACEFUL_ASSERT)
+    target_link_libraries(MagnumMeshToolsTestLib ${MAGNUM_LIBRARY})
+
     add_subdirectory(Test)
 endif()

src/MeshTools/CombineIndexedArrays.h

@@ -19,7 +19,6 @@
  * @brief Function Magnum::MeshTools::combineIndexedArrays()
  */
 
-#include <cassert>
 #include <vector>
 #include <numeric>
 #include <tuple>
@@ -58,12 +57,8 @@ class CombineIndexedArrays {
 
     private:
         template<class ...T> inline static size_t indexCount(const std::vector<unsigned int>& first, const std::vector<T>&... next) {
-            size_t count = indexCount(next...);
+            CORRADE_ASSERT(sizeof...(next) == 0 || indexCount(next...) == first.size(), "MeshTools::combineIndexedArrays(): index arrays don't have the same length, nothing done.", 0)
-            if(sizeof...(next) != 0 && count != first.size()) {
+
-                Corrade::Utility::Error() << "MeshTools::combineIndexedArrays(): index arrays don't have the same length, nothing done.";
-                assert(0);
-                return 0;
-            }
             return first.size();
         }
 

src/MeshTools/FlipNormals.cpp

@@ -16,15 +16,11 @@
 #include "FlipNormals.h"
 
 using namespace std;
-using namespace Corrade::Utility;
 
 namespace Magnum { namespace MeshTools {
 
 void flipFaceWinding(vector<unsigned int>& indices) {
-    if(indices.size()%3 != 0) {
+    CORRADE_ASSERT(!(indices.size()%3), "MeshTools::flipNormals(): index count is not divisible by 3!", )
-        Error() << "MeshTools::flipNormals(): index count is not divisible by 3!";
-        return;
-    }
 
     for(size_t i = 0; i != indices.size(); i += 3)
         swap(indices[i+1], indices[i+2]);

src/MeshTools/GenerateFlatNormals.cpp

@@ -18,15 +18,11 @@
 #include "MeshTools/Clean.h"
 
 using namespace std;
-using namespace Corrade::Utility;
 
 namespace Magnum { namespace MeshTools {
 
 tuple<vector<unsigned int>, vector<Vector3>> generateFlatNormals(const std::vector< unsigned int >& indices, const vector< Vector4 >& vertices) {
-    if(indices.size()%3 != 0) {
+    CORRADE_ASSERT(!(indices.size()%3), "MeshTools::generateFlatNormals(): index count is not divisible by 3!", (tuple<vector<unsigned int>, vector<Vector3>>()))
-        Error() << "MeshTools::generateFlatNormals(): index count is not divisible by 3!";
-        return tuple<vector<unsigned int>, vector<Vector3>>();
-    }
 
     /* Create normal for every triangle (assuming counterclockwise winding) */
     vector<unsigned int> normalIndices;

src/MeshTools/Interleave.h

@@ -19,7 +19,6 @@
  * @brief Function Magnum::MeshTools::interleave()
  */
 
-#include <cassert>
 #include <cstring>
 #include <vector>
 #include <limits>
@@ -54,11 +53,7 @@ class Interleave {
         }
 
         template<class ...T> void operator()(Mesh* mesh, Buffer* buffer, Buffer::Usage usage, const std::vector<T>&... attributes) {
-            if(!mesh->isInterleaved(buffer)) {
+            CORRADE_ASSERT(mesh->isInterleaved(buffer), "MeshTools::interleave(): the buffer is not interleaved, nothing done", )
-                Corrade::Utility::Error() << "MeshTools::interleave(): the buffer is not interleaved, nothing done";
-                assert(0);
-                return;
-            }
 
             operator()(attributes...);
 
@@ -69,12 +64,8 @@ class Interleave {
         }
 
         template<class T, class ...U> inline static size_t attributeCount(const std::vector<T>& first, const std::vector<U>&... next) {
-            size_t count = attributeCount(next...);
+            CORRADE_ASSERT(sizeof...(next) == 0 || attributeCount(next...) == first.size(), "MeshTools::interleave(): attribute arrays don't have the same length, nothing done.", 0)
-            if(sizeof...(next) != 0 && count != first.size()) {
+
-                Corrade::Utility::Error() << "MeshTools::interleave(): attribute arrays don't have the same length, nothing done.";
-                assert(0);
-                return 0;
-            }
             return first.size();
         }
 

src/MeshTools/Subdivide.h

@@ -32,10 +32,7 @@ template<class Vertex, class Interpolator> class Subdivide {
         inline Subdivide(std::vector<unsigned int>& indices, std::vector<Vertex>& vertices): indices(indices), vertices(vertices) {}
 
         void operator()(Interpolator interpolator) {
-            if(indices.size()%3 != 0) {
+            CORRADE_ASSERT(!(indices.size()%3), "MeshTools::subdivide(): index count is not divisible by 3!", )
-                Corrade::Utility::Error() << "MeshTools::subdivide(): index count is not divisible by 3!";
-                return;
-            }
 
             size_t indexCount = indices.size();
             indices.reserve(indices.size()*4);

src/MeshTools/Test/CMakeLists.txt

@@ -1,9 +1,12 @@
 corrade_add_test(CleanTest CleanTest.h CleanTest.cpp ${CORRADE_UTILITY_LIBRARY})
 corrade_add_test(CombineIndexedArraysTest CombineIndexedArraysTest.h CombineIndexedArraysTest.cpp ${CORRADE_UTILITY_LIBRARY})
 corrade_add_test(CompressIndicesTest CompressIndicesTest.h CompressIndicesTest.cpp ${CORRADE_UTILITY_LIBRARY} ${MAGNUM_LIBRARY})
-corrade_add_test(FlipNormalsTest FlipNormalsTest.h FlipNormalsTest.cpp ${MAGNUM_MESHTOOLS_LIBRARY})
+corrade_add_test(FlipNormalsTest FlipNormalsTest.h FlipNormalsTest.cpp MagnumMeshToolsTestLib)
-corrade_add_test(GenerateFlatNormalsTest GenerateFlatNormalsTest.h GenerateFlatNormalsTest.cpp ${MAGNUM_MESHTOOLS_LIBRARY})
+corrade_add_test(GenerateFlatNormalsTest GenerateFlatNormalsTest.h GenerateFlatNormalsTest.cpp MagnumMeshToolsTestLib)
 corrade_add_test(InterleaveTest InterleaveTest.h InterleaveTest.cpp ${CORRADE_UTILITY_LIBRARY})
 corrade_add_test(SubdivideTest SubdivideTest.h SubdivideTest.cpp ${CORRADE_UTILITY_LIBRARY})
 corrade_add_test(SubdivideCleanBenchmark SubdivideCleanBenchmark.h SubdivideCleanBenchmark.cpp ${CORRADE_UTILITY_LIBRARY} ${MAGNUM_PRIMITIVES_LIBRARY})
 corrade_add_test(TipsifyTest TipsifyTest.h TipsifyTest.cpp ${MAGNUM_MESHTOOLS_LIBRARY})
+
+# Graceful assert for testing
+set_target_properties(CombineIndexedArraysTest InterleaveTest SubdivideTest PROPERTIES COMPILE_FLAGS -DCORRADE_GRACEFUL_ASSERT)

src/MeshTools/Test/CombineIndexedArraysTest.cpp

@@ -15,8 +15,6 @@
 
 #include "CombineIndexedArraysTest.h"
 
-#define NDEBUG
-
 #include <sstream>
 #include <QtTest/QTest>
 

src/MeshTools/Test/InterleaveTest.cpp

@@ -15,10 +15,6 @@
 
 #include "InterleaveTest.h"
 
-#ifndef NDEBUG
-#define NDEBUG
-#endif
-
 #include <sstream>
 #include <QtTest/QTest>
 

src/Primitives/Capsule.cpp

@@ -15,18 +15,12 @@
 
 #include "Capsule.h"
 
-#include <cassert>
-
 using namespace std;
-using namespace Corrade::Utility;
 
 namespace Magnum { namespace Primitives {
 
 Capsule::Capsule(unsigned int rings, unsigned int segments, GLfloat length, TextureCoords textureCoords): MeshData(Mesh::Primitive::Triangles, new vector<unsigned int>, {new vector<Vector4>()}, {new vector<Vector3>()}, textureCoords == TextureCoords::Generate ? vector<vector<Vector2>*>{new vector<Vector2>()} : vector<vector<Vector2>*>()), segments(segments), textureCoords(textureCoords) {
-    if(rings < 1 || segments < 3) {
+    CORRADE_ASSERT(rings >= 1 && segments >= 3, "Capsule must have at least one ring and three segments", )
-        Error() << "Capsule must have at least one ring and three segments";
-        assert(0);
-    }
 
     GLfloat height = 2.0f+length;
     GLfloat textureCoordsVIncrement = 1.0f/(rings*height);

src/Primitives/UVSphere.cpp

@@ -13,8 +13,6 @@
     GNU Lesser General Public License version 3 for more details.
 */
 
-#include <cassert>
-
 #include "UVSphere.h"
 
 using namespace std;
@@ -23,10 +21,7 @@ using namespace Corrade::Utility;
 namespace Magnum { namespace Primitives {
 
 UVSphere::UVSphere(unsigned int rings, unsigned int segments, TextureCoords textureCoords): Capsule(segments, textureCoords) {
-    if(rings < 2 || segments < 3) {
+    CORRADE_ASSERT(rings >= 2 && segments >= 3, "UVSphere must have at least two rings and three segments", )
-        Error() << "UVSphere must have at least two rings and three segments";
-        assert(0);
-    }
 
     GLfloat textureCoordsVIncrement = 1.0f/rings;
     GLfloat ringAngleIncrement = PI/rings;