Commit d360e0e7 by Thomas

### Resolving bug in MarkerForTraversor and compilation pb for importMoka and exportPov

parent 7a5a7687
 ... ... @@ -180,7 +180,7 @@ void exportMeshWire(std::ofstream& out, typename PFP::MAP& map, VertexAttribute< out << "cylinder{ " << std::endl; out << "<" << position[d][0] << "," << position[d][1] << "," << position[d][2] << ">," << std::endl; out << "<" << position[dd][0] << "," << position[dd][1] << "," << position[dd][2] << ">," << width << std::endl; out << "<" << position[dd][0] << "," << position[dd][1] << "," << position[dd][2] << ">," << 0.5 << std::endl; out << "}" << std::endl; } } ... ...
 ... ... @@ -118,7 +118,7 @@ bool importMoka(typename PFP::MAP& gmap, const std::string& filename, std::vecto } for(typename std::map::iterator it = map_dart_emb.begin() ; it != map_dart_emb.end() ; ++it) gmap.embedOrbit(it->first, it->second); gmap.template embedOrbit(it->first, it->second); gmap.closeMap(); ... ...
 ... ... @@ -185,7 +185,7 @@ inline void MapRender::addEarTri(typename PFP::MAP& map, Dart d, std::vector(map, d, position); // first pass create polygon in chained list witht angle computation // first pass create polygon in chained list with angle computation VertexPoly* vpp = NULL; VertexPoly* prem = NULL; unsigned int nbv = 0; ... ... @@ -239,7 +239,7 @@ inline void MapRender::addEarTri(typename PFP::MAP& map, Dart d, std::vector3) { ... ...
 ... ... @@ -44,7 +44,6 @@ private: MAP& m_map ; DartMarkerStore* m_dmark ; CellMarkerStore* m_cmark ; unsigned int m_orbit; public: MarkerForTraversor(MAP& map, bool forceDartMarker = false, unsigned int thread = 0) ; ~MarkerForTraversor(); ... ...
 ... ... @@ -36,7 +36,7 @@ MarkerForTraversor::MarkerForTraversor(MAP& map, bool forceDartMarke m_dmark(NULL), m_cmark(NULL) { if(!forceDartMarker && map.isOrbitEmbedded(m_orbit)) if(!forceDartMarker && map.isOrbitEmbedded(ORBIT)) m_cmark = new CellMarkerStore(map, thread) ; else m_dmark = new DartMarkerStore(map, thread) ; ... ...
Supports Markdown
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