diff --git a/pvt/include/pvt/rendering/renderable_cartesian_grid.hpp b/pvt/include/pvt/rendering/renderable_cartesian_grid.hpp index 38b7c0a5b98496155813d342ef3daf2e3419ef8c..f7ec818b6072dc40849572f844fffa4ff9a283b8 100644 --- a/pvt/include/pvt/rendering/renderable_cartesian_grid.hpp +++ b/pvt/include/pvt/rendering/renderable_cartesian_grid.hpp @@ -56,10 +56,6 @@ public: { return m_block_size; } - const Eigen::Vector3f& get_scale () const - { - return m_scale; - } const Eigen::Vector4f& get_color () const { return m_color; @@ -80,11 +76,6 @@ public: m_translation = translation; m_needs_upload = true; } - void set_scale (const Eigen::Vector3f& scale ) - { - m_scale = scale; - m_needs_upload = true; - } void set_color (const Eigen::Vector4f& color ) { m_color = color; @@ -100,7 +91,6 @@ private: Eigen::Vector3f m_size ; Eigen::Vector3f m_block_size ; Eigen::Vector3f m_translation ; - Eigen::Vector3f m_scale ; Eigen::Vector4f m_color ; optional<vertex_buffer> m_vertex_buffer; optional<vertex_buffer> m_normal_buffer; diff --git a/pvt/src/rendering/renderable_cartesian_grid.cpp b/pvt/src/rendering/renderable_cartesian_grid.cpp index b43b08dbff9c2aa1155696eee495334574089454..5378d8f5d45330fd3e3f5bd4d42df5819ac08242 100644 --- a/pvt/src/rendering/renderable_cartesian_grid.cpp +++ b/pvt/src/rendering/renderable_cartesian_grid.cpp @@ -36,7 +36,6 @@ renderable_cartesian_grid::renderable_cartesian_grid( : m_size(size) , m_block_size(block_size) , m_translation({ 0.0, 0.0, 0.0 }) - , m_scale({ 1.0, 1.0, 1.0 }) , m_color({ 0.5, 0.5, 0.5, 1.0 }) { @@ -79,7 +78,6 @@ void renderable_cartesian_grid::on_render(const camera* p_camera) } m_shader_program->set_uniform("translation", m_translation); - m_shader_program->set_uniform("scale" , m_scale ); m_shader_program->set_uniform("color" , m_color ); glDrawArrays(GL_LINES, 0, m_draw_count); diff --git a/pvt/src/rendering/shader_strings.cpp b/pvt/src/rendering/shader_strings.cpp index 68ad172a4864c2398ad1911a924b1b45d932e445..615882fafffcc8b68297fa3f8cc228bccae632b2 100644 --- a/pvt/src/rendering/shader_strings.cpp +++ b/pvt/src/rendering/shader_strings.cpp @@ -125,19 +125,14 @@ std::string cartesian_grid_vert = R"(\ uniform mat4 projection ; uniform mat4 view ; uniform vec3 translation; -uniform vec3 scale ; in vec3 vertex ; in vec3 normal ; out float visible ; void main() { - mat4 transform_matrix = mat4(scale.x, 0.0 , 0.0 , translation.x, - 0.0 , scale.y, 0.0 , translation.y, - 0.0 , 0.0 , scale.z, translation.z, - 0.0 , 0.0 , 0.0 , 1.0); - gl_Position = projection * view * transform_matrix * vec4(vertex, 1.0); + gl_Position = projection * view * vec4(vertex + translation, 1.0); - vec3 vertex_normal = (view * transform_matrix * vec4(normal, 0.0)).xyz; + vec3 vertex_normal = (view * vec4(normal, 0.0)).xyz; if(vertex_normal.z >= 0.0) visible = 1.0; else