Skip to content

Sync CC/CCCore git hashes #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tmontaigu merged 1 commit into from
Aug 27, 2026
Merged

Sync CC/CCCore git hashes #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions .github/workflows/Build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: actions/checkout@v4
with:
repository: 'CloudCompare/CloudCompare'
ref: 4024ed1e288dcf0d35e13d3f46cf9c8522724854
ref: be1fdb0fd05ec42d6922d7f18b22aab71c168ad6
submodules: recursive

- name: Clone PythonRuntime
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
uses: actions/checkout@v4
with:
repository: 'CloudCompare/CloudCompare'
ref: 4024ed1e288dcf0d35e13d3f46cf9c8522724854
ref: be1fdb0fd05ec42d6922d7f18b22aab71c168ad6
submodules: recursive

- name: Clone PythonRuntime
Expand Down Expand Up @@ -149,7 +149,7 @@ jobs:
uses: actions/checkout@v4
with:
repository: 'CloudCompare/CloudCompare'
ref: 4024ed1e288dcf0d35e13d3f46cf9c8522724854
ref: be1fdb0fd05ec42d6922d7f18b22aab71c168ad6
submodules: recursive

- name: Clone PythonRuntime
Expand Down
2 changes: 1 addition & 1 deletion wrapper/cccorelib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 4 additions & 2 deletions wrapper/cccorelib/src/CloudSamplingTools.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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);
}
2 changes: 2 additions & 0 deletions wrapper/cccorelib/src/Neighbourhood.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions wrapper/cccorelib/src/RegistrationTools.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion wrapper/pycc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
Loading