Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions python_test/bitSetTest.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
from helper import *

torus = mrmesh.make_components_test_torus(2, 1, 10, 10, None)

components = mrmesh.get_mesh_components_verts(torus, None)

assert(len(components) == 5)
assert(components[0].count() != 0)
comp0Flip = mrmesh.VertBitSet()
comp0Flip |= components[0]
comp0Flip.flip()

assert(comp0Flip.size() == components[0].size())
assert(comp0Flip.count() == (components[0].size() - components[0].count()))

xorRes = comp0Flip ^ components[0]

assert(xorRes.size() == components[0].size())
assert(xorRes.count() == components[0].size())
24 changes: 24 additions & 0 deletions python_test/shrinkExpandTest.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
from helper import *

torus = mrmesh.make_components_test_torus(2, 1, 10, 10, None)

components = mrmesh.get_mesh_components_verts(torus, None)

assert(len(components) == 5)

prevCount = components[0].count()
assert(prevCount != 0)

for v in range(components[0].size()):
if components[0].test(mrmesh.VertId(v)):
components[0].set(mrmesh.VertId(v),False)
break;

assert(components[0].count() == prevCount -1)
prevCount = components[0].count()
mrmesh.shrink_verts(torus.topology,components[0],1)
assert(components[0].count() < prevCount)

prevCount = components[0].count()
mrmesh.expand_verts(torus.topology,components[0],1)
assert(components[0].count() > prevCount)
11 changes: 10 additions & 1 deletion source/mrmeshpy/MRPythonBaseExposing.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ MR_ADD_PYTHON_CUSTOM_DEF( mrmeshpy, BoostBitSet, [] ( pybind11::module_& m )
using type = boost::dynamic_bitset<uint64_t>;
pybind11::class_<type>( m, "BoostBitSet" ).
def( "size", &type::size ).
def( "flip", ( type& ( type::* )( ) )& type::flip, pybind11::return_value_policy::reference ).
def( "count", &type::count );
} )

Expand All @@ -217,7 +218,15 @@ MR_ADD_PYTHON_CUSTOM_DEF( mrmeshpy, name, [] (pybind11::module_& m)\
def( pybind11::init<>() ).\
def( "test", &type::test ).\
def( "resize", &type::resize ).\
def( "set",( type& ( type::* )( type::IndexType, bool ) )& type::set, pybind11::return_value_policy::reference );\
def( "set",( type& ( type::* )( type::IndexType, bool ) )& type::set, pybind11::return_value_policy::reference ).\
def( pybind11::self & pybind11::self ).\
def( pybind11::self | pybind11::self ).\
def( pybind11::self ^ pybind11::self ).\
def( pybind11::self - pybind11::self ).\
def( pybind11::self &= pybind11::self ).\
def( pybind11::self |= pybind11::self ).\
def( pybind11::self ^= pybind11::self ).\
def( pybind11::self -= pybind11::self );\
} )

ADD_PYTHON_BITSET( VertBitSet, MR::VertBitSet )
Expand Down
7 changes: 7 additions & 0 deletions source/mrmeshpy/MRPythonMeshExposing.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include "MRMesh/MRBoolean.h"
#include "MRMesh/MRMeshMetrics.h"
#include "MRMesh/MRMeshBuilder.h"
#include "MRMesh/MRExpandShrink.h"


using namespace MR;
Expand Down Expand Up @@ -41,6 +42,12 @@ MR_ADD_PYTHON_FUNCTION( mrmeshpy, get_selected_mesh, pythonGetSelectedMesh, "get

MR_ADD_PYTHON_FUNCTION( mrmeshpy, set_mesh_to_selected, pythonSetMeshToSelected, "sets mesh to selected ObjectMesh" )

MR_ADD_PYTHON_FUNCTION( mrmeshpy, expand_verts, ( void( * )( const MeshTopology&, VertBitSet&, int ) )& expand, "expand vert bit set" )
MR_ADD_PYTHON_FUNCTION( mrmeshpy, shrink_verts, ( void( * )( const MeshTopology&, VertBitSet&, int ) )& shrink, "shrink vert bit set" )

MR_ADD_PYTHON_FUNCTION( mrmeshpy, expand_faces, ( void( * )( const MeshTopology&, FaceBitSet&, int ) )& expand, "expand face bit set" )
MR_ADD_PYTHON_FUNCTION( mrmeshpy, shrink_faces, ( void( * )( const MeshTopology&, FaceBitSet&, int ) )& shrink, "shrink face bit set" )

MR_ADD_PYTHON_CUSTOM_DEF( mrmeshpy, MeshTopology, [] ( pybind11::module_& m )
{
pybind11::class_<MR::MeshTopology>( m, "MeshTopology" ).
Expand Down