Commit c040b413 authored by CGoGN GIT Supervisor's avatar CGoGN GIT Supervisor

Merge branch 'master' of /home/vanhoey/CGoGN

* 'master' of /home/vanhoey/CGoGN:
  corrections sur gestion des boundingbox
  decimation countdown correction
  added some comments to importPlyPTMgeneric
  separation in two version of importPlyPTM : one with fixed degree polynomials (F Larue) and one for any degree polynomials (K Vanhoey)
  added generic version of importPLYptm (good for bivariable polynomials of any degree)
parents 04d09a3b 98f4c489
......@@ -149,7 +149,7 @@ void decimate(
while(!finished)
{
CGoGNout << "Countdown : " ;
CGoGNout << std::setprecision(8) << (nbVertices - nbWantedVertices) << "\r" << /* flush */ CGoGNendl ;
CGoGNout << std::setprecision(8) << (nbVertices - nbWantedVertices) << "\r" /* flush */ ;
if(!selector->nextEdge(d)) {
CGoGNout << CGoGNendl << "out" << CGoGNendl ;
......
......@@ -26,6 +26,7 @@
#define __EDGESELECTOR_H__
#include "Algo/Decimation/selector.h"
#include "Algo/Geometry/boundingbox.h"
#include "Container/fakeAttribute.h"
#include "Utils/qem.h"
......
......@@ -41,7 +41,7 @@ namespace Geometry
template <typename PFP>
Geom::BoundingBox<typename PFP::VEC3> computeBoundingBox(typename PFP::MAP& map, const typename PFP::TVEC3& position, const FunctorSelect& select = SelectorTrue())
{
Geom::BoundingBox<typename PFP::VEC3> bb(position[map.begin()]) ;
Geom::BoundingBox<typename PFP::VEC3> bb ;
CellMarker vmarker(map, VERTEX);
for(Dart d = map.begin(); d != map.end(); map.next(d))
......
......@@ -50,7 +50,7 @@ namespace Import
namespace ImportSurfacique
{
enum ImportType { UNKNOWNSURFACE, TRIAN, TRIANBGZ, PLY, PLYPTM, OFF, OBJ, CTM, VRML };
enum ImportType { UNKNOWNSURFACE, TRIAN, TRIANBGZ, PLY, PLYPTM, PLYPTMgeneric, OFF, OBJ, CTM, VRML };
}
namespace ImportVolumique
......@@ -110,6 +110,7 @@ public:
bool importPly(const std::string& filename, std::vector<std::string>& attrNames);
bool importPlyPTM(const std::string& filename, std::vector<std::string>& attrNames);
bool importPlyPTMgeneric(const std::string& filename, std::vector<std::string>& attrNames);
bool importCTM(const std::string& filename, std::vector<std::string>& attrNames);
......
......@@ -129,6 +129,7 @@ void BoundingBox<VEC>::addPoint(const VEC& p)
{
m_pMin = p ;
m_pMax = p ;
m_initialized = true ;
}
else
{
......
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