Skip to content

Commit f6e802d

Browse files
tatsytatsy
authored
Merge pull request #2 from tatsy/dev
v0.2.2 --- * Change Python env manager to Pipenv. * Add methods computing approximated Laplacian-Beltrami operators (adjacent, cotangent, Belkin+2008). * Add IPython notebooks as Pythons examples rather than simple scripts. * Change traversal order of elements around a vertex to counter-clockwise order. * Add heat kernel signature [Sun et al. 2009].
2 parents a18bd28 + 9a96945 commit f6e802d

68 files changed

Lines changed: 3540 additions & 969 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,14 @@ test_config.h
2424

2525
# Python cache files
2626
setup.py
27+
Pipfile.lock
2728
poetry.lock
2829
*.pyc
2930
*.pyd
3031
dist/*
31-
__pycache__/*
32+
__pycache__/
3233
*.egg-info
34+
.ipynb_checkpoints/
3335

3436
# Mesh file format
3537
*.ply

‎.gitmodules‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
[submodule "src/tinymesh/ext/tinyobjloader"]
2-
path = src/tinymesh/ext/tinyobjloader
3-
url = https://github.com/syoyo/tinyobjloader
4-
[submodule "src/tinymesh/ext/tinyply"]
5-
path = src/tinymesh/ext/tinyply
6-
url = https://github.com/ddiakopoulos/tinyply
7-
[submodule "src/tinymesh/ext/eigen"]
8-
path = src/tinymesh/ext/eigen
9-
url = https://gitlab.com/libeigen/eigen.git
1+
[submodule "src/tinymesh/ext/tinyobjloader"]
2+
path = src/tinymesh/ext/tinyobjloader
3+
url = https://github.com/syoyo/tinyobjloader
4+
[submodule "src/tinymesh/ext/tinyply"]
5+
path = src/tinymesh/ext/tinyply
6+
url = https://github.com/ddiakopoulos/tinyply
7+
[submodule "src/tinymesh/ext/eigen"]
8+
path = src/tinymesh/ext/eigen
9+
url = https://gitlab.com/libeigen/eigen.git
10+
[submodule "src/tinymesh/ext/spectra"]
11+
path = src/tinymesh/ext/spectra
12+
url = https://github.com/yixuan/spectra

‎CHANGELOG.md‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
1-
v 0.2.1
1+
v0.2.2
2+
---
3+
* Change Python env manager to Pipenv.
4+
* Add methods computing approximated Laplacian-Beltrami operators (adjacent, cotangent, Belkin+2008).
5+
* Add IPython notebooks as Pythons examples rather than simple scripts.
6+
* Change traversal order of elements around a vertex to counter-clockwise order.
7+
* Add heat kernel signature [Sun et al. 2009].
8+
9+
v0.2.1
210
---
311
* Minor bug fix for GCC v8.
412

5-
v.0.2.0
13+
v0.2.0
614
---
715

816
* Add unit test for each functions (just to check run or not).

‎CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
1+
cmake_minimum_required(VERSION 3.18.0 FATAL_ERROR)
22
project(TinyMesh)
33

44
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
@@ -21,6 +21,7 @@ if (UNIX)
2121
set(CXX_FS_LIBRARY "stdc++fs")
2222
endif()
2323
endif()
24+
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
2425

2526
# ----------
2627
# Common target names

‎Pipfile‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
[[source]]
2+
url = "https://pypi.org/simple"
3+
verify_ssl = true
4+
name = "pypi"
5+
6+
[packages]
7+
numpy = "*"
8+
open3d = "*"
9+
matplotlib = "*"
10+
poetry = "*"
11+
scipy = "*"
12+
13+
[dev-packages]
14+
yapf = "*"
15+
flake8 = "*"
16+
mypy = "*"
17+
isort = "*"
18+
pytest = "*"
19+
jupyterlab = "*"
20+
21+
[requires]
22+
python_version = "3.9"

‎README.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ TinyMesh
77
![Ubuntu CI](https://github.com/tatsy/tinymesh/workflows/Ubuntu%20CI/badge.svg)
88
[![License: MPL 2.0](https://img.shields.io/badge/License-MPL%202.0-brightgreen.svg)](https://opensource.org/licenses/MPL-2.0)
99

10-
> TinyMesh is a light-weight mesh processing library in C/C++
10+
> TinyMesh is a light-weight mesh processing library in C/C++.
11+
12+
[!["Buy Me A Coffee"](https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png)](https://www.buymeacoffee.com/tatsy425)
13+
1114

1215
Modules
1316
---

‎build.py‎

Lines changed: 59 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,59 @@
1-
import re
2-
import pathlib
3-
import platform
4-
5-
from pybind11.setup_helpers import Pybind11Extension
6-
from setuptools.command.build_ext import build_ext
7-
8-
exclude = ['src/tinymesh/ext']
9-
sources = pathlib.Path().glob('src/**/*.cpp')
10-
sources = [str(path).replace('\\', '/') for path in sources]
11-
sources = [path for path in sources if all([not re.search(e, path) for e in exclude])]
12-
13-
include_dirs = [
14-
'src/tinymesh',
15-
'src/tinymesh/ext/tinyobjloader',
16-
'src/tinymesh/ext/tinyply/source',
17-
'src/tinymesh/ext/eigen',
18-
]
19-
20-
extra_compile_args = []
21-
extra_link_args = []
22-
define_macros = [('TINYMESH_PYTHON_MODULE', 1)]
23-
if platform.system() == "Windows":
24-
define_macros.append(('_SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING', 1))
25-
elif platform.system() == "Darwin":
26-
extra_compile_args.extend([
27-
'-std=c++17',
28-
'-mmacosx-version-min=10.15',
29-
])
30-
# extra_link_args.extend([
31-
# '-lstdc++fs',
32-
# ])
33-
else:
34-
extra_compile_args.extend([
35-
'-std=c++17',
36-
])
37-
extra_link_args.extend([
38-
'-lstdc++fs',
39-
])
40-
41-
ext_modules = [
42-
Pybind11Extension('tinymesh',
43-
sources,
44-
language='c++',
45-
include_dirs=include_dirs,
46-
extra_compile_args=extra_compile_args,
47-
extra_link_args=extra_link_args,
48-
define_macros=define_macros)
49-
]
50-
51-
52-
def build(setup_kwargs):
53-
setup_kwargs.update({
54-
'ext_modules': ext_modules,
55-
'cmdclass': {
56-
'build_ext': build_ext
57-
},
58-
})
1+
import re
2+
import pathlib
3+
import platform
4+
5+
from pybind11.setup_helpers import Pybind11Extension
6+
from setuptools.command.build_ext import build_ext
7+
8+
exclude = ['src/tinymesh/ext']
9+
sources = pathlib.Path().glob('src/**/*.cpp')
10+
sources = [str(path).replace('\\', '/') for path in sources]
11+
sources = [path for path in sources if all([not re.search(e, path) for e in exclude])]
12+
13+
include_dirs = [
14+
'src/tinymesh',
15+
'src/tinymesh/ext/tinyobjloader',
16+
'src/tinymesh/ext/tinyply/source',
17+
'src/tinymesh/ext/eigen',
18+
'src/tinymesh/ext/spectra/include',
19+
]
20+
21+
extra_compile_args = []
22+
extra_link_args = []
23+
define_macros = [('TINYMESH_PYTHON_MODULE', 1)]
24+
if platform.system() == "Windows":
25+
define_macros.append(('_SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING', 1))
26+
elif platform.system() == "Darwin":
27+
extra_compile_args.extend([
28+
'-std=c++17',
29+
'-mmacosx-version-min=10.15',
30+
])
31+
# extra_link_args.extend([
32+
# '-lstdc++fs',
33+
# ])
34+
else:
35+
extra_compile_args.extend([
36+
'-std=c++17',
37+
])
38+
extra_link_args.extend([
39+
'-lstdc++fs',
40+
])
41+
42+
ext_modules = [
43+
Pybind11Extension('tinymesh',
44+
sources,
45+
language='c++',
46+
include_dirs=include_dirs,
47+
extra_compile_args=extra_compile_args,
48+
extra_link_args=extra_link_args,
49+
define_macros=define_macros)
50+
]
51+
52+
53+
def build(setup_kwargs):
54+
setup_kwargs.update({
55+
'ext_modules': ext_modules,
56+
'cmdclass': {
57+
'build_ext': build_ext
58+
},
59+
})

‎clang-format.sh‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/bin/bash
2+
3+
EXTS=".cpp .hpp .c .h"
4+
FILES=""
5+
for e in $EXTS; do
6+
NEW=`git ls-files | grep $e\$`
7+
FILES="${FILES} ${NEW}"
8+
done
9+
10+
for f in $FILES; do
11+
echo $f
12+
clang-format -i $f
13+
done
14+

‎data/models/fandisk.ply‎

0 Bytes
Binary file not shown.

‎environment.yaml‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)