Browse Source

Workarounds to make Doxygen happy.

vectorfields
Vladimír Vondruš 14 years ago
parent
commit
f2a569de0e
  1. 2
      src/Math/Math.cpp
  2. 2
      src/MeshTools/FlipNormals.cpp
  3. 2
      src/MeshTools/GenerateFlatNormals.cpp
  4. 2
      src/Primitives/Capsule.cpp

2
src/Math/Math.cpp

@ -19,7 +19,7 @@ using namespace std;
namespace Magnum { namespace Math {
uint32_t log(uint32_t base, uint32_t number) {
std::uint32_t log(std::uint32_t base, std::uint32_t number) {
uint32_t log = 0;
while(number /= base)
++log;

2
src/MeshTools/FlipNormals.cpp

@ -21,7 +21,7 @@ using namespace std;
namespace Magnum { namespace MeshTools {
void flipFaceWinding(vector<uint32_t>& indices) {
void flipFaceWinding(vector<std::uint32_t>& indices) {
CORRADE_ASSERT(!(indices.size()%3), "MeshTools::flipNormals(): index count is not divisible by 3!", );
for(size_t i = 0; i != indices.size(); i += 3)

2
src/MeshTools/GenerateFlatNormals.cpp

@ -22,7 +22,7 @@ using namespace std;
namespace Magnum { namespace MeshTools {
tuple<vector<uint32_t>, vector<Vector3>> generateFlatNormals(const vector<uint32_t>& indices, const vector<Point3D>& positions) {
tuple<vector<std::uint32_t>, vector<Vector3>> generateFlatNormals(const vector<std::uint32_t>& indices, const vector<Point3D>& positions) {
CORRADE_ASSERT(!(indices.size()%3), "MeshTools::generateFlatNormals(): index count is not divisible by 3!", (tuple<vector<uint32_t>, vector<Vector3>>()));
/* Create normal for every triangle (assuming counterclockwise winding) */

2
src/Primitives/Capsule.cpp

@ -22,7 +22,7 @@ using namespace std;
namespace Magnum { namespace Primitives {
Capsule::Capsule(uint32_t hemisphereRings, uint32_t cylinderRings, uint32_t segments, GLfloat length, TextureCoords textureCoords): MeshData3D("", Mesh::Primitive::Triangles, new vector<uint32_t>, {new vector<Point3D>()}, {new vector<Vector3>()}, textureCoords == TextureCoords::Generate ? vector<vector<Vector2>*>{new vector<Vector2>()} : vector<vector<Vector2>*>()), segments(segments), textureCoords(textureCoords) {
Capsule::Capsule(std::uint32_t hemisphereRings, std::uint32_t cylinderRings, std::uint32_t segments, GLfloat length, TextureCoords textureCoords): MeshData3D("", Mesh::Primitive::Triangles, new vector<uint32_t>, {new vector<Point3D>()}, {new vector<Vector3>()}, textureCoords == TextureCoords::Generate ? vector<vector<Vector2>*>{new vector<Vector2>()} : vector<vector<Vector2>*>()), segments(segments), textureCoords(textureCoords) {
CORRADE_ASSERT(hemisphereRings >= 1 && cylinderRings >= 1 && segments >= 3, "Capsule must have at least one hemisphere ring, one cylinder ring and three segments", );
GLfloat height = 2.0f+length;

Loading…
Cancel
Save