From 1f455e8b390d5a86d70fe8cc8f89482e3f4eb508 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 25 Jan 2012 19:25:31 +0100 Subject: [PATCH] Fixed Primitives::Icosphere compilation. Forgot to use new MeshTools functions for mesh cleaning. --- src/Primitives/Icosphere.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Primitives/Icosphere.h b/src/Primitives/Icosphere.h index 872ced25d..34aa640e0 100644 --- a/src/Primitives/Icosphere.h +++ b/src/Primitives/Icosphere.h @@ -20,8 +20,9 @@ */ #include "AbstractPrimitive.h" -#include "MeshBuilder.h" #include "SizeTraits.h" +#include "MeshTools/Subdivide.h" +#include "MeshTools/Clean.h" namespace Magnum { namespace Primitives { @@ -67,11 +68,11 @@ template class Icosphere: public AbstractPrimitivesetData(Icosahedron::vertices, Icosahedron::indices, 12, 60); for(size_t i = 0; i != subdivisions; ++i) - builder()->subdivide([](const Vector4& a, const Vector4& b) { + MeshTools::subdivide(*builder(), [](const Vector4& a, const Vector4& b) { return (a+b).xyz().normalized(); }); - if(subdivisions) builder()->cleanMesh(); + if(subdivisions) MeshTools::clean(*builder()); } };