Skip to content

Remove CCShareable / + associated custom holders in favor of std::shared_ptr #184

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
Oct 6, 2026
Merged

Remove CCShareable / + associated custom holders in favor of std::shared_ptr #184

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: 04942bfd61458d9b67b10beb0690dcefdb2debb4
ref: 5d00ea5d4040d9485b0b52c769f0b0aae01de296
submodules: recursive

- name: Clone PythonRuntime
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
uses: actions/checkout@v4
with:
repository: 'CloudCompare/CloudCompare'
ref: 04942bfd61458d9b67b10beb0690dcefdb2debb4
ref: 5d00ea5d4040d9485b0b52c769f0b0aae01de296
submodules: recursive

- name: Clone PythonRuntime
Expand Down Expand Up @@ -149,7 +149,7 @@ jobs:
uses: actions/checkout@v4
with:
repository: 'CloudCompare/CloudCompare'
ref: 04942bfd61458d9b67b10beb0690dcefdb2debb4
ref: 5d00ea5d4040d9485b0b52c769f0b0aae01de296
submodules: recursive

- name: Clone PythonRuntime
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/CodeQL.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
uses: actions/checkout@v4
with:
repository: 'CloudCompare/CloudCompare'
ref: 04942bfd61458d9b67b10beb0690dcefdb2debb4
ref: 5d00ea5d4040d9485b0b52c769f0b0aae01de296
submodules: recursive

- name: Clone PythonRuntime
Expand Down
132 changes: 97 additions & 35 deletions docs/stubfiles/cccorelib.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from typing import Iterable, Iterator, Tuple
from typing import Iterable, Iterator, Tuple, overload

from typing import overload
import numpy

CC_LOCAL_MODEL_MIN_SIZE: int
NAN_VALUE: float
PC_NAN: float
Expand Down Expand Up @@ -75,12 +75,6 @@ class CCMiscTools:
def TriBoxOverlap(self, *args, **kwargs) -> Any: ...
def TriBoxOverlapd(self, *args, **kwargs) -> Any: ...

class CCShareable:
def __init__(self) -> None: ...
def getLinkCount(self) -> int: ...
def link(self) -> None: ...
def release(self) -> None: ...

class CCVector2:
@overload
def __init__(self) -> None: ...
Expand Down Expand Up @@ -194,7 +188,9 @@ class CHAMFER_DISTANCE_TYPE:
class ChamferDistanceTransform(Grid3Dus):
def __init__(self, *args, **kwargs) -> None: ...
def init(self, gridSize: Tuple3ui) -> bool: ...
def propagateDistance(self, type: CHAMFER_DISTANCE_TYPE, progressCb: GenericProgressCallback = ...) -> int: ...
def propagateDistance(
self, type: CHAMFER_DISTANCE_TYPE, progressCb: GenericProgressCallback = ...
) -> int: ...
@property
def MAX_DIST(self) -> Any: ...

Expand All @@ -221,7 +217,9 @@ class Delaunay2dMesh(GenericIndexedMesh):
def Available(self, *args, **kwargs) -> Any: ...
def TesselateContour(self, *args, **kwargs) -> Any: ...
@overload
def buildMesh(self, points2D, std, pointCountToUse: int, outputErrorStr: str) -> bool: ...
def buildMesh(
self, points2D, std, pointCountToUse: int, outputErrorStr: str
) -> bool: ...
@overload
def buildMesh(*args, **kwargs) -> Any: ...
def getAssociatedCloud(self) -> GenericIndexedCloud: ...
Expand All @@ -231,7 +229,9 @@ class Delaunay2dMesh(GenericIndexedMesh):
def getTriangleVertIndexesArray(self, maxEdgeLength: float) -> bool: ...
@overload
def getTriangleVertIndexesArray(*args, **kwargs) -> Any: ...
def linkMeshWith(self, aCloud: GenericIndexedCloud, passOwnership: bool = ...) -> None: ...
def linkMeshWith(
self, aCloud: GenericIndexedCloud, passOwnership: bool = ...
) -> None: ...
def removeOuterTriangles(self, *args, **kwargs) -> Any: ...
@property
def USE_ALL_POINTS(self) -> Any: ...
Expand All @@ -248,7 +248,14 @@ class DgmOctree(GenericOctree):
@overload
def build(self, progressCb: GenericProgressCallback = ...) -> int: ...
@overload
def build(self, octreeMin: CCVector3, octreeMax: CCVector3, pointsMinFilter: CCVector3 = ..., pointsMaxFilter: CCVector3 = ..., progressCb: GenericProgressCallback = ...) -> int: ...
def build(
self,
octreeMin: CCVector3,
octreeMax: CCVector3,
pointsMinFilter: CCVector3 = ...,
pointsMaxFilter: CCVector3 = ...,
progressCb: GenericProgressCallback = ...,
) -> int: ...
@overload
def build(*args, **kwargs) -> Any: ...
def clear(self) -> None: ...
Expand Down Expand Up @@ -299,7 +306,7 @@ class FastMarching:
class GenericCloud:
def __init__(self, *args, **kwargs) -> None: ...
def enableScalarField(self) -> bool: ...
def setPointScalarValues(self, action: Callable[[float],None]) -> None: ...
def setPointScalarValues(self, action: Callable[[float], None]) -> None: ...
def getBoundingBox(self, arg0: CCVector3, arg1: CCVector3) -> None: ...
def getNextPoint(self) -> CCVector3: ...
def getPointScalarValue(self, arg0: int) -> float: ...
Expand All @@ -312,7 +319,9 @@ class GenericCloud:
class GenericDistribution:
ScalarContainer: Any = ...
def __init__(self, *args, **kwargs) -> None: ...
def computeChi2Dist(self, Yk: GenericCloud, numberOfClasses: int, histo: int = ...) -> float: ...
def computeChi2Dist(
self, Yk: GenericCloud, numberOfClasses: int, histo: int = ...
) -> float: ...
@overload
def computeP(self, x: float) -> float: ...
@overload
Expand Down Expand Up @@ -342,7 +351,9 @@ class GenericIndexedMesh(GenericMesh):
def _getTriangle(self, triangleIndex: int) -> GenericTriangle: ...
def getNextTriangleVertIndexes(self) -> VerticesIndexes: ...
def getTriangleVertIndexes(self, triangleIndex: int) -> VerticesIndexes: ...
def getTriangleVertices(self, triangleIndex: int, A: CCVector3, B: CCVector3, C: CCVector3) -> None: ...
def getTriangleVertices(
self, triangleIndex: int, A: CCVector3, B: CCVector3, C: CCVector3
) -> None: ...

class GenericMesh:
def __init__(self, *args, **kwargs) -> None: ...
Expand Down Expand Up @@ -432,25 +443,43 @@ class ICPRegistrationTools(RegistrationTools):

class Jacobi:
@staticmethod
def ComputeEigenValuesAndVectors(matrix: SquareMatrixd, absoluteValues: bool = ..., maxIterationCount: int = ...) -> Tuple[SquareMatrixd, list[float]]: ...
def ComputeEigenValuesAndVectors(
matrix: SquareMatrixd, absoluteValues: bool = ..., maxIterationCount: int = ...
) -> Tuple[SquareMatrixd, list[float]]: ...
@staticmethod
def SortEigenValuesAndVectors(eigenVectors: SquareMatrixd, eigenValues: list[float]) -> Tuple[SquareMatrixd, list[float]]: ...
def SortEigenValuesAndVectors(
eigenVectors: SquareMatrixd, eigenValues: list[float]
) -> Tuple[SquareMatrixd, list[float]]: ...
@staticmethod
def GetEigenVector(eigenVectors: SquareMatrixd, index: int) -> list[float]: ...
@staticmethod
def GetMaxEigenValueAndVector(eigenVectors: SquareMatrixd, eigenValues: list[float]) -> Tuple[float, list[float]]: ...
def GetMaxEigenValueAndVector(
eigenVectors: SquareMatrixd, eigenValues: list[float]
) -> Tuple[float, list[float]]: ...
@staticmethod
def GetMinEigenValueAndVector(eigenVectors: SquareMatrixd, eigenValues: list[float]) -> Tuple[float, list[float]]: ...
def GetMinEigenValueAndVector(
eigenVectors: SquareMatrixd, eigenValues: list[float]
) -> Tuple[float, list[float]]: ...
@staticmethod
def TestEigenVecAndValues(matrix: SquareMatrixd, eigenVectors: SquareMatrixd, eigenValues: list[float]) -> bool: ...
def TestEigenVecAndValues(
matrix: SquareMatrixd, eigenVectors: SquareMatrixd, eigenValues: list[float]
) -> bool: ...

class KDTree:
IndicesVector: Any = ...
def __init__(self) -> None: ...
def buildFromCloud(self, cloud: GenericIndexedCloud, progressCb: GenericProgressCallback = ...) -> bool: ...
def buildFromCloud(
self, cloud: GenericIndexedCloud, progressCb: GenericProgressCallback = ...
) -> bool: ...
def findNearestNeighbour(self, queryPoint: sequence, maxDist: float) -> object: ...
def findPointBelowDistance(self, queryPoint: sequence, maxDist: float) -> bool: ...
def findPointsLyingToDistance(self, queryPoint: sequence, distance: float, tolerance: float, points: KDTree.IndicesVector) -> int: ...
def findPointsLyingToDistance(
self,
queryPoint: sequence,
distance: float,
tolerance: float,
points: KDTree.IndicesVector,
) -> int: ...
def getAssociatedCloud(self) -> GenericIndexedCloud: ...

class KMeanClass:
Expand Down Expand Up @@ -490,7 +519,9 @@ class LOCAL_MODEL_TYPES:

class LocalModel:
def __init__(self, *args, **kwargs) -> None: ...
def computeDistanceFromModelToPoint(self, P: CCVector3, nearestPoint: CCVector3 = ...) -> float: ...
def computeDistanceFromModelToPoint(
self, P: CCVector3, nearestPoint: CCVector3 = ...
) -> float: ...
def getCenter(self) -> CCVector3: ...
def getSquareSize(self) -> float: ...
def getType(self) -> LOCAL_MODEL_TYPES: ...
Expand Down Expand Up @@ -521,7 +552,9 @@ class MeshSamplingTools:
@staticmethod
def flagMeshVerticesByType(mesh: GenericIndexedMesh, flags: ScalarField) -> Any: ...
@staticmethod
def samplePointsOnMesh(mesh: GenericMesh, *args, **kwargs) -> Tuple[PointCloud, list[int]]: ...
def samplePointsOnMesh(
mesh: GenericMesh, *args, **kwargs
) -> Tuple[PointCloud, list[int]]: ...

class Neighbourhood:
GeomElement: Any = ...
Expand Down Expand Up @@ -563,7 +596,9 @@ class Neighbourhood:
def computeFeature(self, feature: Any) -> float: ...
def computeLargestRadius(self) -> float: ...
def computeMomentOrder1(self, P: CCVector3) -> float: ...
def computeRoughness(self, P: CCVector3, roughnessUpDir: CCVector3 = ...) -> float: ...
def computeRoughness(
self, P: CCVector3, roughnessUpDir: CCVector3 = ...
) -> float: ...
def getGravityCenter(self) -> Any: ...
def getLSPlane(self) -> Any: ...
def getLSPlaneNormal(self) -> Any: ...
Expand All @@ -574,8 +609,12 @@ class Neighbourhood:
def reset(self) -> None: ...
def setGravityCenter(self, G: CCVector3) -> None: ...
def setLSPlane(self, *args, **kwargs) -> None: ...
def triangulateFromQuadric(self, stepsX: int, stepsY: int) -> GenericIndexedMesh: ...
def triangulateOnPlane(self, duplicateVertices: bool, maxEdgeLength: float) -> Any: ...
def triangulateFromQuadric(
self, stepsX: int, stepsY: int
) -> GenericIndexedMesh: ...
def triangulateOnPlane(
self, duplicateVertices: bool, maxEdgeLength: float
) -> Any: ...

class NormalDistribution(GenericDistribution):
@overload
Expand All @@ -585,17 +624,29 @@ class NormalDistribution(GenericDistribution):
@overload
def __init__(*args, **kwargs) -> Any: ...
def computeParameters(self, cloud: GenericCloud) -> bool: ...
def computeRobustParameters(self, values: GenericDistribution.ScalarContainer, nSigma: float) -> bool: ...
def computeRobustParameters(
self, values: GenericDistribution.ScalarContainer, nSigma: float
) -> bool: ...
def getMu(self) -> float: ...
def getParameters(self) -> Tuple[float,float]: ...
def getParameters(self) -> Tuple[float, float]: ...
def getSigma2(self) -> float: ...
def setParameters(self, _mu: float, _sigma2: float) -> bool: ...

class NormalizedProgress:
def __init__(self, callback: GenericProgressCallback, totalSteps: int, totalPercentage: int = ...) -> None: ...
def __init__(
self,
callback: GenericProgressCallback,
totalSteps: int,
totalPercentage: int = ...,
) -> None: ...
def oneStep(self) -> bool: ...
def reset(self) -> None: ...
def scale(self, totalSteps: int, totalPercentage: int = ..., updateCurrentProgress: bool = ...) -> None: ...
def scale(
self,
totalSteps: int,
totalPercentage: int = ...,
updateCurrentProgress: bool = ...,
) -> None: ...
def steps(self, arg0: int) -> bool: ...

class NumpyCloud(GenericIndexedCloud):
Expand Down Expand Up @@ -707,7 +758,7 @@ class RegistrationTools:
def __init__(self, *args, **kwargs) -> None: ...
def FilterTransformation(self, *args, **kwargs) -> Any: ...

class ScalarField(CCShareable):
class ScalarField:
def __init__(self, name: str) -> None: ...
def NaN(self, *args, **kwargs) -> Any: ...
def ValidValue(self, *args, **kwargs) -> Any: ...
Expand All @@ -727,7 +778,9 @@ class ScalarField(CCShareable):
def invert(self) -> None: ...
def reserveSafe(self, count: int) -> bool: ...
def resetOffset(self) -> None: ...
def resizeSafe(self, count: int, initNewElements: bool = ..., valueForNewElements: float = ...) -> bool: ...
def resizeSafe(
self, count: int, initNewElements: bool = ..., valueForNewElements: float = ...
) -> bool: ...
def setLocalValue(self, index: int, value: float) -> None: ...
def setName(self, arg0: str) -> None: ...
def setOffset(self, offset: float) -> None: ...
Expand All @@ -751,7 +804,9 @@ class ScalarFieldTools:
def multiplyScalarFields(self, *args, **kwargs) -> Any: ...

class SimpleMesh(GenericIndexedMesh):
def __init__(self, theVertices: GenericIndexedCloud, linkVerticesWithMesh: bool = ...) -> None: ...
def __init__(
self, theVertices: GenericIndexedCloud, linkVerticesWithMesh: bool = ...
) -> None: ...
def addTriangle(self, i1: int, i2: int, i3: int) -> None: ...
def capacity(self) -> int: ...
def clear(self) -> None: ...
Expand Down Expand Up @@ -849,7 +904,14 @@ class TrueKdTree:
Node: Any = ...
def __init__(self, cloud: GenericIndexedCloudPersist) -> None: ...
def associatedCloud(self) -> GenericIndexedCloudPersist: ...
def build(self, maxError: float, errorMeasure: DistanceComputationTools.ERRPOR_MEASURES = ..., minPointCountPerCell: int = ..., maxPointCountPerCell: int = ..., progressCb: GenericProgressCallback = ...) -> bool: ...
def build(
self,
maxError: float,
errorMeasure: DistanceComputationTools.ERRPOR_MEASURES = ...,
minPointCountPerCell: int = ...,
maxPointCountPerCell: int = ...,
progressCb: GenericProgressCallback = ...,
) -> bool: ...
def clear(self) -> None: ...
def getLeaves(self, leaves: TrueKdTree.LeafVector) -> bool: ...
def getMaxErrorType(self) -> DistanceComputationTools.ERRPOR_MEASURES: ...
Expand Down
Loading
Loading