Commit 89373f2c authored by Pierre Kraemer's avatar Pierre Kraemer

bug fix : default parameter repetition in raySelector.hpp, missing...

bug fix : default parameter repetition in raySelector.hpp, missing initialization in TraversorCell constructor
parent a1495866
...@@ -6,10 +6,10 @@ ...@@ -6,10 +6,10 @@
#include "cameraViewDialog.h" #include "cameraViewDialog.h"
#include "cameraSceneDialog.h" #include "cameraSceneDialog.h"
#include "context.h" #include "context.h"
#include "GL/glut.h" //#include "GL/glut.h"
#include "GL/freeglut_ext.h" //#include "GL/freeglut_ext.h"
#include "GL/freeglut_std.h" //#include "GL/freeglut_std.h"
#include "GL/freeglut.h" //#include "GL/freeglut.h"
......
...@@ -37,7 +37,6 @@ ENDIF(APPLE) ...@@ -37,7 +37,6 @@ ENDIF(APPLE)
add_subdirectory(Tools Tools/build) add_subdirectory(Tools Tools/build)
add_subdirectory(QGLViewer QGLViewer/build)
IF (WITH_ZINRI) IF (WITH_ZINRI)
add_subdirectory(Zinri Zinri/build) add_subdirectory(Zinri Zinri/build)
......
...@@ -212,7 +212,7 @@ void verticesRaySelection(typename PFP::MAP& map, const VertexAttribute<typename ...@@ -212,7 +212,7 @@ void verticesRaySelection(typename PFP::MAP& map, const VertexAttribute<typename
template<typename PFP> template<typename PFP>
void volumesRaySelection(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, const FunctorSelect& good, const typename PFP::VEC3& rayA, const typename PFP::VEC3& rayAB, std::vector<Dart>& vecVolumes) void volumesRaySelection(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, const FunctorSelect& good, const typename PFP::VEC3& rayA, const typename PFP::VEC3& rayAB, std::vector<Dart>& vecVolumes)
{ {
std::vector<Dart>& vecFaces; std::vector<Dart> vecFaces;
std::vector<typename PFP::VEC3> iPoints; std::vector<typename PFP::VEC3> iPoints;
// get back intersected faces // get back intersected faces
...@@ -425,7 +425,7 @@ void facesPlanSelection(typename PFP::MAP& map, const VertexAttribute<typename P ...@@ -425,7 +425,7 @@ void facesPlanSelection(typename PFP::MAP& map, const VertexAttribute<typename P
* @param angle angle of the code in degree. * @param angle angle of the code in degree.
*/ */
template<typename PFP> template<typename PFP>
void verticesConeSelection(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, const typename PFP::VEC3& rayA, const typename PFP::VEC3& rayAB, float angle, std::vector<Dart>& vecVertices, const FunctorSelect& good= allDarts) void verticesConeSelection(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, const typename PFP::VEC3& rayA, const typename PFP::VEC3& rayAB, float angle, std::vector<Dart>& vecVertices, const FunctorSelect& good)
{ {
typename PFP::REAL AB2 = rayAB * rayAB; typename PFP::REAL AB2 = rayAB * rayAB;
...@@ -533,7 +533,7 @@ void edgesConeSelection(typename PFP::MAP& map, const VertexAttribute<typename P ...@@ -533,7 +533,7 @@ void edgesConeSelection(typename PFP::MAP& map, const VertexAttribute<typename P
template<typename PFP> template<typename PFP>
Dart verticesBubbleSelection(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, const typename PFP::VEC3& cursor, typename PFP::REAL radiusMax, const FunctorSelect& good=allDarts) Dart verticesBubbleSelection(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, const typename PFP::VEC3& cursor, typename PFP::REAL radiusMax, const FunctorSelect& good)
{ {
typename PFP::REAL l2max = radiusMax*radiusMax; typename PFP::REAL l2max = radiusMax*radiusMax;
typename PFP::REAL l2min(std::numeric_limits<float>::max()); typename PFP::REAL l2min(std::numeric_limits<float>::max());
...@@ -555,7 +555,7 @@ Dart verticesBubbleSelection(typename PFP::MAP& map, const VertexAttribute<typen ...@@ -555,7 +555,7 @@ Dart verticesBubbleSelection(typename PFP::MAP& map, const VertexAttribute<typen
template<typename PFP> template<typename PFP>
Dart edgesBubbleSelection(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, const typename PFP::VEC3& cursor, typename PFP::REAL radiusMax, const FunctorSelect& good=allDarts) Dart edgesBubbleSelection(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, const typename PFP::VEC3& cursor, typename PFP::REAL radiusMax, const FunctorSelect& good)
{ {
typename PFP::REAL l2max = radiusMax*radiusMax; typename PFP::REAL l2max = radiusMax*radiusMax;
typename PFP::REAL l2min(std::numeric_limits<float>::max()); typename PFP::REAL l2min(std::numeric_limits<float>::max());
...@@ -733,20 +733,6 @@ Dart edgesBubbleSelection(typename PFP::MAP& map, const VertexAttribute<typename ...@@ -733,20 +733,6 @@ Dart edgesBubbleSelection(typename PFP::MAP& map, const VertexAttribute<typename
// //
//} //}
} //namespace Selection } //namespace Selection
} //namespace Algo } //namespace Algo
......
...@@ -337,8 +337,8 @@ template <unsigned int ORBIT> ...@@ -337,8 +337,8 @@ template <unsigned int ORBIT>
void GenericMap::initDartEmbedding(Dart d, unsigned int emb) void GenericMap::initDartEmbedding(Dart d, unsigned int emb)
{ {
assert(isOrbitEmbedded<ORBIT>() || !"Invalid parameter: orbit not embedded"); assert(isOrbitEmbedded<ORBIT>() || !"Invalid parameter: orbit not embedded");
if(emb != EMBNULL)
m_attribs[ORBIT].refLine(emb); // ref the new emb m_attribs[ORBIT].refLine(emb); // ref the new emb
(*m_embeddings[ORBIT])[dartIndex(d)] = emb ; // affect the embedding to the dart (*m_embeddings[ORBIT])[dartIndex(d)] = emb ; // affect the embedding to the dart
} }
......
...@@ -27,7 +27,7 @@ namespace CGoGN ...@@ -27,7 +27,7 @@ namespace CGoGN
template <typename MAP, unsigned int ORBIT> template <typename MAP, unsigned int ORBIT>
TraversorCell<MAP, ORBIT>::TraversorCell(MAP& map, const FunctorSelect& good, bool forceDartMarker, unsigned int thread) : TraversorCell<MAP, ORBIT>::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) if(forceDartMarker)
dmark = new DartMarker(map, thread) ; dmark = new DartMarker(map, thread) ;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment