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
FeaturesInterface.cpp
+6 -6
View File
@@ -25,7 +25,7 @@
using namespace masc;
CCLib::ScalarField* Feature::PrepareSF(ccPointCloud* cloud, const char* resultSFName, SFCollector* generatedScalarFields/*=nullptr*/, SFCollector::Behavior behavior/*=SFCollector::CAN_REMOVE*/)
CCCoreLib::ScalarField* Feature::PrepareSF(ccPointCloud* cloud, const char* resultSFName, SFCollector* generatedScalarFields/*=nullptr*/, SFCollector::Behavior behavior/*=SFCollector::CAN_REMOVE*/)
{
if (!cloud || !resultSFName)
{
@@ -34,7 +34,7 @@ CCLib::ScalarField* Feature::PrepareSF(ccPointCloud* cloud, const char* resultSF
return nullptr;
}
CCLib::ScalarField* resultSF = nullptr;
CCCoreLib::ScalarField* resultSF = nullptr;
int sfIdx = cloud->getScalarFieldIndexByName(resultSFName);
if (sfIdx >= 0)
{
@@ -62,14 +62,14 @@ CCLib::ScalarField* Feature::PrepareSF(ccPointCloud* cloud, const char* resultSF
}
assert(resultSF);
resultSF->fill(NAN_VALUE);
resultSF->fill(CCCoreLib::NAN_VALUE);
return resultSF;
}
ScalarType Feature::PerformMathOp(double s1, double s2, Operation op)
{
ScalarType s = NAN_VALUE;
ScalarType s = CCCoreLib::NAN_VALUE;
switch (op)
{
case Feature::MINUS:
@@ -92,7 +92,7 @@ ScalarType Feature::PerformMathOp(double s1, double s2, Operation op)
return s;
}
bool Feature::PerformMathOp(CCLib::ScalarField* sf1, const CCLib::ScalarField* sf2, Feature::Operation op)
bool Feature::PerformMathOp(CCCoreLib::ScalarField* sf1, const CCCoreLib::ScalarField* sf2, Feature::Operation op)
{
if (!sf1 || !sf2 || sf1->size() != sf2->size() || op == Feature::NO_OPERATION)
{
@@ -113,7 +113,7 @@ bool Feature::PerformMathOp(CCLib::ScalarField* sf1, const CCLib::ScalarField* s
return true;
}
bool Feature::PerformMathOp(const IScalarFieldWrapper& sf1, const IScalarFieldWrapper& sf2, Operation op, CCLib::ScalarField* outSF)
bool Feature::PerformMathOp(const IScalarFieldWrapper& sf1, const IScalarFieldWrapper& sf2, Operation op, CCCoreLib::ScalarField* outSF)
{
if (!outSF || sf1.size() != sf2.size() || sf1.size() != outSF->size() || op == Feature::NO_OPERATION)
{