← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to extern/carve/include/carve/csg.hpp

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
extern/carve/include/carve/csg.hpp
174
174
 
175
175
      void groupIntersections();
176
176
 
177
 
      void _generateVertexVertexIntersections(carve::mesh::MeshSet<3>::vertex_t *va,
178
 
                                              carve::mesh::MeshSet<3>::edge_t *eb);
179
 
      void generateVertexVertexIntersections(carve::mesh::MeshSet<3>::face_t *a,
180
 
                                             const std::vector<carve::mesh::MeshSet<3>::face_t *> &b);
181
 
 
182
 
      void _generateVertexEdgeIntersections(carve::mesh::MeshSet<3>::vertex_t *va,
183
 
                                            carve::mesh::MeshSet<3>::edge_t *eb);
184
 
      void generateVertexEdgeIntersections(carve::mesh::MeshSet<3>::face_t *a,
185
 
                                           const std::vector<carve::mesh::MeshSet<3>::face_t *> &b);
186
 
 
187
 
      void _generateEdgeEdgeIntersections(carve::mesh::MeshSet<3>::edge_t *ea,
188
 
                                          carve::mesh::MeshSet<3>::edge_t *eb);
189
 
      void generateEdgeEdgeIntersections(carve::mesh::MeshSet<3>::face_t *a,
190
 
                                         const std::vector<carve::mesh::MeshSet<3>::face_t *> &b);
191
 
 
192
 
      void _generateVertexFaceIntersections(carve::mesh::MeshSet<3>::face_t *fa,
193
 
                                            carve::mesh::MeshSet<3>::edge_t *eb);
194
 
      void generateVertexFaceIntersections(carve::mesh::MeshSet<3>::face_t *a,
195
 
                                           const std::vector<carve::mesh::MeshSet<3>::face_t *> &b);
196
 
 
197
 
      void _generateEdgeFaceIntersections(carve::mesh::MeshSet<3>::face_t *fa,
198
 
                                          carve::mesh::MeshSet<3>::edge_t *eb);
199
 
      void generateEdgeFaceIntersections(carve::mesh::MeshSet<3>::face_t *a,
200
 
                                         const std::vector<carve::mesh::MeshSet<3>::face_t *> &b);
201
 
 
202
 
      void generateIntersectionCandidates(carve::mesh::MeshSet<3> *a,
 
177
      void _generateVertexVertexIntersections(meshset_t::vertex_t *va,
 
178
                                              meshset_t::edge_t *eb);
 
179
      void generateVertexVertexIntersections(meshset_t::face_t *a,
 
180
                                             const std::vector<meshset_t::face_t *> &b);
 
181
 
 
182
      void _generateVertexEdgeIntersections(meshset_t::vertex_t *va,
 
183
                                            meshset_t::edge_t *eb);
 
184
      void generateVertexEdgeIntersections(meshset_t::face_t *a,
 
185
                                           const std::vector<meshset_t::face_t *> &b);
 
186
 
 
187
      void _generateEdgeEdgeIntersections(meshset_t::edge_t *ea,
 
188
                                          meshset_t::edge_t *eb);
 
189
      void generateEdgeEdgeIntersections(meshset_t::face_t *a,
 
190
                                         const std::vector<meshset_t::face_t *> &b);
 
191
 
 
192
      void _generateVertexFaceIntersections(meshset_t::face_t *fa,
 
193
                                            meshset_t::edge_t *eb);
 
194
      void generateVertexFaceIntersections(meshset_t::face_t *a,
 
195
                                           const std::vector<meshset_t::face_t *> &b);
 
196
 
 
197
      void _generateEdgeFaceIntersections(meshset_t::face_t *fa,
 
198
                                          meshset_t::edge_t *eb);
 
199
      void generateEdgeFaceIntersections(meshset_t::face_t *a,
 
200
                                         const std::vector<meshset_t::face_t *> &b);
 
201
 
 
202
      void generateIntersectionCandidates(meshset_t *a,
203
203
                                          const face_rtree_t *a_node,
204
 
                                          carve::mesh::MeshSet<3> *b,
 
204
                                          meshset_t *b,
205
205
                                          const face_rtree_t *b_node,
206
206
                                          face_pairs_t &face_pairs,
207
207
                                          bool descend_a = true);
287
287
       * @param[out] out_loops A list of grouped face loops.
288
288
       */
289
289
      void groupFaceLoops(
290
 
        carve::mesh::MeshSet<3> *src,
 
290
        meshset_t *src,
291
291
        FaceLoopList &face_loops,
292
292
        const detail::LoopEdges &loop_edges,
293
293
        const V2Set &no_cross,