saberbud/q3DMASC
1
0
Fork 0
mirror of https://github.com/dgirardeau/q3DMASC.git synced 2026-08-30 00:50:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Compilation with v2.12

Browse Source
This commit is contained in:
Daniel Girardeau-Montaut
2020-06-04 00:32:27 +02:00
parent 46fae57879
commit 56ce4071ee
24 changed files with 171 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CorePoints.cpp
+5 -5
View File
@@ -28,7 +28,7 @@
using namespace masc;
bool CorePoints::prepare(CCLib::GenericProgressCallback* progressCb/*=nullptr*/)
bool CorePoints::prepare(CCCoreLib::GenericProgressCallback* progressCb/*=nullptr*/)
{
if (!origin)
{
@@ -43,7 +43,7 @@ bool CorePoints::prepare(CCLib::GenericProgressCallback* progressCb/*=nullptr*/)
}
//now we can compute the subsampled version
CCLib::ReferenceCloud* ref = nullptr;
CCCoreLib::ReferenceCloud* ref = nullptr;
switch (selectionMethod)
{
case SPATIAL:
@@ -58,9 +58,9 @@ bool CorePoints::prepare(CCLib::GenericProgressCallback* progressCb/*=nullptr*/)
}
}
CCLib::CloudSamplingTools::SFModulationParams modParams;
CCCoreLib::CloudSamplingTools::SFModulationParams modParams;
modParams.enabled = false;
ref = CCLib::CloudSamplingTools::resampleCloudSpatially(
ref = CCCoreLib::CloudSamplingTools::resampleCloudSpatially(
origin,
static_cast<PointCoordinateType>(selectionParam),
modParams,
@@ -78,7 +78,7 @@ bool CorePoints::prepare(CCLib::GenericProgressCallback* progressCb/*=nullptr*/)
return false;
}
int targetCount = static_cast<int>(origin->size() * selectionParam);
ref = CCLib::CloudSamplingTools::subsampleCloudRandomly(origin, targetCount, progressCb);
ref = CCCoreLib::CloudSamplingTools::subsampleCloudRandomly(origin, targetCount, progressCb);
break;
}