Browse Source

Another #include cleanup.

This will break some stuff.
pull/7/head
Vladimír Vondruš 13 years ago
parent
commit
bdeb1d7ac1
  1. 1
      src/Primitives/Cylinder.cpp
  2. 26
      src/Primitives/Icosphere.cpp
  3. 2
      src/Trade/MeshData2D.cpp
  4. 1
      src/Trade/MeshData2D.h
  5. 2
      src/Trade/MeshData3D.cpp
  6. 1
      src/Trade/MeshData3D.h

1
src/Primitives/Cylinder.cpp

@ -16,6 +16,7 @@
#include "Cylinder.h"
#include "Math/Constants.h"
#include "Math/Point3D.h"
namespace Magnum { namespace Primitives {

26
src/Primitives/Icosphere.cpp

@ -15,7 +15,7 @@
#include "Icosphere.h"
#include "Math/Vector4.h"
#include "Math/Point3D.h"
namespace Magnum { namespace Primitives {
@ -41,18 +41,18 @@ Icosphere<0>::Icosphere(): MeshData3D(Mesh::Primitive::Triangles, new std::vecto
3, 9, 8,
4, 8, 0
}, {new std::vector<Point3D>}, {new std::vector<Vector3>{
Vector3(0, -0.525731f, 0.850651f),
Vector3(0.850651f, 0, 0.525731f),
Vector3(0.850651f, 0, -0.525731f),
Vector3(-0.850651f, 0, -0.525731f),
Vector3(-0.850651f, 0, 0.525731f),
Vector3(-0.525731f, 0.850651f, 0),
Vector3(0.525731f, 0.850651f, 0),
Vector3(0.525731f, -0.850651f, 0),
Vector3(-0.525731f, -0.850651f, 0),
Vector3(0, -0.525731f, -0.850651f),
Vector3(0, 0.525731f, -0.850651f),
Vector3(0, 0.525731f, 0.850651f)
{0.0f, -0.525731f, 0.850651f},
{0.850651f, 0.0f, 0.525731f},
{0.850651f, 0.0f, -0.525731f},
{-0.850651f, 0.0f, -0.525731f},
{-0.850651f, 0.0f, 0.525731f},
{-0.525731f, 0.850651f, 0.0f},
{0.525731f, 0.850651f, 0.0f},
{0.525731f, -0.850651f, 0.0f},
{-0.525731f, -0.850651f, 0.0f},
{0.0f, -0.525731f, -0.850651f},
{0.0f, 0.525731f, -0.850651f},
{0.0f, 0.525731f, 0.850651f}
}}, {}) {
positions(0)->assign(normals(0)->begin(), normals(0)->end());
}

2
src/Trade/MeshData2D.cpp

@ -15,6 +15,8 @@
#include "MeshData2D.h"
#include "Math/Point2D.h"
namespace Magnum { namespace Trade {
MeshData2D::~MeshData2D() {

1
src/Trade/MeshData2D.h

@ -21,7 +21,6 @@
#include <string>
#include "Math/Point2D.h"
#include "Mesh.h"
namespace Magnum { namespace Trade {

2
src/Trade/MeshData3D.cpp

@ -15,6 +15,8 @@
#include "MeshData3D.h"
#include "Math/Point3D.h"
namespace Magnum { namespace Trade {
MeshData3D::~MeshData3D() {

1
src/Trade/MeshData3D.h

@ -21,7 +21,6 @@
#include <string>
#include "Math/Point3D.h"
#include "Mesh.h"
namespace Magnum { namespace Trade {

Loading…
Cancel
Save