diff options
Diffstat (limited to 'extern/carve/lib/csg_detail.hpp')
| -rw-r--r-- | extern/carve/lib/csg_detail.hpp | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/extern/carve/lib/csg_detail.hpp b/extern/carve/lib/csg_detail.hpp index 4b8fca3d2d2..e5947e776b5 100644 --- a/extern/carve/lib/csg_detail.hpp +++ b/extern/carve/lib/csg_detail.hpp @@ -24,30 +24,32 @@ namespace carve { namespace csg { namespace detail { + typedef std::map<carve::mesh::MeshSet<3>::vertex_t *, + std::set<std::pair<carve::mesh::MeshSet<3>::face_t *, double> > > EdgeIntInfo; - typedef std::unordered_set<carve::mesh::MeshSet<3>::vertex_t *> VSet; - typedef std::unordered_set<carve::mesh::MeshSet<3>::face_t *> FSet; + typedef std::unordered_set<carve::mesh::MeshSet<3>::vertex_t *> VSet; + typedef std::unordered_set<carve::mesh::MeshSet<3>::face_t *> FSet; - typedef std::set<carve::mesh::MeshSet<3>::vertex_t *> VSetSmall; - typedef std::set<csg::V2> V2SetSmall; - typedef std::set<carve::mesh::MeshSet<3>::face_t *> FSetSmall; + typedef std::set<carve::mesh::MeshSet<3>::vertex_t *> VSetSmall; + typedef std::set<csg::V2> V2SetSmall; + typedef std::set<carve::mesh::MeshSet<3>::face_t *> FSetSmall; - typedef std::unordered_map<carve::mesh::MeshSet<3>::vertex_t *, VSetSmall> VVSMap; - typedef std::unordered_map<carve::mesh::MeshSet<3>::edge_t *, VSetSmall> EVSMap; - typedef std::unordered_map<carve::mesh::MeshSet<3>::face_t *, VSetSmall> FVSMap; + typedef std::unordered_map<carve::mesh::MeshSet<3>::vertex_t *, VSetSmall> VVSMap; + typedef std::unordered_map<carve::mesh::MeshSet<3>::edge_t *, EdgeIntInfo> EIntMap; + typedef std::unordered_map<carve::mesh::MeshSet<3>::face_t *, VSetSmall> FVSMap; - typedef std::unordered_map<carve::mesh::MeshSet<3>::vertex_t *, FSetSmall> VFSMap; - typedef std::unordered_map<carve::mesh::MeshSet<3>::face_t *, V2SetSmall> FV2SMap; + typedef std::unordered_map<carve::mesh::MeshSet<3>::vertex_t *, FSetSmall> VFSMap; + typedef std::unordered_map<carve::mesh::MeshSet<3>::face_t *, V2SetSmall> FV2SMap; - typedef std::unordered_map< - carve::mesh::MeshSet<3>::edge_t *, - std::vector<carve::mesh::MeshSet<3>::vertex_t *> > EVVMap; + typedef std::unordered_map< + carve::mesh::MeshSet<3>::edge_t *, + std::vector<carve::mesh::MeshSet<3>::vertex_t *> > EVVMap; typedef std::unordered_map<carve::mesh::MeshSet<3>::vertex_t *, std::vector<carve::mesh::MeshSet<3>::edge_t *> > VEVecMap; - class LoopEdges : public std::unordered_map<V2, std::list<FaceLoop *> > { + class LoopEdges : public std::unordered_map<V2, std::list<FaceLoop *> > { typedef std::unordered_map<V2, std::list<FaceLoop *> > super; public: |