Skip to content

Commit cf0c166

Browse files
authored
Merge pull request #75 from fwilliams/update_numpyeigen
2 parents 2ff54e9 + 0526892 commit cf0c166

27 files changed

+59
-59
lines changed

.vscode/c_cpp_properties.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
"${workspaceFolder}/external/geogram/src/lib",
1616
"${workspaceFolder}/src",
1717
"${workspaceFolder}/external",
18-
"${env:CONDA_PREFIX}/envs/point-cloud-utils/include/python3.9"
18+
"${env:CONDA_PREFIX}/envs/point-cloud-utils/include/python3.10",
19+
"${env:CONDA_PREFIX}/envs/point-cloud-utils/lib/python3.10/site-packages/numpy/core/include/"
1920
],
2021
"macFrameworkPath": [
2122
"${default}"

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ set(EXTERNAL_DEP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external)
3333
include(DownloadExternalDeps)
3434
download_dep(numpyeigen
3535
GIT_REPOSITORY https://github.com/fwilliams/numpyeigen.git
36-
GIT_TAG 70f3f100f23e9fc5888edcfd9ad38312b222c7ea
36+
GIT_TAG master
3737
)
3838
list(APPEND CMAKE_MODULE_PATH ${EXTERNAL_DEP_DIR}/numpyeigen/cmake)
3939
set(CMAKE_POSITION_INDEPENDENT_CODE ON)

point_cloud_utils/_point_cloud_geometry.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,13 @@ def _validate_point_radius_internal(p, r):
4545
def voxel_grid_geometry(ijk, voxel_size=np.array((1., 1., 1.)), voxel_origin=np.array((0., 0., 0.)), gap_fraction=0.0):
4646
"""
4747
Generate a triangle mesh of cubes for voxel coordinates ijk. The [0, 0, 0] voxel has its
48-
bottom-back-left corner at voxel_origin and each voxel has voxel_size.
48+
center at voxel_origin and each voxel has voxel_size.
4949
5050
Args:
5151
ijk np.ndarray: [num_voxels, 3] array of integer voxel coordinates
5252
voxel_size: Float or triple representing the size of each voxel.
5353
Defaults to np.array((1., 1., 1.)).
54-
voxel_origin: Bottom-back-left coordinate of the [0, 0, 0] voxel.
55-
Defaults to np.array((0., 0., 0.)).
54+
voxel_origin: Center coordinate of the [0, 0, 0] voxel. Defaults to np.array((0., 0., 0.)).
5655
gap_fraction: Fraction of a voxel to leave as a gap between voxels (default 0.0)
5756
5857
Returns:

src/closest_point_on_mesh.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Compute distances from a set of points p to a triangle mesh (v, f)
2525
npe_function(closest_points_on_mesh)
2626
npe_arg(p, dense_float, dense_double)
2727
npe_arg(v, npe_matches(p))
28-
npe_arg(f, dense_int, dense_longlong, dense_uint, dense_ulonglong)
28+
npe_arg(f, dense_int32, dense_int64, dense_uint32, dense_uint64)
2929
npe_doc(closest_points_on_mesh_doc)
3030
npe_begin_code()
3131
{

src/connected_components.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Determine the connected components of a mesh
8282
npe_function(connected_components)
8383
npe_doc(connected_components_doc)
8484
npe_arg(v, dense_float, dense_double)
85-
npe_arg(f, dense_int, dense_long, dense_longlong)
85+
npe_arg(f, dense_int32, dense_int64, dense_uint32, dense_uint64)
8686
npe_begin_code()
8787
{
8888
Eigen::SparseMatrix<npe_Scalar_f> A;

src/curvature.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Estimate principal curvature directions and magnitudes for a mesh
4545
)Qu8mg5v7";
4646
npe_function(mesh_principal_curvatures)
4747
npe_arg(v, dense_float, dense_double)
48-
npe_arg(f, dense_int, dense_long, dense_longlong)
48+
npe_arg(f, dense_int32, dense_int64, dense_uint32, dense_uint64)
4949
npe_default_arg(r, double, -1.0)
5050
npe_doc(mesh_principal_curvatures_doc)
5151
npe_begin_code()
@@ -94,7 +94,7 @@ npe_end_code()
9494
//)Qu8mg5v7";
9595
//npe_function(mesh_mean_and_gaussian_curvatures)
9696
//npe_arg(v, dense_float, dense_double)
97-
//npe_arg(f, dense_int, dense_long, dense_longlong)
97+
//npe_arg(f, dense_int32, dense_int64)
9898
//npe_doc(mesh_mean_and_gaussian_curvatures_doc)
9999
//npe_begin_code()
100100
//{
@@ -122,7 +122,7 @@ npe_end_code()
122122
//)Qu8mg5v7";
123123
//npe_function(pointcloud_apss_curvature)
124124
//npe_arg(v, dense_float, dense_double)
125-
//npe_arg(f, dense_int, dense_long, dense_longlong)
125+
//npe_arg(f, dense_int32, dense_int64)
126126
//npe_doc(pointcloud_apss_curvature_doc)
127127
//npe_begin_code()
128128
//{

src/face_areas.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Compute the areas of each face of a triangle mesh
1616
)Qu8mg5v7";
1717
npe_function(mesh_face_areas)
1818
npe_arg(v, dense_float, dense_double)
19-
npe_arg(f, dense_int, dense_long, dense_longlong)
19+
npe_arg(f, dense_int32, dense_int64)
2020
npe_default_arg(num_threads, int, -1)
2121
npe_doc(triangle_mesh_face_areas_doc)
2222
npe_begin_code()

src/fast_winding_numbers.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ at a set of query points
1919
)igl_Qu8mg5v7";
2020
npe_function(triangle_soup_fast_winding_number)
2121
npe_arg(v, dense_float, dense_double)
22-
npe_arg(f, dense_int, dense_long, dense_longlong)
22+
npe_arg(f, dense_int32, dense_int64, dense_uint32, dense_uint64)
2323
npe_arg(p, npe_matches(v))
2424
npe_doc(triangle_soup_fast_winding_number_doc)
2525
npe_begin_code()

src/flood_fill_3d.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ void flood_fill(EigenMat& grid,
5353

5454

5555
npe_function(_flood_fill_3d_internal)
56-
npe_arg(grid, dense_int, dense_long, dense_longlong, dense_float, dense_double)
56+
npe_arg(grid, dense_int32, dense_int64, dense_float, dense_double)
5757
npe_arg(seed_x, int)
5858
npe_arg(seed_y, int)
5959
npe_arg(seed_z, int)

src/lloyd.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ Lloyd's algorithm (https://en.wikipedia.org/wiki/Lloyd%27s_algorithm).
356356

357357
npe_function(sample_mesh_lloyd)
358358
npe_arg(v, dense_float, dense_double)
359-
npe_arg(f, dense_int, dense_long, dense_longlong, dense_uint, dense_ulong, dense_ulonglong)
359+
npe_arg(f, dense_int32, dense_int64, dense_uint32, dense_uint64)
360360
npe_arg(num_samples, int)
361361
npe_default_arg(num_lloyd, int, 10)
362362
npe_default_arg(num_newton, int, 10)

0 commit comments

Comments
 (0)