Commit 5d67bbca authored by Philip Trettner's avatar Philip Trettner
Browse files

Merge branch 'develop' of https://www.graphics.rwth-aachen.de:9000/ptrettner/polymesh into develop

parents dc4e56ab 9a856150
#pragma once
#include <polymesh/Mesh.hh>
#include <polymesh/properties.hh>
#include <polymesh/detail/delaunay.hh>
#include <polymesh/properties.hh>
namespace polymesh
{
......
......@@ -6,5 +6,4 @@
namespace polymesh
{
}
......@@ -6,8 +6,8 @@
#include <polymesh/Mesh.hh>
#include <polymesh/fields.hh>
#include "components.hh"
#include <polymesh/properties.hh>
#include "components.hh"
namespace polymesh
{
......
......@@ -2,8 +2,8 @@
#include <polymesh/Mesh.hh>
namespace polymesh {
namespace polymesh
{
/// Performs a loop subdivision step (topology only)
void subdivide_loop(Mesh& m);
......
......@@ -8,7 +8,7 @@ namespace polymesh
namespace detail
{
// from https://en.wikipedia.org/wiki/Xorshift
inline uint64_t xorshift64star(uint64_t &state)
inline uint64_t xorshift64star(uint64_t& state)
{
uint64_t x = state; /* The state must be seeded with a nonzero value. */
x ^= x >> 12; // a
......
......@@ -5,46 +5,46 @@
namespace polymesh
{
// primitive::capacity
inline int primitive<vertex_tag>::capacity(Mesh const &m) { return low_level_api(m).capacity_vertices(); }
inline int primitive<face_tag>::capacity(Mesh const &m) { return low_level_api(m).capacity_faces(); }
inline int primitive<edge_tag>::capacity(Mesh const &m) { return low_level_api(m).capacity_halfedges() >> 1; }
inline int primitive<halfedge_tag>::capacity(Mesh const &m) { return low_level_api(m).capacity_halfedges(); }
inline int primitive<vertex_tag>::capacity(Mesh const& m) { return low_level_api(m).capacity_vertices(); }
inline int primitive<face_tag>::capacity(Mesh const& m) { return low_level_api(m).capacity_faces(); }
inline int primitive<edge_tag>::capacity(Mesh const& m) { return low_level_api(m).capacity_halfedges() >> 1; }
inline int primitive<halfedge_tag>::capacity(Mesh const& m) { return low_level_api(m).capacity_halfedges(); }
// primitive::all_size
inline int primitive<vertex_tag>::all_size(Mesh const &m) { return low_level_api(m).size_all_vertices(); }
inline int primitive<face_tag>::all_size(Mesh const &m) { return low_level_api(m).size_all_faces(); }
inline int primitive<edge_tag>::all_size(Mesh const &m) { return low_level_api(m).size_all_edges(); }
inline int primitive<halfedge_tag>::all_size(Mesh const &m) { return low_level_api(m).size_all_halfedges(); }
inline int primitive<vertex_tag>::all_size(Mesh const& m) { return low_level_api(m).size_all_vertices(); }
inline int primitive<face_tag>::all_size(Mesh const& m) { return low_level_api(m).size_all_faces(); }
inline int primitive<edge_tag>::all_size(Mesh const& m) { return low_level_api(m).size_all_edges(); }
inline int primitive<halfedge_tag>::all_size(Mesh const& m) { return low_level_api(m).size_all_halfedges(); }
// primitive::valid_size
inline int primitive<vertex_tag>::valid_size(Mesh const &m) { return low_level_api(m).size_valid_vertices(); }
inline int primitive<face_tag>::valid_size(Mesh const &m) { return low_level_api(m).size_valid_faces(); }
inline int primitive<edge_tag>::valid_size(Mesh const &m) { return low_level_api(m).size_valid_edges(); }
inline int primitive<halfedge_tag>::valid_size(Mesh const &m) { return low_level_api(m).size_valid_halfedges(); }
inline int primitive<vertex_tag>::valid_size(Mesh const& m) { return low_level_api(m).size_valid_vertices(); }
inline int primitive<face_tag>::valid_size(Mesh const& m) { return low_level_api(m).size_valid_faces(); }
inline int primitive<edge_tag>::valid_size(Mesh const& m) { return low_level_api(m).size_valid_edges(); }
inline int primitive<halfedge_tag>::valid_size(Mesh const& m) { return low_level_api(m).size_valid_halfedges(); }
// primitive::reserve
inline void primitive<vertex_tag>::reserve(Mesh &m, int capacity) { low_level_api(m).reserve_vertices(capacity); }
inline void primitive<face_tag>::reserve(Mesh &m, int capacity) { low_level_api(m).reserve_faces(capacity); }
inline void primitive<edge_tag>::reserve(Mesh &m, int capacity) { low_level_api(m).reserve_edges(capacity); }
inline void primitive<halfedge_tag>::reserve(Mesh &m, int capacity) { low_level_api(m).reserve_halfedges(capacity); }
inline void primitive<vertex_tag>::reserve(Mesh& m, int capacity) { low_level_api(m).reserve_vertices(capacity); }
inline void primitive<face_tag>::reserve(Mesh& m, int capacity) { low_level_api(m).reserve_faces(capacity); }
inline void primitive<edge_tag>::reserve(Mesh& m, int capacity) { low_level_api(m).reserve_edges(capacity); }
inline void primitive<halfedge_tag>::reserve(Mesh& m, int capacity) { low_level_api(m).reserve_halfedges(capacity); }
// primitive::all_collection_of
inline all_vertex_collection primitive<vertex_tag>::all_collection_of(Mesh &m) { return m.all_vertices(); }
inline all_vertex_const_collection primitive<vertex_tag>::all_collection_of(const Mesh &m) { return m.all_vertices(); }
inline all_face_collection primitive<face_tag>::all_collection_of(Mesh &m) { return m.all_faces(); }
inline all_face_const_collection primitive<face_tag>::all_collection_of(const Mesh &m) { return m.all_faces(); }
inline all_edge_collection primitive<edge_tag>::all_collection_of(Mesh &m) { return m.all_edges(); }
inline all_edge_const_collection primitive<edge_tag>::all_collection_of(const Mesh &m) { return m.all_edges(); }
inline all_halfedge_collection primitive<halfedge_tag>::all_collection_of(Mesh &m) { return m.all_halfedges(); }
inline all_halfedge_const_collection primitive<halfedge_tag>::all_collection_of(const Mesh &m) { return m.all_halfedges(); }
inline all_vertex_collection primitive<vertex_tag>::all_collection_of(Mesh& m) { return m.all_vertices(); }
inline all_vertex_const_collection primitive<vertex_tag>::all_collection_of(const Mesh& m) { return m.all_vertices(); }
inline all_face_collection primitive<face_tag>::all_collection_of(Mesh& m) { return m.all_faces(); }
inline all_face_const_collection primitive<face_tag>::all_collection_of(const Mesh& m) { return m.all_faces(); }
inline all_edge_collection primitive<edge_tag>::all_collection_of(Mesh& m) { return m.all_edges(); }
inline all_edge_const_collection primitive<edge_tag>::all_collection_of(const Mesh& m) { return m.all_edges(); }
inline all_halfedge_collection primitive<halfedge_tag>::all_collection_of(Mesh& m) { return m.all_halfedges(); }
inline all_halfedge_const_collection primitive<halfedge_tag>::all_collection_of(const Mesh& m) { return m.all_halfedges(); }
// primitive::valid_collection_of
inline valid_vertex_collection primitive<vertex_tag>::valid_collection_of(Mesh &m) { return m.vertices(); }
inline valid_vertex_const_collection primitive<vertex_tag>::valid_collection_of(const Mesh &m) { return m.vertices(); }
inline valid_face_collection primitive<face_tag>::valid_collection_of(Mesh &m) { return m.faces(); }
inline valid_face_const_collection primitive<face_tag>::valid_collection_of(const Mesh &m) { return m.faces(); }
inline valid_edge_collection primitive<edge_tag>::valid_collection_of(Mesh &m) { return m.edges(); }
inline valid_edge_const_collection primitive<edge_tag>::valid_collection_of(const Mesh &m) { return m.edges(); }
inline valid_halfedge_collection primitive<halfedge_tag>::valid_collection_of(Mesh &m) { return m.halfedges(); }
inline valid_halfedge_const_collection primitive<halfedge_tag>::valid_collection_of(const Mesh &m) { return m.halfedges(); }
inline valid_vertex_collection primitive<vertex_tag>::valid_collection_of(Mesh& m) { return m.vertices(); }
inline valid_vertex_const_collection primitive<vertex_tag>::valid_collection_of(const Mesh& m) { return m.vertices(); }
inline valid_face_collection primitive<face_tag>::valid_collection_of(Mesh& m) { return m.faces(); }
inline valid_face_const_collection primitive<face_tag>::valid_collection_of(const Mesh& m) { return m.faces(); }
inline valid_edge_collection primitive<edge_tag>::valid_collection_of(Mesh& m) { return m.edges(); }
inline valid_edge_const_collection primitive<edge_tag>::valid_collection_of(const Mesh& m) { return m.edges(); }
inline valid_halfedge_collection primitive<halfedge_tag>::valid_collection_of(Mesh& m) { return m.halfedges(); }
inline valid_halfedge_const_collection primitive<halfedge_tag>::valid_collection_of(const Mesh& m) { return m.halfedges(); }
}
......@@ -55,8 +55,8 @@
#define POLYMESH_DETAIL_MACRO_JOIN(arg1, arg2) arg1##arg2
#define POLYMESH_MACRO_JOIN(arg1, arg2) POLYMESH_DETAIL_MACRO_JOIN(arg1, arg2)
#define POLYMESH_UNUSED(expr) \
do \
{ \
void(sizeof(bool((expr)))); \
#define POLYMESH_UNUSED(expr) \
do \
{ \
void(sizeof(bool((expr)))); \
} while (false) // force ;
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