From 77779b435386123da9f052dfa89d1fdce4451375 Mon Sep 17 00:00:00 2001 From: Paolo Cignoni cignoni Date: Sat, 21 Nov 2009 14:00:36 +0000 Subject: [PATCH] [filter_shape] - Removed BOX support and fixed HEXAHEDRON support. --- src/fgt/filter_shape/filter_shape.cpp | 9 +-------- src/fgt/filter_shape/filter_shape.h | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/fgt/filter_shape/filter_shape.cpp b/src/fgt/filter_shape/filter_shape.cpp index 2009c4cd0..9c09cb30b 100644 --- a/src/fgt/filter_shape/filter_shape.cpp +++ b/src/fgt/filter_shape/filter_shape.cpp @@ -111,14 +111,7 @@ bool FilterSolidShapes::applyFilter(QAction *filter, MeshModel &m, RichParameter vcg::tri::Octahedron(m.cm); break; case CR_HEXAHEDRON: - break; - case CR_BOX: - /* CRASSSHHHH - float sz=par.getFloat("size"); - vcg::Box3f b(vcg::Point3f(1,1,1)*(sz/2),vcg::Point3f(1,1,1)*(-sz/2)); - vcg::tri::Box(m.cm,b); - m.updateDataMask(MeshModel::MM_POLYGONAL); - */ + vcg::tri::Hexahedron(m.cm); break; } diff --git a/src/fgt/filter_shape/filter_shape.h b/src/fgt/filter_shape/filter_shape.h index 178bc5558..6791737e7 100644 --- a/src/fgt/filter_shape/filter_shape.h +++ b/src/fgt/filter_shape/filter_shape.h @@ -39,7 +39,7 @@ class FilterSolidShapes : public QObject, public MeshFilterInterface public: enum { FSS_TEXT }; - enum { CR_TETRAHEDRON, CR_HEXAHEDRON, CR_OCTAHEDRON, CR_DODECAHEDRON, CR_ICOSAHEDRON, CR_BOX }; + enum { CR_TETRAHEDRON, CR_HEXAHEDRON, CR_OCTAHEDRON, CR_DODECAHEDRON, CR_ICOSAHEDRON }; FilterSolidShapes(); ~FilterSolidShapes(){};