Update to latest CC

The main change is the fact that the ScalarField now has an offset
system baked into it, meaning APIs work with double but internally
floats are stored

This has the consequence of making the asArray to convert to a numpy
array view of the scalar field impossible.

As a replacement a custom class has been made, its very incomplete
as it supports only assignments and read bot no operations like
+,-,==, etc.

So now users will be forced to use toArray to copy the values into a
numpy array, work with them then copy back into the scalar field when
needed

Author: tmontaigu

.github/workflows/Build.yml

@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: 'CloudCompare/CloudCompare'
-          ref: dde99864332e10d6bb0da8acb3c16d36d054c2aa
+          ref: 84a7b4916f1cdcd98f3b8f07dcdaf5bfb7b5e542
           submodules: recursive
 
       - name: Clone PythonRuntime
@@ -80,7 +80,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: 'CloudCompare/CloudCompare'
-          ref: dde99864332e10d6bb0da8acb3c16d36d054c2aa
+          ref: 84a7b4916f1cdcd98f3b8f07dcdaf5bfb7b5e542
           submodules: recursive
 
       - name: Clone PythonRuntime
@@ -148,7 +148,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: 'CloudCompare/CloudCompare'
-          ref: dde99864332e10d6bb0da8acb3c16d36d054c2aa
+          ref: 84a7b4916f1cdcd98f3b8f07dcdaf5bfb7b5e542
           submodules: recursive
 
       - name: Clone PythonRuntime
@@ -200,6 +200,9 @@ jobs:
     runs-on: windows-latest
 
     steps:
+      - name: Support longpaths on Windows
+        run: git config --global core.longpaths true
+
       - uses: actions/checkout@v4
 
       - name: Install Miniconda

.github/workflows/Lint.yml

@@ -8,8 +8,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - uses: DoozyX/clang-format-lint-action@v0.14
+    - uses: DoozyX/clang-format-lint-action@v0.18.1
       with:
         source: '.'
         extensions: 'h,cpp'
-        clangFormatVersion: 14
+        clangFormatVersion: 18

src/PythonInterpreter.cpp

@@ -50,7 +50,7 @@ static py::dict CreateGlobals()
     return globals;
 }
 
-PythonInterpreter::State::State() : globals(CreateGlobals()), locals(){};
+PythonInterpreter::State::State() : globals(CreateGlobals()), locals() {};
 
 //================================================================================
 

tests/scripts/auto_segmentation_tools.py

@@ -39,7 +39,7 @@ def test_tribox_overlap():
         cccorelib.CCVector3(0.75, 1.25, 1.0)
     ]
 
-    assert cccorelib.CCMiscTools.TriBoxOverlap(boxCenter, boxHalfSize, triangle)
+    assert cccorelib.CCMiscTools.TriBoxOverlap(boxCenter, boxHalfSize, triangle), "TriBoxOverlap failed"
 
     # TODO: needs CCVector3D to be defined in cccorelib to be uncommented
     # boxCenter = cccorelib.CCVector3d(0, 0, 0)
@@ -59,7 +59,7 @@ def test_connected_components(cloud):
 
     reference_clouds = cccorelib.ReferenceCloudContainer()
     success = cccorelib.AutoSegmentationTools.extractConnectedComponents(cloud, reference_clouds)
-    assert success
+    assert success, "extractConnectedComponents failed"
 
 
 def main():

tests/scripts/cloud.py

@@ -51,7 +51,7 @@ def main():
 
     cloud.setPointScalarValue(17, 42.1337)
     print(cloud.getPointScalarValue(17))
-    assert cloud.getPointScalarValue(17) == float(np.float32(42.1337))
+    assert np.isclose(cloud.getPointScalarValue(17), 42.1337)
 
     p = cloud.getNextPoint()
     assert p.x == point1.x

tests/scripts/normal_distribution.py

@@ -20,5 +20,5 @@
 d.computeParameters(cloud)
 
 d.setParameters(1.1, 0.6)
-assert d.getMu() == float(np.float32(1.1))
-assert d.getSigma2() == float(np.float32(0.6))
+assert d.getMu() == 1.1
+assert d.getSigma2() == 0.6

tests/scripts/scalarfield.py

@@ -1,12 +1,13 @@
 import cccorelib
 import pycc
+import numpy as np
 
 cc = pycc.GetInstance()
 cloud = cc.clouds()[0].pc
 
-assert cccorelib.ScalarFieldTools.computeMeanScalarValue(cloud) == 8204.2490234375
-assert cccorelib.ScalarFieldTools.computeMeanSquareScalarValue(cloud) == 93043936.0
-assert cccorelib.ScalarFieldTools.computeScalarFieldGradient(cloud, 0, False) == 0
+assert np.isclose(cccorelib.ScalarFieldTools.computeMeanScalarValue(cloud), 8204.2490234375)
+assert np.isclose(cccorelib.ScalarFieldTools.computeMeanSquareScalarValue(cloud), 93043936.0)
+assert np.isclose(cccorelib.ScalarFieldTools.computeScalarFieldGradient(cloud, 0, False), 0)
 
 assert cccorelib.ScalarFieldTools.computeScalarFieldExtremas(cloud) == (0, 37522.00)
 assert cccorelib.ScalarFieldTools.countScalarFieldValidValues(cloud) == 10_683

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 ee426c368280aef8dc3e2c418e6a007064280e58
+    GIT_TAG 83732e77561da45b857a8a2ffcd2949e6057a393
   )
 
   FetchContent_GetProperties(CCCoreLib)
@@ -44,7 +44,7 @@ if(CCCORELIB_PYTHON_IS_MASTER_PROJECT OR NOT PLUGIN_PYTHON_USE_EMBEDDED_MODULES)
   find_package(Python 3.8 COMPONENTS Interpreter Development REQUIRED)
   ensure_pybind11_cmake_module_is_in_path()
   find_package(pybind11 CONFIG REQUIRED)
-  
+
   pybind11_add_module(cccorelib ${cccorelib_sources})
   target_link_libraries(cccorelib PRIVATE CCCoreLib)
 

wrapper/cccorelib/src/GenericDistribution.cpp

@@ -51,6 +51,4 @@ void define_GenericDistribution(py::module &cccorelib)
              "Yk"_a,
              "numberOfClasses"_a,
              "histo"_a = nullptr);
-
-    py::bind_vector<CCCoreLib::GenericDistribution::ScalarContainer>(GenericDistribution, "ScalarContainer");
 }