Browse Source

GCC 4.4 compatibility: some explicit typing needed.

Vladimír Vondruš 13 years ago
parent
commit
d6ec398539
  1. 4
      src/Primitives/Crosshair.cpp
  2. 6
      src/Primitives/Cube.cpp
  3. 2
      src/Primitives/Icosphere.cpp
  4. 4
      src/Primitives/Line.cpp
  5. 6
      src/Primitives/Plane.cpp
  6. 4
      src/Primitives/Square.cpp

4
src/Primitives/Crosshair.cpp

@ -31,14 +31,14 @@
namespace Magnum { namespace Primitives { namespace Magnum { namespace Primitives {
Trade::MeshData2D Crosshair2D::wireframe() { Trade::MeshData2D Crosshair2D::wireframe() {
return Trade::MeshData2D(Mesh::Primitive::Lines, {}, {{ return Trade::MeshData2D(Mesh::Primitive::Lines, {}, {std::vector<Vector2>{
{-1.0f, 0.0f}, {1.0f, 0.0f}, {-1.0f, 0.0f}, {1.0f, 0.0f},
{ 0.0f, -1.0f}, {0.0f, 1.0f} { 0.0f, -1.0f}, {0.0f, 1.0f}
}}, {}); }}, {});
} }
Trade::MeshData3D Crosshair3D::wireframe() { Trade::MeshData3D Crosshair3D::wireframe() {
return Trade::MeshData3D(Mesh::Primitive::Lines, {}, {{ return Trade::MeshData3D(Mesh::Primitive::Lines, {}, {std::vector<Vector3>{
{-1.0f, 0.0f, 0.0f}, {1.0f, 0.0f, 0.0f}, {-1.0f, 0.0f, 0.0f}, {1.0f, 0.0f, 0.0f},
{ 0.0f, -1.0f, 0.0f}, {0.0f, 1.0f, 0.0f}, { 0.0f, -1.0f, 0.0f}, {0.0f, 1.0f, 0.0f},
{ 0.0f, 0.0f, -1.0f}, {0.0f, 0.0f, 1.0f} { 0.0f, 0.0f, -1.0f}, {0.0f, 0.0f, 1.0f}

6
src/Primitives/Cube.cpp

@ -37,7 +37,7 @@ Trade::MeshData3D Cube::solid() {
12, 13, 14, 12, 14, 15, /* -Z */ 12, 13, 14, 12, 14, 15, /* -Z */
16, 17, 18, 16, 18, 19, /* -Y */ 16, 17, 18, 16, 18, 19, /* -Y */
20, 21, 22, 20, 22, 23 /* -X */ 20, 21, 22, 20, 22, 23 /* -X */
}, {{ }, {std::vector<Vector3>{
{-1.0f, -1.0f, 1.0f}, {-1.0f, -1.0f, 1.0f},
{ 1.0f, -1.0f, 1.0f}, { 1.0f, -1.0f, 1.0f},
{ 1.0f, 1.0f, 1.0f}, /* +Z */ { 1.0f, 1.0f, 1.0f}, /* +Z */
@ -67,7 +67,7 @@ Trade::MeshData3D Cube::solid() {
{-1.0f, -1.0f, 1.0f}, {-1.0f, -1.0f, 1.0f},
{-1.0f, 1.0f, 1.0f}, /* -X */ {-1.0f, 1.0f, 1.0f}, /* -X */
{-1.0f, 1.0f, -1.0f} {-1.0f, 1.0f, -1.0f}
}}, {{ }}, {std::vector<Vector3>{
{ 0.0f, 0.0f, 1.0f}, { 0.0f, 0.0f, 1.0f},
{ 0.0f, 0.0f, 1.0f}, { 0.0f, 0.0f, 1.0f},
{ 0.0f, 0.0f, 1.0f}, /* +Z */ { 0.0f, 0.0f, 1.0f}, /* +Z */
@ -106,7 +106,7 @@ Trade::MeshData3D Cube::wireframe() {
4, 5, 5, 6, 6, 7, 7, 4, /* -Z */ 4, 5, 5, 6, 6, 7, 7, 4, /* -Z */
1, 5, 2, 6, /* +X */ 1, 5, 2, 6, /* +X */
0, 4, 3, 7 /* -X */ 0, 4, 3, 7 /* -X */
}, {{ }, {std::vector<Vector3>{
{-1.0f, -1.0f, 1.0f}, {-1.0f, -1.0f, 1.0f},
{ 1.0f, -1.0f, 1.0f}, { 1.0f, -1.0f, 1.0f},
{ 1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 1.0f},

2
src/Primitives/Icosphere.cpp

@ -49,7 +49,7 @@ Icosphere<0>::Icosphere(): MeshData3D(Mesh::Primitive::Triangles, {
7, 1, 0, 7, 1, 0,
3, 9, 8, 3, 9, 8,
4, 8, 0 4, 8, 0
}, {}, {{ }, {}, {std::vector<Vector3>{
{0.0f, -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},

4
src/Primitives/Line.cpp

@ -31,13 +31,13 @@
namespace Magnum { namespace Primitives { namespace Magnum { namespace Primitives {
Trade::MeshData2D Line2D::wireframe() { Trade::MeshData2D Line2D::wireframe() {
return Trade::MeshData2D(Mesh::Primitive::Lines, {}, {{ return Trade::MeshData2D(Mesh::Primitive::Lines, {}, {std::vector<Vector2>{
{0.0f, 0.0f}, {1.0f, 0.0f} {0.0f, 0.0f}, {1.0f, 0.0f}
}}, {}); }}, {});
} }
Trade::MeshData3D Line3D::wireframe() { Trade::MeshData3D Line3D::wireframe() {
return Trade::MeshData3D(Mesh::Primitive::Lines, {}, {{ return Trade::MeshData3D(Mesh::Primitive::Lines, {}, {std::vector<Vector3>{
{0.0f, 0.0f, 0.0f}, {1.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 0.0f, 0.0f},
}}, {}, {}); }}, {}, {});
} }

6
src/Primitives/Plane.cpp

@ -30,12 +30,12 @@
namespace Magnum { namespace Primitives { namespace Magnum { namespace Primitives {
Trade::MeshData3D Plane::solid() { Trade::MeshData3D Plane::solid() {
return Trade::MeshData3D(Mesh::Primitive::TriangleStrip, {}, {{ return Trade::MeshData3D(Mesh::Primitive::TriangleStrip, {}, {std::vector<Vector3>{
{1.0f, -1.0f, 0.0f}, {1.0f, -1.0f, 0.0f},
{1.0f, 1.0f, 0.0f}, {1.0f, 1.0f, 0.0f},
{-1.0f, -1.0f, 0.0f}, {-1.0f, -1.0f, 0.0f},
{-1.0f, 1.0f, 0.0f} {-1.0f, 1.0f, 0.0f}
}}, {{ }}, {std::vector<Vector3>{
{0.0f, 0.0f, 1.0f}, {0.0f, 0.0f, 1.0f},
{0.0f, 0.0f, 1.0f}, {0.0f, 0.0f, 1.0f},
{0.0f, 0.0f, 1.0f}, {0.0f, 0.0f, 1.0f},
@ -44,7 +44,7 @@ Trade::MeshData3D Plane::solid() {
} }
Trade::MeshData3D Plane::wireframe() { Trade::MeshData3D Plane::wireframe() {
return Trade::MeshData3D(Mesh::Primitive::LineLoop, {}, {{ return Trade::MeshData3D(Mesh::Primitive::LineLoop, {}, {std::vector<Vector3>{
{-1.0f, -1.0f, 0.0f}, {-1.0f, -1.0f, 0.0f},
{1.0f, -1.0f, 0.0f}, {1.0f, -1.0f, 0.0f},
{1.0f, 1.0f, 0.0f}, {1.0f, 1.0f, 0.0f},

4
src/Primitives/Square.cpp

@ -30,7 +30,7 @@
namespace Magnum { namespace Primitives { namespace Magnum { namespace Primitives {
Trade::MeshData2D Square::solid() { Trade::MeshData2D Square::solid() {
return Trade::MeshData2D(Mesh::Primitive::TriangleStrip, {}, {{ return Trade::MeshData2D(Mesh::Primitive::TriangleStrip, {}, {std::vector<Vector2>{
{1.0f, -1.0f}, {1.0f, -1.0f},
{1.0f, 1.0f}, {1.0f, 1.0f},
{-1.0f, -1.0f}, {-1.0f, -1.0f},
@ -39,7 +39,7 @@ Trade::MeshData2D Square::solid() {
} }
Trade::MeshData2D Square::wireframe() { Trade::MeshData2D Square::wireframe() {
return Trade::MeshData2D(Mesh::Primitive::LineLoop, {}, {{ return Trade::MeshData2D(Mesh::Primitive::LineLoop, {}, {std::vector<Vector2>{
{-1.0f, -1.0f}, {-1.0f, -1.0f},
{1.0f, -1.0f}, {1.0f, -1.0f},
{1.0f, 1.0f}, {1.0f, 1.0f},

Loading…
Cancel
Save