Update Line Shader

Now you just need to send the array of points, instead of construct it by yourself

src/noggit/rendering/Primitives.cpp

@@ -408,7 +408,7 @@ void Square::setup_buffers()
 
   }
 
-  void Cylinder::draw(glm::mat4x4 const& mvp, glm::vec3 const& pos, const glm::vec4 color, float radius, int precision, World* world, int height)
+  /*void Cylinder::draw(glm::mat4x4 const& mvp, glm::vec3 const& pos, const glm::vec4 color, float radius, int precision, World* world, int height)
   {
       if (!_buffers_are_setup)
       {
@@ -501,38 +501,42 @@ void Square::setup_buffers()
       }
 
       _buffers_are_setup = true;
-  }
+  }*/
 
   void Line::draw(glm::mat4x4 const& mvp
-      , glm::vec3 const& from
-      , glm::vec3 const& to
+      , std::vector<glm::vec3> const points
       , glm::vec4 const& color
   )
   {
-      if (!_buffers_are_setup)
-      {
-          setup_buffers(from, to);
-      }
+      if (points.size() < 2)
+          return;
+
+      setup_buffers(points);
 
       OpenGL::Scoped::use_program line_shader{ *_program.get() };
 
       line_shader.uniform("model_view_projection", mvp);
-      line_shader.uniform("origin", glm::vec3(from.x, from.y, from.z));
       line_shader.uniform("color", color);
 
       OpenGL::Scoped::vao_binder const _(_vao[0]);
-      gl.drawElements(GL_LINES, _indices_vbo, 2, GL_UNSIGNED_SHORT, nullptr);
+      gl.drawElements(GL_LINE_STRIP, _indices_vbo, _indice_count, GL_UNSIGNED_SHORT, nullptr);
   }
 
 
-  void Line::setup_buffers(glm::vec3 const& from, glm::vec3 const& to)
+  void Line::setup_buffers(std::vector<glm::vec3> const points)
   {
       _vao.upload();
       _buffers.upload();
 
-      std::vector<glm::vec3> vertices = { {0, 0, 0}, (to - from) };
-      std::vector<std::uint16_t> indices = { 0,1 };
+      std::vector<glm::vec3> vertices = points;
+      std::vector<std::uint16_t> indices;
 
+      for (int i = 0; i < points.size(); ++i)
+      {
+          indices.push_back(i);
+      }
+
+      _indice_count = (int)indices.size();
       _program.reset(new OpenGL::program(
           {
               { GL_VERTEX_SHADER, OpenGL::shader::src_from_qrc("line_vs") },
@@ -540,11 +544,9 @@ void Square::setup_buffers()
           }
       ));
 
-
       gl.bufferData<GL_ARRAY_BUFFER, glm::vec3> (_vertices_vbo, vertices, GL_STATIC_DRAW);
       gl.bufferData<GL_ELEMENT_ARRAY_BUFFER, std::uint16_t> (_indices_vbo, indices, GL_STATIC_DRAW);
 
-
       OpenGL::Scoped::index_buffer_manual_binder indices_binder(_indices_vbo);
       OpenGL::Scoped::use_program shader(*_program.get());
 

src/noggit/rendering/Primitives.hpp

@@ -136,7 +136,7 @@ namespace Noggit::Rendering::Primitives
     std::unique_ptr<OpenGL::program> _program;
   };
 
-  class Cylinder
+  /*class Cylinder
   {
   public:
       void draw(glm::mat4x4 const& mvp, glm::vec3 const& pos, const glm::vec4 color, float radius, int precision, World* world, int height = 10);
@@ -152,17 +152,18 @@ namespace Noggit::Rendering::Primitives
       GLuint const& _vertices_vbo = _buffers[0];
       GLuint const& _indices_vbo = _buffers[1];
       std::unique_ptr<OpenGL::program> _program;
-  };
+  };*/
 
   class Line
   {
   public:
-      void draw(glm::mat4x4 const& mvp, glm::vec3 const& from, glm::vec3 const& to, glm::vec4 const& color);
+      void draw(glm::mat4x4 const& mvp, std::vector<glm::vec3> const points, glm::vec4 const& color);
       void unload();
 
   private:
       bool _buffers_are_setup = false;
-      void setup_buffers(glm::vec3 const& from, glm::vec3 const& to);
+      void setup_buffers(std::vector<glm::vec3> const points);
+      int _indice_count = 0;
 
       OpenGL::Scoped::deferred_upload_vertex_arrays<1> _vao;
       OpenGL::Scoped::deferred_upload_buffers<2> _buffers;

src/noggit/rendering/WorldRender.cpp

@@ -1189,7 +1189,6 @@ void WorldRender::unload()
   _cursor_render.unload();
   _sphere_render.unload();
   _square_render.unload();
-  _cylinder_render.unload();
   _line_render.unload();
   _horizon_render.reset();
 

src/noggit/rendering/WorldRender.hpp

@@ -128,7 +128,6 @@ namespace Noggit::Rendering
     Noggit::CursorRender _cursor_render;
     Noggit::Rendering::Primitives::Sphere _sphere_render;
     Noggit::Rendering::Primitives::Square _square_render;
-    Noggit::Rendering::Primitives::Cylinder _cylinder_render;
     Noggit::Rendering::Primitives::Line _line_render;
 
     // buffers

src/noggit/rendering/glsl/line_vert.glsl

@@ -3,11 +3,8 @@
 in vec4 position;
 
 uniform mat4 model_view_projection;
-uniform vec3 origin;
 
 void main()
 {
-    vec4 pos = position;
-    pos.xyz += origin;
-    gl_Position = model_view_projection * pos;
+    gl_Position = model_view_projection * position;
 }