1.1 --- a/bugs/issue-f0214576609193a60f014f6c1b55e5b01af8197d.yaml Sat Nov 14 17:44:54 2009 -0700
1.2 +++ b/bugs/issue-f0214576609193a60f014f6c1b55e5b01af8197d.yaml Sat Nov 14 23:38:40 2009 -0700
1.3 @@ -16,8 +16,8 @@
1.4 component: K-3D
1.5 release: 0.8.0.0
1.6 reporter: Timothy M. Shead <tshead@k-3d.com>
1.7 -status: :unstarted
1.8 -disposition:
1.9 +status: :closed
1.10 +disposition: :fixed
1.11 creation_time: 2009-07-20 04:12:18.454952 Z
1.12 references: []
1.13
1.14 @@ -27,3 +27,7 @@
1.15 - Timothy M. Shead <tshead@k-3d.com>
1.16 - created
1.17 - ""
1.18 +- - 2009-11-15 06:38:16.986581 Z
1.19 + - Timothy M. Shead <tshead@k-3d.com>
1.20 + - closed with disposition fixed
1.21 + - ""
2.1 --- a/modules/core/axes.cpp Sat Nov 14 17:44:54 2009 -0700
2.2 +++ b/modules/core/axes.cpp Sat Nov 14 23:38:40 2009 -0700
2.3 @@ -128,12 +128,14 @@
2.4 void on_gl_draw(const k3d::gl::render_state& State)
2.5 {
2.6 const long grid_count = m_grid_count.pipeline_value();
2.7 - const double grid_size = m_grid_size.pipeline_value();
2.8 + const k3d::double_t grid_size = m_grid_size.pipeline_value();
2.9 const k3d::color x_color = m_x_color.pipeline_value();
2.10 const k3d::color y_color = m_y_color.pipeline_value();
2.11 const k3d::color z_color = m_z_color.pipeline_value();
2.12 const k3d::color grid_color = m_grid_color.pipeline_value();
2.13
2.14 + const k3d::double_t size = grid_count * grid_size;
2.15 +
2.16 k3d::gl::store_attributes attributes;
2.17
2.18 glDisable(GL_LIGHTING);
2.19 @@ -141,14 +143,9 @@
2.20 glDisable(GL_TEXTURE_2D);
2.21 glDisable(GL_BLEND);
2.22
2.23 - glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
2.24 - glDisable(GL_CULL_FACE);
2.25 -
2.26 glLineWidth(1.0f);
2.27 glDisable(GL_LINE_STIPPLE);
2.28
2.29 - const double size = grid_count * grid_size;
2.30 -
2.31 // Draw axes and labels
2.32 if(m_axes.pipeline_value())
2.33 {
2.34 @@ -224,7 +221,7 @@
2.35 // Draw axis labels ...
2.36 k3d::gl::color3d(grid_color);
2.37
2.38 - double labelposition = size * 1.1;
2.39 + k3d::double_t labelposition = size * 1.1;
2.40
2.41 if(!m_font)
2.42 {