1
1
#include < Core/Geometry/IndexedGeometry.hpp>
2
2
3
- #include < Core/Utils/TypesUtils.hpp>
4
-
5
3
#include < iterator>
6
4
7
5
namespace Ra {
@@ -10,29 +8,19 @@ namespace Geometry {
10
8
11
9
MultiIndexedGeometry::MultiIndexedGeometry ( const MultiIndexedGeometry& other ) :
12
10
AttribArrayGeometry ( other ) {
13
- std::cerr << " MultiIndexedGeometry & other\n " ;
14
11
deepCopy ( other );
15
12
}
16
13
17
14
MultiIndexedGeometry::MultiIndexedGeometry ( MultiIndexedGeometry&& other ) :
18
- AttribArrayGeometry ( std::move( other ) ), m_indices( std::move( other.m_indices ) ) {
19
-
20
- std::cerr << " MultiIndexedGeometry && other\n " ;
21
- }
15
+ AttribArrayGeometry ( std::move( other ) ), m_indices( std::move( other.m_indices ) ) {}
22
16
23
17
MultiIndexedGeometry::MultiIndexedGeometry ( const AttribArrayGeometry& other ) :
24
- AttribArrayGeometry ( other ) {
25
- std::cerr << " MultiIndexedGeometry & other\n " ;
26
- }
18
+ AttribArrayGeometry ( other ) {}
27
19
28
20
MultiIndexedGeometry::MultiIndexedGeometry ( AttribArrayGeometry&& other ) :
29
- AttribArrayGeometry ( std::move( other ) ) {
30
- std::cerr << " MultiIndexedGeometry Atrib && other\n " ;
31
- }
21
+ AttribArrayGeometry ( std::move( other ) ) {}
32
22
33
23
MultiIndexedGeometry& MultiIndexedGeometry::operator =( const MultiIndexedGeometry& other ) {
34
- std::cerr << " MultiIndexedGeometry = & other\n " ;
35
-
36
24
invalidateAabb ();
37
25
AttribArrayGeometry::operator =( other );
38
26
deepCopy ( other );
@@ -41,8 +29,6 @@ MultiIndexedGeometry& MultiIndexedGeometry::operator=( const MultiIndexedGeometr
41
29
}
42
30
43
31
MultiIndexedGeometry& MultiIndexedGeometry::operator =( MultiIndexedGeometry&& other ) {
44
- std::cerr << " MultiIndexedGeometry = && other\n " ;
45
-
46
32
invalidateAabb ();
47
33
AttribArrayGeometry::operator =( std::move ( other ) );
48
34
m_indices = std::move ( other.m_indices );
@@ -140,12 +126,8 @@ size_t MultiIndexedGeometry::countLayers( const LayerSemanticCollection& semanti
140
126
std::pair<MultiIndexedGeometry::LayerKeyType, const GeometryIndexLayerBase&>
141
127
MultiIndexedGeometry::getFirstLayerOccurrence ( const LayerSemantic& semanticName ) const {
142
128
for ( const auto & [key, value] : m_indices ) {
143
- if ( key.first .find ( semanticName ) != key.first .end () ) {
144
-
145
- auto & tmp = *( value.second .get () );
146
- std::cerr << " get typeinfo " << Utils::demangleType ( tmp ) << " \n " ;
129
+ if ( key.first .find ( semanticName ) != key.first .end () )
147
130
return { key, *( value.second .get () ) };
148
- }
149
131
}
150
132
throw std::out_of_range ( " Layer entry not found" );
151
133
}
@@ -233,9 +215,6 @@ std::pair<bool, GeometryIndexLayerBase&>
233
215
MultiIndexedGeometry::addLayer ( std::unique_ptr<GeometryIndexLayerBase>&& layer,
234
216
const bool withLock,
235
217
const std::string& layerName ) {
236
-
237
- auto & tmp1 = *( layer.get () );
238
- std::cerr << " add layer typeinfo " << Utils::demangleType ( tmp1 ) << " \n " ;
239
218
LayerKeyType key { layer->semantics (), layerName };
240
219
auto elt = std::make_pair ( key, std::make_pair ( false , std::move ( layer ) ) );
241
220
auto [pos, inserted] = m_indices.insert ( std::move ( elt ) );
@@ -247,8 +226,6 @@ MultiIndexedGeometry::addLayer( std::unique_ptr<GeometryIndexLayerBase>&& layer,
247
226
}
248
227
// / If not inserted, the pointer is deleted. So the caller must ensure this possible
249
228
// / deletion is safe before calling this method.
250
- auto & tmp = *( pos->second .second .get () );
251
- std::cerr << " add layer inserted typeinfo " << Utils::demangleType ( tmp ) << " \n " ;
252
229
253
230
return { inserted, *( pos->second .second ) };
254
231
}
0 commit comments