determine drawing mode by IBO count_per_element

stevenlovegrove · Dec 7, 2016 · a561efc · a561efc
1 parent 584650d
commit a561efc
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/include/pangolin/gl/glvbo.h b/include/pangolin/gl/glvbo.h
@@ -131,7 +131,12 @@ inline void RenderVboIbo(GlBuffer& vbo, GlBuffer& ibo, bool draw_mesh)
 
     if(draw_mesh) {
         ibo.Bind();
-        glDrawElements(GL_TRIANGLES, ibo.num_elements*ibo.count_per_element, ibo.datatype, 0);
+        if(ibo.count_per_element==1) {
+            glDrawElements(GL_TRIANGLE_STRIP,ibo.num_elements, ibo.datatype, 0);
+        }
+        else {
+            glDrawElements(GL_TRIANGLES,ibo.num_elements*ibo.count_per_element, ibo.datatype, 0);
+        }
         ibo.Unbind();
     }else{
         glDrawArrays(GL_POINTS, 0, vbo.num_elements);
@@ -177,7 +182,12 @@ inline void RenderVboIboCboNbo(GlBuffer& vbo, GlBuffer& ibo, GlBuffer& cbo, GlBu
 
     if(draw_mesh) {
         ibo.Bind();
-        glDrawElements(GL_TRIANGLE_STRIP,ibo.num_elements, ibo.datatype, 0);
+        if(ibo.count_per_element==1) {
+            glDrawElements(GL_TRIANGLE_STRIP,ibo.num_elements, ibo.datatype, 0);
+        }
+        else {
+            glDrawElements(GL_TRIANGLES,ibo.num_elements*ibo.count_per_element, ibo.datatype, 0);
+        }
         ibo.Unbind();
     }else{
         glDrawArrays(GL_POINTS, 0, vbo.num_elements);
@@ -211,7 +221,12 @@ inline void RenderVboIboNbo(GlBuffer& vbo, GlBuffer& ibo, GlBuffer& nbo, bool dr
 
     if(draw_mesh) {
         ibo.Bind();
-        glDrawElements(GL_TRIANGLE_STRIP,ibo.num_elements, ibo.datatype, 0);
+        if(ibo.count_per_element==1) {
+            glDrawElements(GL_TRIANGLE_STRIP,ibo.num_elements, ibo.datatype, 0);
+        }
+        else {
+            glDrawElements(GL_TRIANGLES,ibo.num_elements*ibo.count_per_element, ibo.datatype, 0);
+        }
         ibo.Unbind();
     }else{
         glDrawArrays(GL_POINTS, 0, vbo.num_elements);