Mercurial > octave
diff libinterp/corefcn/gl-render.h @ 30121:5c9f5353eef3
maint: use "m_" prefix for member variables in file gl-render.cc
* gl-render.h: Order class sections according to Octave convention.
* gl-render.cc: Use "m_" prefix for member variables in classes opengl_tesselator,
patch_tesselator. Wrap long lines to < 80 characters where feasible.
| author | Rik <rik@octave.org> |
|---|---|
| date | Mon, 06 Sep 2021 10:17:24 -0700 |
| parents | ebd1ac75e99f |
| children | 91c6288781ba 796f54d4ddbf |
line wrap: on
line diff
--- a/libinterp/corefcn/gl-render.h Mon Sep 06 09:16:58 2021 -0700 +++ b/libinterp/corefcn/gl-render.h Mon Sep 06 10:17:24 2021 -0700 @@ -76,6 +76,7 @@ virtual void finish (void); protected: + virtual void draw_figure (const figure::properties& props); virtual void draw_axes (const axes::properties& props); virtual void draw_line (const line::properties& props); @@ -159,8 +160,25 @@ virtual void draw_zoom_rect (int x1, int y1, int x2, int y2); + //-------- + + opengl_functions& m_glfcns; + + // axis limits in model scaled coordinate + double m_xmin, m_xmax; + double m_ymin, m_ymax; + double m_zmin, m_zmax; + + // Factor used for translating Octave pixels to actual device pixels + double m_devpixratio; + + // axes transformation data + graphics_xform m_xform; + private: + class patch_tessellator; + void init_maxlights (void); std::string get_string (unsigned int id) const; @@ -214,22 +232,7 @@ void draw_texture_image (const octave_value cdata, Matrix x, Matrix y, bool ortho = false); - protected: - - opengl_functions& m_glfcns; - - // axis limits in model scaled coordinate - double m_xmin, m_xmax; - double m_ymin, m_ymax; - double m_zmin, m_zmax; - - // Factor used for translating Octave pixels to actual device pixels - double m_devpixratio; - - // axes transformation data - graphics_xform m_xform; - - private: + //-------- // The graphics m_toolkit associated with the figure being rendered. graphics_toolkit m_toolkit; @@ -257,9 +260,6 @@ // Indicate we are drawing for printing purpose bool m_printing; - - private: - class patch_tessellator; }; }