From 89373f2cab3e32e93b4a8a0958cd2e450cf200a0 Mon Sep 17 00:00:00 2001 From: Pierre Kraemer Date: Wed, 14 Nov 2012 13:15:22 +0100 Subject: [PATCH] bug fix : default parameter repetition in raySelector.hpp, missing initialization in TraversorCell constructor --- SCHNApps/src/visualization/view.cpp | 8 ++++---- ThirdParty/CMakeLists.txt | 1 - include/Algo/Selection/raySelector.hpp | 22 ++++------------------ include/Topology/generic/genericmap.hpp | 4 ++-- include/Topology/generic/traversorCell.hpp | 2 +- 5 files changed, 11 insertions(+), 26 deletions(-) diff --git a/SCHNApps/src/visualization/view.cpp b/SCHNApps/src/visualization/view.cpp index a3478274..0eb8944d 100644 --- a/SCHNApps/src/visualization/view.cpp +++ b/SCHNApps/src/visualization/view.cpp @@ -6,10 +6,10 @@ #include "cameraViewDialog.h" #include "cameraSceneDialog.h" #include "context.h" -#include "GL/glut.h" -#include "GL/freeglut_ext.h" -#include "GL/freeglut_std.h" -#include "GL/freeglut.h" +//#include "GL/glut.h" +//#include "GL/freeglut_ext.h" +//#include "GL/freeglut_std.h" +//#include "GL/freeglut.h" diff --git a/ThirdParty/CMakeLists.txt b/ThirdParty/CMakeLists.txt index e9709b38..d2239972 100644 --- a/ThirdParty/CMakeLists.txt +++ b/ThirdParty/CMakeLists.txt @@ -37,7 +37,6 @@ ENDIF(APPLE) add_subdirectory(Tools Tools/build) -add_subdirectory(QGLViewer QGLViewer/build) IF (WITH_ZINRI) add_subdirectory(Zinri Zinri/build) diff --git a/include/Algo/Selection/raySelector.hpp b/include/Algo/Selection/raySelector.hpp index a86ab66d..e6818b42 100644 --- a/include/Algo/Selection/raySelector.hpp +++ b/include/Algo/Selection/raySelector.hpp @@ -212,7 +212,7 @@ void verticesRaySelection(typename PFP::MAP& map, const VertexAttribute void volumesRaySelection(typename PFP::MAP& map, const VertexAttribute& position, const FunctorSelect& good, const typename PFP::VEC3& rayA, const typename PFP::VEC3& rayAB, std::vector& vecVolumes) { - std::vector& vecFaces; + std::vector vecFaces; std::vector iPoints; // get back intersected faces @@ -425,7 +425,7 @@ void facesPlanSelection(typename PFP::MAP& map, const VertexAttribute -void verticesConeSelection(typename PFP::MAP& map, const VertexAttribute& position, const typename PFP::VEC3& rayA, const typename PFP::VEC3& rayAB, float angle, std::vector& vecVertices, const FunctorSelect& good= allDarts) +void verticesConeSelection(typename PFP::MAP& map, const VertexAttribute& position, const typename PFP::VEC3& rayA, const typename PFP::VEC3& rayAB, float angle, std::vector& vecVertices, const FunctorSelect& good) { typename PFP::REAL AB2 = rayAB * rayAB; @@ -533,7 +533,7 @@ void edgesConeSelection(typename PFP::MAP& map, const VertexAttribute -Dart verticesBubbleSelection(typename PFP::MAP& map, const VertexAttribute& position, const typename PFP::VEC3& cursor, typename PFP::REAL radiusMax, const FunctorSelect& good=allDarts) +Dart verticesBubbleSelection(typename PFP::MAP& map, const VertexAttribute& position, const typename PFP::VEC3& cursor, typename PFP::REAL radiusMax, const FunctorSelect& good) { typename PFP::REAL l2max = radiusMax*radiusMax; typename PFP::REAL l2min(std::numeric_limits::max()); @@ -555,7 +555,7 @@ Dart verticesBubbleSelection(typename PFP::MAP& map, const VertexAttribute -Dart edgesBubbleSelection(typename PFP::MAP& map, const VertexAttribute& position, const typename PFP::VEC3& cursor, typename PFP::REAL radiusMax, const FunctorSelect& good=allDarts) +Dart edgesBubbleSelection(typename PFP::MAP& map, const VertexAttribute& position, const typename PFP::VEC3& cursor, typename PFP::REAL radiusMax, const FunctorSelect& good) { typename PFP::REAL l2max = radiusMax*radiusMax; typename PFP::REAL l2min(std::numeric_limits::max()); @@ -733,20 +733,6 @@ Dart edgesBubbleSelection(typename PFP::MAP& map, const VertexAttribute void GenericMap::initDartEmbedding(Dart d, unsigned int emb) { assert(isOrbitEmbedded() || !"Invalid parameter: orbit not embedded"); - - m_attribs[ORBIT].refLine(emb); // ref the new emb + if(emb != EMBNULL) + m_attribs[ORBIT].refLine(emb); // ref the new emb (*m_embeddings[ORBIT])[dartIndex(d)] = emb ; // affect the embedding to the dart } diff --git a/include/Topology/generic/traversorCell.hpp b/include/Topology/generic/traversorCell.hpp index 18d492c3..919d6cbc 100644 --- a/include/Topology/generic/traversorCell.hpp +++ b/include/Topology/generic/traversorCell.hpp @@ -27,7 +27,7 @@ namespace CGoGN template TraversorCell::TraversorCell(MAP& map, const FunctorSelect& good, bool forceDartMarker, unsigned int thread) : - m(map), dmark(NULL), cmark(NULL), current(NIL), firstTraversal(true), m_good(good) + m(map), dmark(NULL), cmark(NULL), quickTraversal(NULL), current(NIL), firstTraversal(true), m_good(good) { if(forceDartMarker) dmark = new DartMarker(map, thread) ; -- GitLab