diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 0b3208e..2e1b054 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -17,7 +17,7 @@ jobs: uses: actions/checkout@v4 with: repository: 'CloudCompare/CloudCompare' - ref: 4024ed1e288dcf0d35e13d3f46cf9c8522724854 + ref: be1fdb0fd05ec42d6922d7f18b22aab71c168ad6 submodules: recursive - name: Clone PythonRuntime @@ -80,7 +80,7 @@ jobs: uses: actions/checkout@v4 with: repository: 'CloudCompare/CloudCompare' - ref: 4024ed1e288dcf0d35e13d3f46cf9c8522724854 + ref: be1fdb0fd05ec42d6922d7f18b22aab71c168ad6 submodules: recursive - name: Clone PythonRuntime @@ -149,7 +149,7 @@ jobs: uses: actions/checkout@v4 with: repository: 'CloudCompare/CloudCompare' - ref: 4024ed1e288dcf0d35e13d3f46cf9c8522724854 + ref: be1fdb0fd05ec42d6922d7f18b22aab71c168ad6 submodules: recursive - name: Clone PythonRuntime diff --git a/wrapper/cccorelib/CMakeLists.txt b/wrapper/cccorelib/CMakeLists.txt index 37e14d8..55810ea 100644 --- a/wrapper/cccorelib/CMakeLists.txt +++ b/wrapper/cccorelib/CMakeLists.txt @@ -25,7 +25,7 @@ if(CCCORELIB_PYTHON_IS_MASTER_PROJECT) GIT_REPOSITORY https://github.com/CloudCompare/CCCoreLib GIT_PROGRESS ON GIT_SHALLOW OFF - GIT_TAG 4095bea6552096cb528c3b8b5cb9505df2aa6002 + GIT_TAG 623f09efd65dbeef0f06830ff9b9bbb7cc07142c ) FetchContent_GetProperties(CCCoreLib) diff --git a/wrapper/cccorelib/src/CloudSamplingTools.cpp b/wrapper/cccorelib/src/CloudSamplingTools.cpp index 14885d0..e26a6f8 100644 --- a/wrapper/cccorelib/src/CloudSamplingTools.cpp +++ b/wrapper/cccorelib/src/CloudSamplingTools.cpp @@ -104,7 +104,8 @@ void define_CloudSamplingTools(py::module &cccorelib) "knn"_a = 6, "nSigma"_a = 1.0, "octree"_a = nullptr, - "progressCb"_a = nullptr); + "progressCb"_a = nullptr, + "maxThreadCount"_a = 0); CloudSamplingTools.def_static("noiseFilter", &CCCoreLib::CloudSamplingTools::noiseFilter, @@ -117,5 +118,6 @@ void define_CloudSamplingTools(py::module &cccorelib) "useAbsoluteError"_a = true, "absoluteError"_a = true, "octree"_a = nullptr, - "progressCb"_a = nullptr); + "progressCb"_a = nullptr, + "maxThreadCount"_a = 0); } diff --git a/wrapper/cccorelib/src/Neighbourhood.cpp b/wrapper/cccorelib/src/Neighbourhood.cpp index c913b9f..1594e5e 100644 --- a/wrapper/cccorelib/src/Neighbourhood.cpp +++ b/wrapper/cccorelib/src/Neighbourhood.cpp @@ -74,6 +74,8 @@ Typically suited to handle "nearest neighbours" of a point in a cloud. .value("EigenValue1", Neighbourhood::EigenValue1) .value("EigenValue2", Neighbourhood::EigenValue2) .value("EigenValue3", Neighbourhood::EigenValue3) + .value("DegreeOfPlanarity", Neighbourhood::DegreeOfPlanarity) + .value("DegreeOfLinearity", Neighbourhood::DegreeOfLinearity) .export_values(); PyNeighbourhood.attr("IGNORE_MAX_EDGE_LENGTH") = Neighbourhood::IGNORE_MAX_EDGE_LENGTH; diff --git a/wrapper/cccorelib/src/RegistrationTools.cpp b/wrapper/cccorelib/src/RegistrationTools.cpp index 7f5d32b..eb2d8c1 100644 --- a/wrapper/cccorelib/src/RegistrationTools.cpp +++ b/wrapper/cccorelib/src/RegistrationTools.cpp @@ -110,6 +110,8 @@ void define_RegistrationTools(py::module &cccorelib) .def_readwrite("minRMSDecrease", &CCCoreLib::ICPRegistrationTools::Parameters::minRMSDecrease) .def_readwrite("nbMaxIterations", &CCCoreLib::ICPRegistrationTools::Parameters::nbMaxIterations) .def_readwrite("adjustScale", &CCCoreLib::ICPRegistrationTools::Parameters::adjustScale) + .def_readwrite("minScale", &CCCoreLib::ICPRegistrationTools::Parameters::minScale) + .def_readwrite("maxScale", &CCCoreLib::ICPRegistrationTools::Parameters::maxScale) .def_readwrite("filterOutFarthestPoints", &CCCoreLib::ICPRegistrationTools::Parameters::filterOutFarthestPoints) .def_readwrite("samplingLimit", &CCCoreLib::ICPRegistrationTools::Parameters::samplingLimit) diff --git a/wrapper/pycc/CMakeLists.txt b/wrapper/pycc/CMakeLists.txt index 7788325..3c964fe 100644 --- a/wrapper/pycc/CMakeLists.txt +++ b/wrapper/pycc/CMakeLists.txt @@ -31,7 +31,7 @@ if(PYCC_IS_MASTER_PROJECT) GIT_REPOSITORY https://github.com/CloudCompare/CloudCompare GIT_SUBMODULES "libs/qCC_db/extern/CCCoreLib;libs/CCAppCommon/QDarkStyleSheet;plugins/core/IO/MeshIO;" GIT_PROGRESS ON - GIT_TAG 4024ed1e288dcf0d35e13d3f46cf9c8522724854 + GIT_TAG be1fdb0fd05ec42d6922d7f18b22aab71c168ad6 GIT_SHALLOW OFF GIT_SUBMODULES )