Mercurial > octave
diff libinterp/corefcn/gl-render.h @ 31607:aac27ad79be6 stable
maint: Re-indent code after switch to using namespace macros.
* build-env.h, build-env.in.cc, Cell.h, __betainc__.cc, __eigs__.cc,
__ftp__.cc, __ichol__.cc, __ilu__.cc, __isprimelarge__.cc, __magick_read__.cc,
__pchip_deriv__.cc, amd.cc, base-text-renderer.cc, base-text-renderer.h,
besselj.cc, bitfcns.cc, bsxfun.cc, c-file-ptr-stream.h, call-stack.cc,
call-stack.h, ccolamd.cc, cellfun.cc, chol.cc, colamd.cc, dasrt.cc, data.cc,
debug.cc, defaults.cc, defaults.h, det.cc, display.cc, display.h, dlmread.cc,
dynamic-ld.cc, dynamic-ld.h, ellipj.cc, environment.cc, environment.h,
error.cc, error.h, errwarn.h, event-manager.cc, event-manager.h,
event-queue.cc, event-queue.h, fcn-info.cc, fcn-info.h, fft.cc, fft2.cc,
file-io.cc, filter.cc, find.cc, ft-text-renderer.cc, ft-text-renderer.h,
gcd.cc, gl-render.cc, gl-render.h, gl2ps-print.cc, gl2ps-print.h,
graphics-toolkit.cc, graphics-toolkit.h, graphics.cc, gsvd.cc, gtk-manager.cc,
gtk-manager.h, help.cc, help.h, hook-fcn.cc, hook-fcn.h, input.cc, input.h,
interpreter-private.cc, interpreter-private.h, interpreter.cc, interpreter.h,
inv.cc, jsondecode.cc, jsonencode.cc, latex-text-renderer.cc,
latex-text-renderer.h, load-path.cc, load-path.h, load-save.cc, load-save.h,
lookup.cc, ls-hdf5.cc, ls-mat4.cc, ls-mat5.cc, lsode.cc, lu.cc, mappers.cc,
matrix_type.cc, max.cc, mex.cc, mexproto.h, mxarray.h, mxtypes.in.h,
oct-errno.in.cc, oct-hdf5-types.cc, oct-hist.cc, oct-hist.h, oct-map.cc,
oct-map.h, oct-opengl.h, oct-prcstrm.h, oct-process.cc, oct-process.h,
oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.h,
octave-default-image.h, ordqz.cc, ordschur.cc, pager.cc, pager.h, pinv.cc,
pow2.cc, pr-output.cc, psi.cc, qr.cc, quadcc.cc, rand.cc, regexp.cc,
settings.cc, settings.h, sighandlers.cc, sighandlers.h, sparse-xpow.cc,
sqrtm.cc, stack-frame.cc, stack-frame.h, stream-euler.cc, strfns.cc, svd.cc,
syminfo.cc, syminfo.h, symrcm.cc, symrec.cc, symrec.h, symscope.cc, symscope.h,
symtab.cc, symtab.h, sysdep.cc, sysdep.h, text-engine.cc, text-engine.h,
text-renderer.cc, text-renderer.h, time.cc, toplev.cc, typecast.cc,
url-handle-manager.cc, url-handle-manager.h, urlwrite.cc, utils.cc, utils.h,
variables.cc, variables.h, xdiv.cc, __delaunayn__.cc, __init_fltk__.cc,
__init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, audioread.cc, convhulln.cc,
gzip.cc, cdef-class.cc, cdef-class.h, cdef-fwd.h, cdef-manager.cc,
cdef-manager.h, cdef-method.cc, cdef-method.h, cdef-object.cc, cdef-object.h,
cdef-package.cc, cdef-package.h, cdef-property.cc, cdef-property.h,
cdef-utils.cc, cdef-utils.h, ov-base-diag.cc, ov-base-int.cc, ov-base-mat.cc,
ov-base-mat.h, ov-base-scalar.cc, ov-base.cc, ov-base.h, ov-bool-mat.cc,
ov-bool-mat.h, ov-bool-sparse.cc, ov-bool.cc, ov-builtin.h, ov-cell.cc,
ov-ch-mat.cc, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h,
ov-complex.cc, ov-cx-diag.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-dld-fcn.cc,
ov-dld-fcn.h, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn.h, ov-float.cc,
ov-flt-complex.cc, ov-flt-cx-diag.cc, ov-flt-cx-mat.cc, ov-flt-re-diag.cc,
ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-intx.h, ov-java.cc, ov-lazy-idx.cc,
ov-legacy-range.cc, ov-magic-int.cc, ov-mex-fcn.cc, ov-mex-fcn.h,
ov-null-mat.cc, ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc,
ov-re-mat.h, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, ov-struct.cc,
ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, ovl.h,
octave.cc, octave.h, op-b-sbm.cc, op-bm-sbm.cc, op-cs-scm.cc, op-fm-fcm.cc,
op-fs-fcm.cc, op-s-scm.cc, op-scm-cs.cc, op-scm-s.cc, op-sm-cs.cc, ops.h,
anon-fcn-validator.cc, anon-fcn-validator.h, bp-table.cc, bp-table.h,
comment-list.cc, comment-list.h, filepos.h, lex.h, oct-lvalue.cc, oct-lvalue.h,
parse.h, profiler.cc, profiler.h, pt-anon-scopes.cc, pt-anon-scopes.h,
pt-arg-list.cc, pt-arg-list.h, pt-args-block.cc, pt-args-block.h,
pt-array-list.cc, pt-array-list.h, pt-assign.cc, pt-assign.h, pt-binop.cc,
pt-binop.h, pt-bp.cc, pt-bp.h, pt-cbinop.cc, pt-cbinop.h, pt-cell.cc,
pt-cell.h, pt-check.cc, pt-check.h, pt-classdef.cc, pt-classdef.h, pt-cmd.h,
pt-colon.cc, pt-colon.h, pt-const.cc, pt-const.h, pt-decl.cc, pt-decl.h,
pt-eval.cc, pt-eval.h, pt-except.cc, pt-except.h, pt-exp.cc, pt-exp.h,
pt-fcn-handle.cc, pt-fcn-handle.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h,
pt-jump.h, pt-loop.cc, pt-loop.h, pt-mat.cc, pt-mat.h, pt-misc.cc, pt-misc.h,
pt-pr-code.cc, pt-pr-code.h, pt-select.cc, pt-select.h, pt-spmd.cc, pt-spmd.h,
pt-stmt.cc, pt-stmt.h, pt-tm-const.cc, pt-tm-const.h, pt-unop.cc, pt-unop.h,
pt-walk.cc, pt-walk.h, pt.cc, pt.h, token.cc, token.h, Range.cc, Range.h,
idx-vector.cc, idx-vector.h, range-fwd.h, CollocWt.cc, CollocWt.h,
aepbalance.cc, aepbalance.h, chol.cc, chol.h, gepbalance.cc, gepbalance.h,
gsvd.cc, gsvd.h, hess.cc, hess.h, lo-mappers.cc, lo-mappers.h, lo-specfun.cc,
lo-specfun.h, lu.cc, lu.h, oct-convn.cc, oct-convn.h, oct-fftw.cc, oct-fftw.h,
oct-norm.cc, oct-norm.h, oct-rand.cc, oct-rand.h, oct-spparms.cc,
oct-spparms.h, qr.cc, qr.h, qrp.cc, qrp.h, randgamma.cc, randgamma.h,
randmtzig.cc, randmtzig.h, randpoisson.cc, randpoisson.h, schur.cc, schur.h,
sparse-chol.cc, sparse-chol.h, sparse-lu.cc, sparse-lu.h, sparse-qr.cc,
sparse-qr.h, svd.cc, svd.h, child-list.cc, child-list.h, dir-ops.cc, dir-ops.h,
file-ops.cc, file-ops.h, file-stat.cc, file-stat.h, lo-sysdep.cc, lo-sysdep.h,
lo-sysinfo.cc, lo-sysinfo.h, mach-info.cc, mach-info.h, oct-env.cc, oct-env.h,
oct-group.cc, oct-group.h, oct-password.cc, oct-password.h, oct-syscalls.cc,
oct-syscalls.h, oct-time.cc, oct-time.h, oct-uname.cc, oct-uname.h,
action-container.cc, action-container.h, base-list.h, cmd-edit.cc, cmd-edit.h,
cmd-hist.cc, cmd-hist.h, f77-fcn.h, file-info.cc, file-info.h,
lo-array-errwarn.cc, lo-array-errwarn.h, lo-hash.cc, lo-hash.h, lo-ieee.h,
lo-regexp.cc, lo-regexp.h, lo-utils.cc, lo-utils.h, oct-base64.cc,
oct-base64.h, oct-glob.cc, oct-glob.h, oct-inttypes.h, oct-mutex.cc,
oct-mutex.h, oct-refcount.h, oct-shlib.cc, oct-shlib.h, oct-sparse.cc,
oct-sparse.h, oct-string.h, octave-preserve-stream-state.h, pathsearch.cc,
pathsearch.h, quit.cc, quit.h, unwind-prot.cc, unwind-prot.h, url-transfer.cc,
url-transfer.h:
Re-indent code after switch to using namespace macros.
| author | Rik <rik@octave.org> |
|---|---|
| date | Thu, 01 Dec 2022 18:02:15 -0800 |
| parents | e88a07dec498 |
| children | 597f3ee61a48 |
line wrap: on
line diff
--- a/libinterp/corefcn/gl-render.h Thu Dec 01 14:23:45 2022 -0800 +++ b/libinterp/corefcn/gl-render.h Thu Dec 01 18:02:15 2022 -0800 @@ -33,235 +33,235 @@ OCTAVE_BEGIN_NAMESPACE(octave) - class opengl_functions; +class opengl_functions; - class - OCTINTERP_API - opengl_renderer - { - public: +class +OCTINTERP_API +opengl_renderer +{ +public: - opengl_renderer (opengl_functions& glfcns); + opengl_renderer (opengl_functions& glfcns); - // No copying! + // No copying! - opengl_renderer (const opengl_renderer&) = delete; + opengl_renderer (const opengl_renderer&) = delete; - opengl_renderer& operator = (const opengl_renderer&) = delete; + opengl_renderer& operator = (const opengl_renderer&) = delete; - virtual ~opengl_renderer (void) = default; + virtual ~opengl_renderer (void) = default; - opengl_functions& get_opengl_functions (void) const { return m_glfcns; } + opengl_functions& get_opengl_functions (void) const { return m_glfcns; } - virtual void draw (const graphics_object& go, bool toplevel = true); + virtual void draw (const graphics_object& go, bool toplevel = true); - // The following version of the draw method is not declared virtual - // because no derived class overrides it. + // The following version of the draw method is not declared virtual + // because no derived class overrides it. - void draw (const Matrix& hlist, bool toplevel = false); + void draw (const Matrix& hlist, bool toplevel = false); - virtual void set_viewport (int w, int h); - virtual void set_device_pixel_ratio (double dpr) { m_devpixratio = dpr; } - virtual Matrix get_viewport_scaled (void) const; - virtual graphics_xform get_transform (void) const { return m_xform; } - virtual uint8NDArray get_pixels (int width, int height); + virtual void set_viewport (int w, int h); + virtual void set_device_pixel_ratio (double dpr) { m_devpixratio = dpr; } + virtual Matrix get_viewport_scaled (void) const; + virtual graphics_xform get_transform (void) const { return m_xform; } + virtual uint8NDArray get_pixels (int width, int height); - virtual void draw_zoom_box (int width, int height, - int x1, int y1, int x2, int y2, - const Matrix& overlaycolor, - double overlayalpha, - const Matrix& bordercolor, - double borderalpha, double borderwidth); + virtual void draw_zoom_box (int width, int height, + int x1, int y1, int x2, int y2, + const Matrix& overlaycolor, + double overlayalpha, + const Matrix& bordercolor, + double borderalpha, double borderwidth); - virtual void finish (void); + virtual void finish (void); - protected: +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); - virtual void draw_surface (const surface::properties& props); - virtual void draw_patch (const patch::properties& props); - virtual void draw_scatter (const scatter::properties& props); - virtual void draw_light (const light::properties& props); - virtual void draw_hggroup (const hggroup::properties& props); - virtual void draw_text (const text::properties& props); - virtual void draw_text_background (const text::properties& props, - bool do_rotate = false); - virtual void draw_image (const image::properties& props); - virtual void draw_uipanel (const uipanel::properties& props, - const graphics_object& go); - virtual void draw_uibuttongroup (const uibuttongroup::properties& props, - const graphics_object& go); - virtual void init_gl_context (bool enhanced, const Matrix& backgroundColor); - virtual void setup_opengl_transformation (const axes::properties& props); + virtual void draw_figure (const figure::properties& props); + virtual void draw_axes (const axes::properties& props); + virtual void draw_line (const line::properties& props); + virtual void draw_surface (const surface::properties& props); + virtual void draw_patch (const patch::properties& props); + virtual void draw_scatter (const scatter::properties& props); + virtual void draw_light (const light::properties& props); + virtual void draw_hggroup (const hggroup::properties& props); + virtual void draw_text (const text::properties& props); + virtual void draw_text_background (const text::properties& props, + bool do_rotate = false); + virtual void draw_image (const image::properties& props); + virtual void draw_uipanel (const uipanel::properties& props, + const graphics_object& go); + virtual void draw_uibuttongroup (const uibuttongroup::properties& props, + const graphics_object& go); + virtual void init_gl_context (bool enhanced, const Matrix& backgroundColor); + virtual void setup_opengl_transformation (const axes::properties& props); - virtual void set_clipbox (double x1, double x2, double y1, double y2, - double z1, double z2); - virtual void set_clipping (bool on); - virtual void set_font (const base_properties& props); - virtual void set_color (const Matrix& c); - virtual void set_interpreter (const caseless_str& interp) - { - m_interpreter = interp; - } - virtual void set_linewidth (float w); - virtual void set_linestyle (const std::string& s, bool stipple = false, - double linewidth = 0.5); - virtual void set_linecap (const std::string&) { }; - virtual void set_linejoin (const std::string&) { }; - virtual void set_polygon_offset (bool on, float offset = 0.0f); - virtual void set_selecting (bool on) - { - m_selecting = on; - } + virtual void set_clipbox (double x1, double x2, double y1, double y2, + double z1, double z2); + virtual void set_clipping (bool on); + virtual void set_font (const base_properties& props); + virtual void set_color (const Matrix& c); + virtual void set_interpreter (const caseless_str& interp) + { + m_interpreter = interp; + } + virtual void set_linewidth (float w); + virtual void set_linestyle (const std::string& s, bool stipple = false, + double linewidth = 0.5); + virtual void set_linecap (const std::string&) { }; + virtual void set_linejoin (const std::string&) { }; + virtual void set_polygon_offset (bool on, float offset = 0.0f); + virtual void set_selecting (bool on) + { + m_selecting = on; + } - virtual void init_marker (const std::string& m, double size, float width); - virtual void change_marker (const std::string& m, double size); - virtual void end_marker (void); - virtual void draw_marker (double x, double y, double z, - const Matrix& lc, const Matrix& fc, - const double la = 1.0, const double fa = 1.0); + virtual void init_marker (const std::string& m, double size, float width); + virtual void change_marker (const std::string& m, double size); + virtual void end_marker (void); + virtual void draw_marker (double x, double y, double z, + const Matrix& lc, const Matrix& fc, + const double la = 1.0, const double fa = 1.0); - virtual void text_to_pixels (const std::string& txt, - uint8NDArray& pixels, - Matrix& bbox, - int halign = 0, int valign = 0, - double rotation = 0.0); + virtual void text_to_pixels (const std::string& txt, + uint8NDArray& pixels, + Matrix& bbox, + int halign = 0, int valign = 0, + double rotation = 0.0); - virtual void text_to_strlist (const std::string& txt, - std::list<text_renderer::string>& lst, - Matrix& bbox, - int halign = 0, int valign = 0, - double rotation = 0.0); + virtual void text_to_strlist (const std::string& txt, + std::list<text_renderer::string>& lst, + Matrix& bbox, + int halign = 0, int valign = 0, + double rotation = 0.0); - virtual Matrix render_text (const std::string& txt, - double x, double y, double z, - int halign, int valign, double rotation = 0.0); + virtual Matrix render_text (const std::string& txt, + double x, double y, double z, + int halign, int valign, double rotation = 0.0); - virtual void render_grid (const double linewidth, - 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); + virtual void render_grid (const double linewidth, + 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); - virtual void render_tickmarks (const Matrix& ticks, - double lim1, double lim2, - double p1, double p1N, double p2, double p2N, - double dx, double dy, double dz, - int xyz, bool doubleside); + virtual void render_tickmarks (const Matrix& ticks, + double lim1, double lim2, + double p1, double p1N, double p2, double p2N, + double dx, double dy, double dz, + int xyz, bool doubleside); - virtual void render_ticktexts (const Matrix& ticks, - const string_vector& ticklabels, - double lim1, double lim2, - double p1, double p2, - int xyz, int ha, int va, - int& wmax, int& hmax); + virtual void render_ticktexts (const Matrix& ticks, + const string_vector& ticklabels, + double lim1, double lim2, + double p1, double p2, + int xyz, int ha, int va, + int& wmax, int& hmax); - virtual void draw_zoom_rect (int x1, int y1, int x2, int y2); + virtual void draw_zoom_rect (int x1, int y1, int x2, int y2); - //-------- + //-------- - opengl_functions& m_glfcns; + 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; + // 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; + // Factor used for translating Octave pixels to actual device pixels + double m_devpixratio; - // axes transformation data - graphics_xform m_xform; + // axes transformation data + graphics_xform m_xform; - private: +private: - class patch_tessellator; + class patch_tessellator; - void init_maxlights (void); + void init_maxlights (void); - std::string get_string (unsigned int id) const; + std::string get_string (unsigned int id) const; - bool is_nan_or_inf (double x, double y, double z) const - { - return (math::isnan (x) || math::isnan (y) - || math::isnan (z) - || math::isinf (x) || math::isinf (y) - || math::isinf (z)); - } + bool is_nan_or_inf (double x, double y, double z) const + { + return (math::isnan (x) || math::isnan (y) + || math::isnan (z) + || math::isinf (x) || math::isinf (y) + || math::isinf (z)); + } - uint8_t clip_code (double x, double y, double z) const - { - return ((x < m_xmin ? 1 : 0) - | (x > m_xmax ? 1 : 0) << 1 - | (y < m_ymin ? 1 : 0) << 2 - | (y > m_ymax ? 1 : 0) << 3 - | (z < m_zmin ? 1 : 0) << 4 - | (z > m_zmax ? 1 : 0) << 5 - | (is_nan_or_inf (x, y, z) ? 0 : 1) << 6); - } + uint8_t clip_code (double x, double y, double z) const + { + return ((x < m_xmin ? 1 : 0) + | (x > m_xmax ? 1 : 0) << 1 + | (y < m_ymin ? 1 : 0) << 2 + | (y > m_ymax ? 1 : 0) << 3 + | (z < m_zmin ? 1 : 0) << 4 + | (z > m_zmax ? 1 : 0) << 5 + | (is_nan_or_inf (x, y, z) ? 0 : 1) << 6); + } - void render_text (uint8NDArray pixels, Matrix bbox, - double x, double y, double z, double rotation); + void render_text (uint8NDArray pixels, Matrix bbox, + double x, double y, double z, double rotation); - void set_normal (int bfl_mode, const NDArray& n, int j, int i); + void set_normal (int bfl_mode, const NDArray& n, int j, int i); - void set_ortho_coordinates (void); + void set_ortho_coordinates (void); - void restore_previous_coordinates (void); + void restore_previous_coordinates (void); - double points_to_pixels (const double val) const; + double points_to_pixels (const double val) const; - unsigned int make_marker_list (const std::string& m, double size, - bool filled) const; + unsigned int make_marker_list (const std::string& m, double size, + bool filled) const; - void draw_axes_planes (const axes::properties& props); - void draw_axes_boxes (const axes::properties& props); + void draw_axes_planes (const axes::properties& props); + void draw_axes_boxes (const axes::properties& props); - void draw_axes_grids (const axes::properties& props); - void draw_axes_x_grid (const axes::properties& props); - void draw_axes_y_grid (const axes::properties& props); - void draw_axes_z_grid (const axes::properties& props); + void draw_axes_grids (const axes::properties& props); + void draw_axes_x_grid (const axes::properties& props); + void draw_axes_y_grid (const axes::properties& props); + void draw_axes_z_grid (const axes::properties& props); - void draw_axes_children (const axes::properties& props); + void draw_axes_children (const axes::properties& props); - void draw_all_lights (const base_properties& props, - std::list<graphics_object>& obj_list); + void draw_all_lights (const base_properties& props, + std::list<graphics_object>& obj_list); - void draw_texture_image (const octave_value cdata, - Matrix x, Matrix y, bool ortho = false); + void draw_texture_image (const octave_value cdata, + Matrix x, Matrix y, bool ortho = false); - //-------- + //-------- - // The graphics m_toolkit associated with the figure being rendered. - graphics_toolkit m_toolkit; + // The graphics m_toolkit associated with the figure being rendered. + graphics_toolkit m_toolkit; - // Z projection limits in windows coordinate - double m_xZ1, m_xZ2; + // Z projection limits in windows coordinate + double m_xZ1, m_xZ2; - // call lists identifiers for markers - unsigned int m_marker_id, m_filled_marker_id; + // call lists identifiers for markers + unsigned int m_marker_id, m_filled_marker_id; - // camera information for primitive sorting and lighting - ColumnVector m_camera_pos, m_camera_dir, m_view_vector; + // camera information for primitive sorting and lighting + ColumnVector m_camera_pos, m_camera_dir, m_view_vector; - // interpreter to be used by text_to_pixels - caseless_str m_interpreter; + // interpreter to be used by text_to_pixels + caseless_str m_interpreter; - text_renderer m_txt_renderer; + text_renderer m_txt_renderer; - // light object present and visible - unsigned int m_current_light; - unsigned int m_max_lights; + // light object present and visible + unsigned int m_current_light; + unsigned int m_max_lights; - // Indicate we are drawing for selection purpose - bool m_selecting; + // Indicate we are drawing for selection purpose + bool m_selecting; - // Indicate we are drawing for printing purpose - bool m_printing; - }; + // Indicate we are drawing for printing purpose + bool m_printing; +}; OCTAVE_END_NAMESPACE(octave)