diff options
Diffstat (limited to 'thirdparty/embree/kernels/common/scene_subdiv_mesh.h')
| -rw-r--r-- | thirdparty/embree/kernels/common/scene_subdiv_mesh.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/thirdparty/embree/kernels/common/scene_subdiv_mesh.h b/thirdparty/embree/kernels/common/scene_subdiv_mesh.h index 1db170196d..b213a9b7ba 100644 --- a/thirdparty/embree/kernels/common/scene_subdiv_mesh.h +++ b/thirdparty/embree/kernels/common/scene_subdiv_mesh.h @@ -9,11 +9,13 @@ #include "../subdiv/tessellation_cache.h" #include "../subdiv/catmullclark_coefficients.h" #include "../subdiv/patch.h" -#include "../../common/algorithms/parallel_map.h" -#include "../../common/algorithms/parallel_set.h" namespace embree { + struct HoleSet; + struct VertexCreaseMap; + struct EdgeCreaseMap; + class SubdivMesh : public Geometry { ALIGNED_CLASS_(16); @@ -49,6 +51,7 @@ namespace embree /*! subdiv mesh construction */ SubdivMesh(Device* device); + ~SubdivMesh(); public: void setMask (unsigned mask); @@ -272,7 +275,7 @@ namespace embree mvector<uint32_t> halfEdgeFace; /*! set with all holes */ - parallel_set<uint32_t> holeSet; + std::unique_ptr<HoleSet> holeSet; /*! fast lookup table to detect invalid faces */ mvector<char> invalid_face; @@ -299,10 +302,10 @@ namespace embree private: /*! map with all vertex creases */ - parallel_map<uint32_t,float> vertexCreaseMap; + std::unique_ptr<VertexCreaseMap> vertexCreaseMap; /*! map with all edge creases */ - parallel_map<uint64_t,float> edgeCreaseMap; + std::unique_ptr<EdgeCreaseMap> edgeCreaseMap; protected: |