Add unit tests for Python codes.

Author: tatsy

.gitignore

@@ -1,21 +1,31 @@
+# IDE
 .idea/*
+.vscode/*
+build/*
 cmake-build-debug/*
 cmake-build-release/*
 Testing/*
 
-build/*
-
 *.TMP
 .DS_Store
 
 test_config.h
 
+# C/C++ libraries
 *.a
 *.so
 *.lib
 *.dll
-*.pyd
 *.dylib
 
+# Python cache files
+*.pyc
+*.pyd
+__pycache__/*
+
+
+# Mesh file format
 *.ply
 *.obj
+*.off
+*.stl

CMakeLists.txt

@@ -16,7 +16,7 @@ option(BUILD_TESTS "Build unit tests." OFF)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 if (UNIX)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -Wall")
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -g -O2")
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -O0")
     if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
@@ -31,7 +31,7 @@ endif()
 # ----------
 set(TINYMESH_LIBRARY "tinymesh")
 set(TINYMESH_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/src")
-set(TINYMESH_PYTHON_MODULE "pytinymesh")
+set(TINYMESH_PYTHON_MODULE "tinymesh-python")
 
 # ----------
 # Required packages

README.md

@@ -29,7 +29,7 @@ Here is the list of modules and reference papers for that.
 
 * [Eigen 3.x](http://eigen.tuxfamily.org/index.php)
 
-### Build
+### C++ Library and Examples
 
 You can build a shared library and all the examples by `CMake` with the following commands.
 
@@ -40,13 +40,38 @@ $ mkdir build && cd build
 $ cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=ON ..
 $ cmake --build . --config Release --parallel 2
 ```
+#### Run examples
 
-### Examples
+```shell
+$ ./build/bin/example_simplify data/models/bunny.ply
+```
+
+### Python module
+
+By the following shell command, you can build the module, which will be placed on the root of this repo.
 
 ```shell
-$ ./build/bin/example data/models/bunny.ply
+$ python setup.py build_ext -i
 ```
 
+Otherwise, you can build the module also using `CMake`.
+
+```shell
+$ mkdir build && cd build
+$ cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_PYTHON_MODULE=ON ..
+$ cmake --build . --config Release --parallel 2
+```
+
+#### Run examples
+
+```shell
+$ python examples/python/fill_and_fair.py data/models/bunny.ply
+```
+
+## Screen shots
+
+
+
 ## License
 
-Mozilla Public License v2 (c) Tatsuya Yatagawa 2019
+Mozilla Public License v2 (c) Tatsuya Yatagawa 2020

data/.gitignore

@@ -1,3 +1,6 @@
-!models/*.ply
-!models/*.obj
+!models/bunny.ply
+!models/box.obj
+!models/plane.obj
+!models/sphere.obj
+!models/torus.obj
 

environment.yml

@@ -0,0 +1,8 @@
+name: tinymesh
+channels:
+  - conda-forge
+dependencies:
+  - numpy
+  - nose
+  - matplotlib
+  - conda-forge::plyfile

examples/python/construct.py

@@ -2,24 +2,36 @@
 import sys
 from plyfile import PlyData, PlyElement
 import numpy as np
-from pytinymesh import Mesh
+from tinymesh import Mesh
 
-def main(filename):
-    # Construct a simple tetrahedron
-    a = np.asarray([[0, 0, 0], [1, 0, 0], [0, 1, 0], [0, 0, 1]], dtype='double')
-    b = np.asarray([0, 1, 2, 0, 2, 3, 0, 3, 1, 3, 2, 1], dtype='uint32')
-    mesh = Mesh(a, b)
-    mesh.save('tetra.ply')
 
-    # Load .PLY with "plyfile" and construct a mesh by "tinymesh"
+def main(filename):
+    # Load .PLY with "plyfile"
     plydata = PlyData.read(filename)
     vx = plydata['vertex']['x']
     vy = plydata['vertex']['y']
     vz = plydata['vertex']['z']
     verts = np.stack([vx, vy, vz], axis=1).astype('double')
-    elems = np.concatenate(plydata['face']['vertex_indices']).astype('uint32')
-    mesh = Mesh(verts, elems)
-    mesh.save('output.ply')
+    faces = np.concatenate(plydata['face']['vertex_indices']).astype('uint32')
+
+    # Construct halfedge structure by "tinymesh"
+    mesh = Mesh(verts, faces)
+
+    # Get vertices and indices back to Python
+    verts = mesh.get_vertices()
+    faces = mesh.get_vertex_indices()
+
+    verts = np.asarray(verts, dtype='float32')
+    faces = np.asarray(faces, dtype='int32').reshape((-1, 3))
+
+    vert_el = np.array([tuple(v) for v in verts], dtype=[('x', 'f4'), ('y', 'f4'), ('z', 'f4')])
+    face_el = np.array([(tuple(f),) for f in faces], dtype=[('vertex_indices', 'i4', (3,))])
+    plydata = PlyData([PlyElement.describe(vert_el, 'vertex'),
+                       PlyElement.describe(face_el, 'face')], text=False)
+
+    base, ext = os.path.splitext(filename)
+    outfile = base + "_copy" + ext
+    plydata.write(outfile)
 
 
 if __name__ == '__main__':

examples/python/fill_and_fair.py

@@ -1,6 +1,6 @@
 import os
 import sys
-from pytinymesh import Mesh, hole_fill, remesh_incremental
+from tinymesh import Mesh, hole_fill, remesh_incremental
 
 
 def main(filename):

examples/simplify/main.cpp

@@ -18,8 +18,8 @@ int main(int argc, char **argv) {
 
     // Simplify
     const int target = (int)(ratio * mesh.num_vertices());
-    tinymesh::simplifyIncremental(mesh, target);
     tinymesh::hole_fill(mesh);
+    tinymesh::simplifyIncremental(mesh, target);
     tinymesh::remeshIncremental(mesh);
 
     // Save

setup.py

@@ -64,13 +64,14 @@ def build_extension(self, ext):
         subprocess.check_call(['cmake', ext.sourcedir] + cmake_args, cwd=self.build_temp, env=env)
         subprocess.check_call(['cmake', '--build', '.'] + build_args, cwd=self.build_temp)
 
+
 setup(
-    name='pytinymesh',
+    name='tinymesh',
     version='0.1.0',
     author='Tatsuya Yatagawa',
     author_email='[email protected]',
     description='TinyMesh is a light-weight mesh processing library',
     long_description='',
-    ext_modules=[CMakeExtension('pytinymesh')],
+    ext_modules=[CMakeExtension('tinymesh')],
     cmdclass=dict(build_ext=CMakeBuild)
 )

src/CMakeLists.txt

@@ -9,5 +9,6 @@ if (BUILD_PYTHON_MODULE)
     include_directories(${CMAKE_CURRENT_LIST_DIR}/tinymesh/ext/pybind11)
     add_subdirectory(tinymesh/ext/pybind11)
     pybind11_add_module(${TINYMESH_PYTHON_MODULE} pybind11.cpp)
+    set_target_properties(${TINYMESH_PYTHON_MODULE} PROPERTIES OUTPUT_NAME "tinymesh")
     target_link_libraries(${TINYMESH_PYTHON_MODULE} PRIVATE ${TINYMESH_LIBRARY})
 endif()