Skip to content

Commit e2edd3d

Browse files
mkazhdanmkazhdan
committed
Version 18.30
1 parent ed2934c commit e2edd3d

File tree

2 files changed

+28
-46
lines changed

2 files changed

+28
-46
lines changed

‎Src/DataStream.inl‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,9 +242,6 @@ size_t MultiOutputDataStream< Data ... >::write( const Data& ..
242242
template< typename ... Data >
243243
size_t MultiOutputDataStream< Data ... >::write( unsigned int t , const Data& ... d ){ size_t idx = _size++ ; _streams[t]->write(d...) ; return idx; }
244244

245-
template< typename ... Data >
246-
MultiOutputDataStream< Data ... >::MultiOutputDataStream( void ) {}
247-
248245
////////////////////////////////////////////////
249246
// De-interleaved multiple output data stream //
250247
////////////////////////////////////////////////

‎Src/Reconstructors.h‎

Lines changed: 28 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -712,26 +712,18 @@ namespace PoissonRecon
712712
typename FEMTreeInitializer< Dim , Real >::StreamInitializationData sid;
713713
{
714714
using ExternalType = std::tuple< Point< Real , Dim > , NormalAndAuxData >;
715-
if constexpr( HasAuxData )
716-
{
717-
using InternalType = std::tuple< Point< Real , Dim > , Point< Real , Dim > , AuxData >;
718-
auto converter = []( const InternalType &iType )
719-
{
720-
ExternalType xType;
721-
std::get< 0 >( xType ) = std::get< 0 >( iType );
722-
std::get< 1 >( xType ).template get<0>() = std::get< 1 >( iType );
723-
std::get< 1 >( xType ).template get<1>() = std::get< 2 >( iType );
724-
return xType;
725-
};
726-
InputDataStreamConverter< InternalType , ExternalType > __pointStream( _pointStream , converter , Point< Real , Dim >() , Point< Real , Dim >() , implicit.zeroAuxData );
727-
if( params.confidence>0 ) pointCount = FEMTreeInitializer< Dim , Real >::template Initialize< NormalAndAuxData >( sid , implicit.tree.spaceRoot() , __pointStream , zeroNormalAndAuxData , params.depth , *samples , *sampleNormalAndAuxData , true , implicit.tree.nodeAllocators.size() ? implicit.tree.nodeAllocators[0] : NULL , implicit.tree.initializer() , ProcessDataWithConfidence );
728-
else pointCount = FEMTreeInitializer< Dim , Real >::template Initialize< NormalAndAuxData >( sid , implicit.tree.spaceRoot() , __pointStream , zeroNormalAndAuxData , params.depth , *samples , *sampleNormalAndAuxData , true , implicit.tree.nodeAllocators.size() ? implicit.tree.nodeAllocators[0] : NULL , implicit.tree.initializer() , ProcessData );
729-
}
730-
else
731-
{
732-
if( params.confidence>0 ) pointCount = FEMTreeInitializer< Dim , Real >::template Initialize< NormalAndAuxData >( sid , implicit.tree.spaceRoot() , _pointStream , zeroNormalAndAuxData , params.depth , *samples , *sampleNormalAndAuxData , true , implicit.tree.nodeAllocators.size() ? implicit.tree.nodeAllocators[0] : NULL , implicit.tree.initializer() , ProcessDataWithConfidence );
733-
else pointCount = FEMTreeInitializer< Dim , Real >::template Initialize< NormalAndAuxData >( sid , implicit.tree.spaceRoot() , _pointStream , zeroNormalAndAuxData , params.depth , *samples , *sampleNormalAndAuxData , true , implicit.tree.nodeAllocators.size() ? implicit.tree.nodeAllocators[0] : NULL , implicit.tree.initializer() , ProcessData );
734-
}
715+
using InternalType = std::tuple< Point< Real , Dim > , Point< Real , Dim > , AuxData >;
716+
auto converter = []( const InternalType &iType )
717+
{
718+
ExternalType xType;
719+
std::get< 0 >( xType ) = std::get< 0 >( iType );
720+
std::get< 1 >( xType ).template get<0>() = std::get< 1 >( iType );
721+
std::get< 1 >( xType ).template get<1>() = std::get< 2 >( iType );
722+
return xType;
723+
};
724+
InputDataStreamConverter< InternalType , ExternalType > __pointStream( _pointStream , converter , Point< Real , Dim >() , Point< Real , Dim >() , implicit.zeroAuxData );
725+
if( params.confidence>0 ) pointCount = FEMTreeInitializer< Dim , Real >::template Initialize< NormalAndAuxData >( sid , implicit.tree.spaceRoot() , __pointStream , zeroNormalAndAuxData , params.depth , *samples , *sampleNormalAndAuxData , true , implicit.tree.nodeAllocators.size() ? implicit.tree.nodeAllocators[0] : NULL , implicit.tree.initializer() , ProcessDataWithConfidence );
726+
else pointCount = FEMTreeInitializer< Dim , Real >::template Initialize< NormalAndAuxData >( sid , implicit.tree.spaceRoot() , __pointStream , zeroNormalAndAuxData , params.depth , *samples , *sampleNormalAndAuxData , true , implicit.tree.nodeAllocators.size() ? implicit.tree.nodeAllocators[0] : NULL , implicit.tree.initializer() , ProcessData );
735727
}
736728
}
737729
else
@@ -753,7 +745,7 @@ namespace PoissonRecon
753745

754746
typename FEMTreeInitializer< Dim , Real >::StreamInitializationData sid;
755747
if( params.confidence>0 ) pointCount = FEMTreeInitializer< Dim , Real >::template Initialize< NormalAndAuxData >( sid , implicit.tree.spaceRoot() , _pointStream , zeroNormalAndAuxData , params.depth , *samples , *sampleNormalAndAuxData , true , implicit.tree.nodeAllocators.size() ? implicit.tree.nodeAllocators[0] : NULL , implicit.tree.initializer() , ProcessDataWithConfidence );
756-
else pointCount = FEMTreeInitializer< Dim , Real >::template Initialize< NormalAndAuxData >( sid , implicit.tree.spaceRoot() , _pointStream , zeroNormalAndAuxData , params.depth , *samples , *sampleNormalAndAuxData , true , implicit.tree.nodeAllocators.size() ? implicit.tree.nodeAllocators[0] : NULL , implicit.tree.initializer() , ProcessData );
748+
else pointCount = FEMTreeInitializer< Dim , Real >::template Initialize< NormalAndAuxData >( sid , implicit.tree.spaceRoot() , _pointStream , zeroNormalAndAuxData , params.depth , *samples , *sampleNormalAndAuxData , true , implicit.tree.nodeAllocators.size() ? implicit.tree.nodeAllocators[0] : NULL , implicit.tree.initializer() , ProcessData );
757749
}
758750

759751
implicit.unitCubeToModel = modelToUnitCube.inverse();
@@ -1183,27 +1175,20 @@ namespace PoissonRecon
11831175
typename FEMTreeInitializer< Dim , Real >::StreamInitializationData sid;
11841176
{
11851177
using ExternalType = std::tuple< Point< Real , Dim > , NormalAndAuxData >;
1186-
if constexpr( HasAuxData )
1187-
{
1188-
using InternalType = std::tuple< Point< Real , Dim > , Point< Real , Dim > , AuxData >;
1189-
auto converter = []( const InternalType &iType )
1190-
{
1191-
ExternalType xType;
1192-
std::get< 0 >( xType ) = std::get< 0 >( iType );
1193-
std::get< 1 >( xType ).template get<0>() = std::get< 1 >( iType );
1194-
std::get< 1 >( xType ).template get<1>() = std::get< 2 >( iType );
1195-
return xType;
1196-
};
1197-
InputDataStreamConverter< InternalType , ExternalType > __pointStream( _pointStream , converter , Point< Real , Dim >() , Point< Real , Dim >() , implicit.zeroAuxData );
1198-
if( params.confidence>0 ) pointCount = FEMTreeInitializer< Dim , Real >::template Initialize< NormalAndAuxData >( sid , implicit.tree.spaceRoot() , __pointStream , zeroNormalAndAuxData , params.depth , *samples , *sampleNormalAndAuxData , true , implicit.tree.nodeAllocators.size() ? implicit.tree.nodeAllocators[0] : NULL , implicit.tree.initializer() , ProcessDataWithConfidence );
1199-
else pointCount = FEMTreeInitializer< Dim , Real >::template Initialize< NormalAndAuxData >( sid , implicit.tree.spaceRoot() , __pointStream , zeroNormalAndAuxData , params.depth , *samples , *sampleNormalAndAuxData , true , implicit.tree.nodeAllocators.size() ? implicit.tree.nodeAllocators[0] : NULL , implicit.tree.initializer() , ProcessData );
1200-
}
1201-
else
1202-
{
1203-
if( params.confidence>0 ) pointCount = FEMTreeInitializer< Dim , Real >::template Initialize< NormalAndAuxData >( sid , implicit.tree.spaceRoot() , _pointStream , zeroNormalAndAuxData , params.depth , *samples , *sampleNormalAndAuxData , true , implicit.tree.nodeAllocators.size() ? implicit.tree.nodeAllocators[0] : NULL , implicit.tree.initializer() , ProcessDataWithConfidence );
1204-
else pointCount = FEMTreeInitializer< Dim , Real >::template Initialize< NormalAndAuxData >( sid , implicit.tree.spaceRoot() , _pointStream , zeroNormalAndAuxData , params.depth , *samples , *sampleNormalAndAuxData , true , implicit.tree.nodeAllocators.size() ? implicit.tree.nodeAllocators[0] : NULL , implicit.tree.initializer() , ProcessData );
1205-
}
1206-
} }
1178+
using InternalType = std::tuple< Point< Real , Dim > , Point< Real , Dim > , AuxData >;
1179+
auto converter = []( const InternalType &iType )
1180+
{
1181+
ExternalType xType;
1182+
std::get< 0 >( xType ) = std::get< 0 >( iType );
1183+
std::get< 1 >( xType ).template get<0>() = std::get< 1 >( iType );
1184+
std::get< 1 >( xType ).template get<1>() = std::get< 2 >( iType );
1185+
return xType;
1186+
};
1187+
InputDataStreamConverter< InternalType , ExternalType > __pointStream( _pointStream , converter , Point< Real , Dim >() , Point< Real , Dim >() , implicit.zeroAuxData );
1188+
if( params.confidence>0 ) pointCount = FEMTreeInitializer< Dim , Real >::template Initialize< NormalAndAuxData >( sid , implicit.tree.spaceRoot() , __pointStream , zeroNormalAndAuxData , params.depth , *samples , *sampleNormalAndAuxData , true , implicit.tree.nodeAllocators.size() ? implicit.tree.nodeAllocators[0] : NULL , implicit.tree.initializer() , ProcessDataWithConfidence );
1189+
else pointCount = FEMTreeInitializer< Dim , Real >::template Initialize< NormalAndAuxData >( sid , implicit.tree.spaceRoot() , __pointStream , zeroNormalAndAuxData , params.depth , *samples , *sampleNormalAndAuxData , true , implicit.tree.nodeAllocators.size() ? implicit.tree.nodeAllocators[0] : NULL , implicit.tree.initializer() , ProcessData );
1190+
}
1191+
}
12071192
else
12081193
{
12091194
TransformedInputOrientedSampleStream< Real , Dim > _pointStream( modelToUnitCube , pointStream );
@@ -1223,7 +1208,7 @@ namespace PoissonRecon
12231208

12241209
typename FEMTreeInitializer< Dim , Real >::StreamInitializationData sid;
12251210
if( params.confidence>0 ) pointCount = FEMTreeInitializer< Dim , Real >::template Initialize< NormalAndAuxData >( sid , implicit.tree.spaceRoot() , _pointStream , zeroNormalAndAuxData , params.depth , *samples , *sampleNormalAndAuxData , true , implicit.tree.nodeAllocators.size() ? implicit.tree.nodeAllocators[0] : NULL , implicit.tree.initializer() , ProcessDataWithConfidence );
1226-
else pointCount = FEMTreeInitializer< Dim , Real >::template Initialize< NormalAndAuxData >( sid , implicit.tree.spaceRoot() , _pointStream , zeroNormalAndAuxData , params.depth , *samples , *sampleNormalAndAuxData , true , implicit.tree.nodeAllocators.size() ? implicit.tree.nodeAllocators[0] : NULL , implicit.tree.initializer() , ProcessData );
1211+
else pointCount = FEMTreeInitializer< Dim , Real >::template Initialize< NormalAndAuxData >( sid , implicit.tree.spaceRoot() , _pointStream , zeroNormalAndAuxData , params.depth , *samples , *sampleNormalAndAuxData , true , implicit.tree.nodeAllocators.size() ? implicit.tree.nodeAllocators[0] : NULL , implicit.tree.initializer() , ProcessData );
12271212
}
12281213

12291214
implicit.unitCubeToModel = modelToUnitCube.inverse();

0 commit comments

Comments
 (0)