[engine] handle line index layer picking render mode.

Author: dlyr

src/Engine/Data/Mesh.cpp

@@ -168,15 +168,22 @@ void GeometryDisplayable::loadGeometry( Core::Geometry::MultiIndexedGeometry&& m
     m_geom = std::move( mesh );
     setupCoreMeshObservers();
 
-    /// \todo check if other layer ? at least triangulate
-    if ( m_geom.containsLayer( Core::Geometry::TriangleIndexLayer::staticSemanticName ) ) {
+    if ( m_geom.containsLayer( Core::Geometry::LineIndexLayer::staticSemanticName ) ) {
+        auto [key, layer] =
+            m_geom.getFirstLayerOccurrence( Core::Geometry::LineIndexLayer::staticSemanticName );
+        m_activeLayerKey = key;
+        setRenderMode( AttribArrayDisplayable::RM_LINES );
+
+        auto ok = addRenderLayer( key, AttribArrayDisplayable::RM_LINES );
+        if ( !ok ) { LOG( logERROR ) << "loadGeometry could not add layer"; }
+    }
+    else if ( m_geom.containsLayer( Core::Geometry::TriangleIndexLayer::staticSemanticName ) ) {
         auto [key, layer] = m_geom.getFirstLayerOccurrence(
             Core::Geometry::TriangleIndexLayer::staticSemanticName );
         m_activeLayerKey = key;
         addRenderLayer( key, AttribArrayDisplayable::RM_TRIANGLES );
     }
     else if ( m_geom.containsLayer( Core::Geometry::QuadIndexLayer::staticSemanticName ) ) {
-        std::cerr << "get quad layer\n";
         auto [key, layer] =
             m_geom.getFirstLayerOccurrence( Core::Geometry::QuadIndexLayer::staticSemanticName );
 
@@ -211,6 +218,9 @@ void GeometryDisplayable::loadGeometry( Core::Geometry::MultiIndexedGeometry&& m
             addRenderLayer( triangleKey, AttribArrayDisplayable::RM_TRIANGLES );
         }
     }
+    else {
+        LOG( logERROR ) << "no valid layer found";
+    }
     m_isDirty = true;
 }
 
@@ -365,23 +375,30 @@ void GeometryDisplayable::render( const ShaderProgram* prog ) {
 
 void GeometryDisplayable::render( const ShaderProgram* prog, const LayerKeyType& key ) {
     GL_CHECK_ERROR;
-    if ( m_geomLayers[key].vao ) {
-        m_geomLayers[key].vao->bind();
-        GL_CHECK_ERROR;
-        autoVertexAttribPointer( prog, key );
-        GL_CHECK_ERROR;
-
-        m_geomLayers[key].vao->drawElements( static_cast<GLenum>( m_geomLayers[key].renderMode ),
-                                             GLsizei( m_geomLayers[key].indices.numElements ),
-                                             GL_UNSIGNED_INT,
-                                             nullptr );
-        GL_CHECK_ERROR;
-        m_geomLayers[key].vao->unbind();
-        GL_CHECK_ERROR;
+    if ( m_geomLayers.find( key ) != m_geomLayers.end() ) {
+        if ( m_geomLayers[key].vao ) {
+            m_geomLayers[key].vao->bind();
+            GL_CHECK_ERROR;
+            autoVertexAttribPointer( prog, key );
+            GL_CHECK_ERROR;
+            LOG( logERROR ) << "draw " << *key.first.begin() << " [" << key.second << "] "
+                            << prog->getBasicConfiguration().getName();
+            m_geomLayers[key].vao->drawElements(
+                static_cast<GLenum>( m_geomLayers[key].renderMode ),
+                GLsizei( m_geomLayers[key].indices.numElements ),
+                GL_UNSIGNED_INT,
+                nullptr );
+            GL_CHECK_ERROR;
+            m_geomLayers[key].vao->unbind();
+            GL_CHECK_ERROR;
+        }
+        else {
+            LOG( logERROR ) << "try to draw an invalid layer " << *key.first.begin() << " ["
+                            << key.second << "]\n";
+        }
     }
     else {
-        LOG( logERROR ) << "try to draw an invalid layer " << *key.first.begin() << " ["
-                        << key.second << "]\n";
+        LOG( logERROR ) << "layer was not added as a render layer";
     }
 }