Mercurial > octave
diff libinterp/corefcn/gl-render.h @ 22347:2b1612cf38e4
gl-render.cc/.h: (minor)gridcolor and (minor)gridalpha for OpenGL toolkits (bug #48429)
* gl-render.cc (render_grid): Implement support of gridcolor, gridalpha,
minorgridcolor and minorgridalpha.
* gl-render.cc (draw_axes_x_grid, draw_axes_y_grid, draw_axes_z_grid):
Use gridcolor, gridalpha, minorgridcolor and minorgridalpha properties.
* gl-render.h (render_grid): Change declaration.
review and push by Andreas Weber <andy.weber.aw@gmail.com>
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Sat, 20 Aug 2016 14:46:18 +0200 |
| parents | b81b08cc4c83 |
| children | 52c205a0ad88 |
line wrap: on
line diff
--- a/libinterp/corefcn/gl-render.h Sat Aug 20 09:04:14 2016 +0200 +++ b/libinterp/corefcn/gl-render.h Sat Aug 20 14:46:18 2016 +0200 @@ -115,8 +115,9 @@ virtual void draw_pixels (int w, int h, const uint8_t *data); virtual void draw_pixels (int w, int h, const uint16_t *data); - virtual void render_grid (const std::string& gridstyle, const Matrix& ticks, - double lim1, double lim2, + virtual void render_grid (const std::string& gridstyle, + const Matrix& gridcolor, const double gridalpha, + const Matrix& ticks, double lim1, double lim2, double p1, double p1N, double p2, double p2N, int xyz, bool is_3D);