octave: libinterp/corefcn/gl-render.cc annotate

annotate libinterp/corefcn/gl-render.cc @ 25998:8d2b3e3ff182

print.m: Implement "-opengl", "-painters" and "-RGBImage" options (bug #52866) * __print_parse_opt__: add "rgb_ouput" and "renderer" fields to option structure. Handle "opengl" renderer and use it for all raster outputs supported by imwrite and for "-RGBImage" option. * print.m (doc): Reorder options documentation and describe "-RGBImage". When the renderer is "opengl", change __device_pixel_ratio__ to draw the figure at the expected resolution and make use of getframe and eventually imwrite to produce an image file. * genpropdoc.m: Document "renderer" and "renderermode" figure properties. * NEWS: announce the addition of new option and the new behavior for raster formats. * geometryimages.m, interpimages.m, splineimages.m: Use the same size for all images in the manual. * graphics.cc (update_text_pos): Call axes::properties::sync_positions instead of individual label update methods. (axes::properties::get_extent): Scale the label extent in order to work with logical pixels. * GLCanvas.cc (GLCanvas::do_getPixels): When using a framebuffer object, scale its size with the __device_pixel_ratio__ and set the renderer's device_pixel_ration accordingly.

author	Pantxo Diribarne <pantxo.diribarne@gmail.com>
date	Thu, 01 Mar 2018 23:41:52 +0100
parents	221c039aa415
children	f5e08983d07c

rev	line source
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1 /*
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2
25054 6652d3823428 maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 24807 diff changeset	3 Copyright (C) 2008-2018 Michael Goffioul
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	4
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	5 This file is part of Octave.
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	6
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24523 diff changeset	7 Octave is free software: you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22740 diff changeset	8 under the terms of the GNU General Public License as published by
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24523 diff changeset	9 the Free Software Foundation, either version 3 of the License, or
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22740 diff changeset	10 (at your option) any later version.
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22740 diff changeset	11
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22740 diff changeset	12 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22740 diff changeset	13 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22740 diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22740 diff changeset	15 GNU General Public License for more details.
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	16
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	17 You should have received a copy of the GNU General Public License
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	18 along with Octave; see the file COPYING. If not, see
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24523 diff changeset	19 <https://www.gnu.org/licenses/>.
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	20
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	21 */
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	22
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21691 diff changeset	23 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21209 diff changeset	24 # include "config.h"
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	25 #endif
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	26
25438 cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25423 diff changeset	27 #include <sstream>
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	28
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21691 diff changeset	29 #if defined (HAVE_WINDOWS_H)
21200 fcac5dbbf9ed maint: Indent #ifdef blocks in libinterp. Rik <rik@octave.org> parents: 21198 diff changeset	30 # define WIN32_LEAN_AND_MEAN
fcac5dbbf9ed maint: Indent #ifdef blocks in libinterp. Rik <rik@octave.org> parents: 21198 diff changeset	31 # include <windows.h>
21196 bd96c2efd4fe move include statements for OpenGL headers to a single file John W. Eaton <jwe@octave.org> parents: 21115 diff changeset	32 #endif
bd96c2efd4fe move include statements for OpenGL headers to a single file John W. Eaton <jwe@octave.org> parents: 21115 diff changeset	33
23479 06bf3a0b08bf maint: Use "" instead of <> for our own include files. John W. Eaton <jwe@octave.org> parents: 23450 diff changeset	34 #include "lo-mappers.h"
8377 25bc2d31e1bf improve OCTAVE_LOCAL_BUFFER Jaroslav Hajek <highegg@gmail.com> parents: 8263 diff changeset	35 #include "oct-locbuf.h"
13985 43cc49c7abd1 Use thread-safe atomic reference counting (GCC and MSVC). Michael Goffioul <michael.goffioul@gmail.com> parents: 13961 diff changeset	36 #include "oct-refcount.h"
21115 629643522cc0 include errwarn.h in all files that use gripe_disabled_feature John W. Eaton <jwe@octave.org> parents: 21109 diff changeset	37
629643522cc0 include errwarn.h in all files that use gripe_disabled_feature John W. Eaton <jwe@octave.org> parents: 21109 diff changeset	38 #include "errwarn.h"
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	39 #include "gl-render.h"
21196 bd96c2efd4fe move include statements for OpenGL headers to a single file John W. Eaton <jwe@octave.org> parents: 21115 diff changeset	40 #include "oct-opengl.h"
21209 67d2965af0b5 revamp text rendering classes John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	41 #include "text-renderer.h"
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	42
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	43 namespace octave
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	44 {
24725 edef866fba7b * gl-render.cc: Fix compilation error when HAVE_OPENGL is not defined. John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	45 #if defined (HAVE_OPENGL)
edef866fba7b * gl-render.cc: Fix compilation error when HAVE_OPENGL is not defined. John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	46
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	47 static int
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	48 next_power_of_2 (int n)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	49 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	50 int m = 1;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	51
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	52 while (m < n && m < std::numeric_limits<int>::max ())
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	53 m <<= 1;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	54
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	55 return m;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	56 }
22393 026067ffcf66 fix build with minimal dependencies John W. Eaton <jwe@octave.org> parents: 22391 diff changeset	57
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	58 #define LIGHT_MODE GL_FRONT_AND_BACK
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	59
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	60 // Use symbolic names for axes
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	61 enum
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	62 {
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	63 X_AXIS,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	64 Y_AXIS,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	65 Z_AXIS
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	66 };
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	67
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	68 // Use symbolic names for color mode
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	69 enum
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	70 {
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	71 UNIFORM,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	72 FLAT,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	73 INTERP,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	74 TEXTURE
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	75 };
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	76
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	77 // Use symbolic names for lighting
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	78 enum
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	79 {
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	80 NONE,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	81 //FLAT, // Already declared in anonymous enum for color mode
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	82 GOURAUD = 2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	83 };
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	84
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	85 // Win32 API requires the CALLBACK attributes for
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	86 // GLU callback functions. Define it to empty on
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	87 // other platforms.
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21691 diff changeset	88 #if ! defined (CALLBACK)
21200 fcac5dbbf9ed maint: Indent #ifdef blocks in libinterp. Rik <rik@octave.org> parents: 21198 diff changeset	89 # define CALLBACK
7833 8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	90 #endif
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	91
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	92 class
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	93 opengl_texture
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	94 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	95 protected:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	96 class texture_rep
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	97 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	98 public:
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	99 texture_rep (opengl_functions& glfcns)
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	100 : m_glfcns (glfcns), id (), w (), h (), tw (), th (), tx (), ty (),
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	101 valid (false), count (1)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	102 { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	103
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	104 texture_rep (opengl_functions& glfcns, GLuint id_arg,
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	105 int w_arg, int h_arg, int tw_arg, int th_arg)
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	106 : m_glfcns (glfcns), id (id_arg), w (w_arg), h (h_arg),
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	107 tw (tw_arg), th (th_arg), tx (double(w)/tw), ty (double(h)/th),
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	108 valid (true), count (1)
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	109 { }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	110
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	111 ~texture_rep (void)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	112 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	113 if (valid)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	114 m_glfcns.glDeleteTextures (1, &id);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	115 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	116
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	117 void bind (int mode) const
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	118 { if (valid) m_glfcns.glBindTexture (mode, id); }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	119
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	120 void tex_coord (double q, double r) const
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	121 { if (valid) m_glfcns.glTexCoord2d (qtx, rty); }
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	122
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	123 opengl_functions& m_glfcns;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	124 GLuint id;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	125 int w, h;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	126 int tw, th;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	127 double tx, ty;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	128 bool valid;
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	129 refcount<int> count;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	130 };
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	131
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	132 texture_rep *rep;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	133
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	134 private:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	135 opengl_texture (texture_rep *_rep) : rep (_rep) { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	136
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	137 public:
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	138 opengl_texture (opengl_functions& glfcns)
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	139 : rep (new texture_rep (glfcns)) { }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	140
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	141 opengl_texture (const opengl_texture& tx)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	142 : rep (tx.rep)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	143 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	144 rep->count++;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	145 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	146
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	147 ~opengl_texture (void)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	148 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	149 if (--rep->count == 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	150 delete rep;
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	151 }
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	152
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	153 opengl_texture& operator = (const opengl_texture& tx)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	154 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	155 if (--rep->count == 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	156 delete rep;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	157
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	158 rep = tx.rep;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	159 rep->count++;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	160
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	161 return *this;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	162 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	163
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	164 static opengl_texture create (opengl_functions& glfcns,
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	165 const octave_value& data);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	166
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	167 void bind (int mode = GL_TEXTURE_2D) const
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	168 { rep->bind (mode); }
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	169
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	170 void tex_coord (double q, double r) const
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	171 { rep->tex_coord (q, r); }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	172
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	173 bool is_valid (void) const
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	174 { return rep->valid; }
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	175 };
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	176
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	177 opengl_texture
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	178 opengl_texture::create (opengl_functions& glfcns, const octave_value& data)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	179 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	180 opengl_texture retval (glfcns);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	181
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	182 dim_vector dv (data.dims ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	183
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	184 // Expect RGB data
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	185 if (dv.ndims () == 3 && dv(2) == 3)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	186 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	187 // FIXME: dim_vectors hold octave_idx_type values.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	188 // Should we check for dimensions larger than intmax?
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	189 int h, w, tw, th;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	190 h = dv(0), w = dv(1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	191 GLuint id;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	192 bool ok = true;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	193
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	194 tw = next_power_of_2 (w);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	195 th = next_power_of_2 (h);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	196
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	197 glfcns.glGenTextures (1, &id);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	198 glfcns.glBindTexture (GL_TEXTURE_2D, id);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	199
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	200 if (data.is_double_type ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	201 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	202 const NDArray xdata = data.array_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	203
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	204 OCTAVE_LOCAL_BUFFER (float, a, (3twth));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	205
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	206 for (int i = 0; i < h; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	207 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	208 for (int j = 0, idx = itw3; j < w; j++, idx += 3)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	209 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	210 a[idx] = xdata(i,j,0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	211 a[idx+1] = xdata(i,j,1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	212 a[idx+2] = xdata(i,j,2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	213 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	214 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	215
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	216 glfcns.glTexImage2D (GL_TEXTURE_2D, 0, 3, tw, th, 0, GL_RGB, GL_FLOAT, a);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	217 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	218 else if (data.is_uint8_type ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	219 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	220 const uint8NDArray xdata = data.uint8_array_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	221
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	222 OCTAVE_LOCAL_BUFFER (octave_uint8, a, (3twth));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	223
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	224 for (int i = 0; i < h; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	225 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	226 for (int j = 0, idx = itw3; j < w; j++, idx += 3)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	227 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	228 a[idx] = xdata(i,j,0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	229 a[idx+1] = xdata(i,j,1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	230 a[idx+2] = xdata(i,j,2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	231 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	232 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	233
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	234 glfcns.glTexImage2D (GL_TEXTURE_2D, 0, 3, tw, th, 0,
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	235 GL_RGB, GL_UNSIGNED_BYTE, a);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	236 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	237 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	238 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	239 ok = false;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	240 warning ("opengl_texture::create: invalid texture data type (double or uint8 required)");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	241 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	242
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	243 if (ok)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	244 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	245 glfcns.glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	246 glfcns.glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	247
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	248 if (glfcns.glGetError () != GL_NO_ERROR)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	249 warning ("opengl_texture::create: OpenGL error while generating texture data");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	250 else
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	251 retval = opengl_texture (new texture_rep (glfcns, id, w, h, tw, th));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	252 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	253 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	254 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	255 warning ("opengl_texture::create: invalid texture data size");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	256
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	257 return retval;
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	258 }
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	259
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	260 class
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	261 opengl_tesselator
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	262 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	263 public:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	264 #if defined (HAVE_FRAMEWORK_OPENGL) && defined (HAVE_GLUTESSCALLBACK_THREEDOTS)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	265 typedef GLvoid (CALLBACK *fcn) (...);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	266 #else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	267 typedef void (CALLBACK *fcn) (void);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	268 #endif
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	269
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	270 public:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	271
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23696 diff changeset	272 opengl_tesselator (void) : glu_tess (nullptr), fill () { init (); }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	273
22869 f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	274 // No copying!
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	275
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	276 opengl_tesselator (const opengl_tesselator&) = delete;
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	277
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	278 opengl_tesselator operator = (const opengl_tesselator&) = delete;
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	279
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	280 virtual ~opengl_tesselator (void)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	281 { if (glu_tess) gluDeleteTess (glu_tess); }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	282
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	283 void begin_polygon (bool filled = true)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	284 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	285 gluTessProperty (glu_tess, GLU_TESS_BOUNDARY_ONLY,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	286 (filled ? GL_FALSE : GL_TRUE));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	287 fill = filled;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	288 gluTessBeginPolygon (glu_tess, this);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	289 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	290
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	291 void end_polygon (void) const
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	292 { gluTessEndPolygon (glu_tess); }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	293
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	294 void begin_contour (void) const
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	295 { gluTessBeginContour (glu_tess); }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	296
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	297 void end_contour (void) const
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	298 { gluTessEndContour (glu_tess); }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	299
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	300 void add_vertex (double loc, void data) const
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	301 { gluTessVertex (glu_tess, loc, data); }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	302
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	303 protected:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	304 virtual void begin (GLenum /type/) { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	305
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	306 virtual void end (void) { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	307
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	308 virtual void vertex (void * /data/) { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	309
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	310 virtual void combine (GLdouble [3] /c/, void * [4] /data/,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	311 GLfloat [4] /w/, void ** /out_data/) { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	312
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	313 virtual void edge_flag (GLboolean /flag/) { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	314
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	315 virtual void error (GLenum err)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	316 { ::error ("OpenGL tesselation error (%d)", err); }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	317
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	318 virtual void init (void)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	319 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	320 glu_tess = gluNewTess ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	321
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	322 gluTessCallback (glu_tess, GLU_TESS_BEGIN_DATA,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	323 reinterpret_cast<fcn> (tess_begin));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	324 gluTessCallback (glu_tess, GLU_TESS_END_DATA,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	325 reinterpret_cast<fcn> (tess_end));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	326 gluTessCallback (glu_tess, GLU_TESS_VERTEX_DATA,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	327 reinterpret_cast<fcn> (tess_vertex));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	328 gluTessCallback (glu_tess, GLU_TESS_COMBINE_DATA,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	329 reinterpret_cast<fcn> (tess_combine));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	330 gluTessCallback (glu_tess, GLU_TESS_EDGE_FLAG_DATA,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	331 reinterpret_cast<fcn> (tess_edge_flag));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	332 gluTessCallback (glu_tess, GLU_TESS_ERROR_DATA,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	333 reinterpret_cast<fcn> (tess_error));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	334 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	335
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	336 bool is_filled (void) const { return fill; }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	337
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	338 private:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	339 static void CALLBACK tess_begin (GLenum type, void *t)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	340 { reinterpret_cast<opengl_tesselator *> (t)->begin (type); }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	341
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	342 static void CALLBACK tess_end (void *t)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	343 { reinterpret_cast<opengl_tesselator *> (t)->end (); }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	344
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	345 static void CALLBACK tess_vertex (void v, void t)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	346 { reinterpret_cast<opengl_tesselator *> (t)->vertex (v); }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	347
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	348 static void CALLBACK tess_combine (GLdouble c[3], void *v[4], GLfloat w[4],
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	349 void *out, void t)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	350 { reinterpret_cast<opengl_tesselator *> (t)->combine (c, v, w, out); }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	351
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	352 static void CALLBACK tess_edge_flag (GLboolean flag, void *t)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	353 { reinterpret_cast<opengl_tesselator *> (t)->edge_flag (flag); }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	354
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	355 static void CALLBACK tess_error (GLenum err, void *t)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	356 { reinterpret_cast<opengl_tesselator *> (t)->error (err); }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	357
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	358 private:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	359
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	360 GLUtesselator *glu_tess;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	361 bool fill;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	362 };
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	363
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	364 class
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	365 vertex_data
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	366 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	367 public:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	368 class vertex_data_rep
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	369 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	370 public:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	371 Matrix coords;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	372 Matrix color;
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	373 Matrix vertex_normal;
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	374 Matrix face_normal;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	375 double alpha;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	376 float ambient;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	377 float diffuse;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	378 float specular;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	379 float specular_exp;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	380 float specular_color_refl;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	381
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	382 // reference counter
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	383 refcount<int> count;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	384
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	385 vertex_data_rep (void)
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	386 : coords (), color (), vertex_normal (), face_normal (), alpha (),
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	387 ambient (), diffuse (), specular (), specular_exp (),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	388 specular_color_refl (), count (1) { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	389
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	390 vertex_data_rep (const Matrix& c, const Matrix& col, const Matrix& vn,
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	391 const Matrix& fn, double a, float as, float ds, float ss,
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	392 float se, float scr)
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	393 : coords (c), color (col), vertex_normal (vn), face_normal (fn),
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	394 alpha (a), ambient (as), diffuse (ds), specular (ss),
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	395 specular_exp (se), specular_color_refl (scr), count (1) { }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	396 };
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	397
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	398 private:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	399 vertex_data_rep *rep;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	400
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23433 diff changeset	401 vertex_data_rep * nil_rep (void) const
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	402 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	403 static vertex_data_rep *nr = new vertex_data_rep ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	404
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	405 return nr;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	406 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	407
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	408 public:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	409 vertex_data (void) : rep (nil_rep ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	410 { rep->count++; }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	411
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	412 vertex_data (const vertex_data& v) : rep (v.rep)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	413 { rep->count++; }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	414
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	415 vertex_data (const Matrix& c, const Matrix& col, const Matrix& vn,
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	416 const Matrix& fn, double a, float as, float ds, float ss,
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	417 float se, float scr)
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	418 : rep (new vertex_data_rep (c, col, vn, fn, a, as, ds, ss, se, scr))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	419 { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	420
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	421 vertex_data (vertex_data_rep *new_rep)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	422 : rep (new_rep) { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	423
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	424 ~vertex_data (void)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	425 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	426 if (--rep->count == 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	427 delete rep;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	428 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	429
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	430 vertex_data& operator = (const vertex_data& v)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	431 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	432 if (--rep->count == 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	433 delete rep;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	434
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	435 rep = v.rep;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	436 rep->count++;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	437
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	438 return *this;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	439 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	440
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23433 diff changeset	441 vertex_data_rep * get_rep (void) const { return rep; }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	442 };
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	443
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	444 class
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	445 opengl_renderer::patch_tesselator : public opengl_tesselator
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	446 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	447 public:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	448 patch_tesselator (opengl_renderer *r, int cmode, int lmode, float idx = 0.0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	449 : opengl_tesselator (), renderer (r),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	450 color_mode (cmode), light_mode (lmode), index (idx),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	451 first (true), tmp_vdata ()
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	452 { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	453
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	454 protected:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	455 void begin (GLenum type)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	456 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	457 opengl_functions& glfcns = renderer->get_opengl_functions ();
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	458
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	459 //printf ("patch_tesselator::begin (%d)\n", type);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	460 first = true;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	461
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	462 if (color_mode == INTERP \|\| light_mode == GOURAUD)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	463 glfcns.glShadeModel (GL_SMOOTH);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	464 else
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	465 glfcns.glShadeModel (GL_FLAT);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	466
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	467 if (is_filled ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	468 renderer->set_polygon_offset (true, index);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	469
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	470 glfcns.glBegin (type);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	471 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	472
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	473 void end (void)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	474 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	475 opengl_functions& glfcns = renderer->get_opengl_functions ();
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	476
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	477 //printf ("patch_tesselator::end\n");
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	478 glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	479 renderer->set_polygon_offset (false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	480 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	481
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	482 void vertex (void *data)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	483 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	484 opengl_functions& glfcns = renderer->get_opengl_functions ();
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	485
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	486 vertex_data::vertex_data_rep *v
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	487 = reinterpret_cast<vertex_data::vertex_data_rep *> (data);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	488 //printf ("patch_tesselator::vertex (%g, %g, %g)\n", v->coords(0), v->coords(1), v->coords(2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	489
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	490 // NOTE: OpenGL can re-order vertices. For "flat" coloring of FaceColor
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	491 // the first vertex must be identified in the draw_patch routine.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	492
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	493 if (color_mode == INTERP \|\| (color_mode == FLAT && ! is_filled ()))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	494 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	495 Matrix col = v->color;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	496
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	497 if (col.numel () == 3)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	498 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	499 glfcns.glColor4d (col(0), col(1), col(2), v->alpha);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	500 if (light_mode > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	501 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	502 float buf[4] = { 0, 0, 0, 1 };
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	503
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	504 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	505 buf[k] = (v->ambient * col(k));
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	506 glfcns.glMaterialfv (LIGHT_MODE, GL_AMBIENT, buf);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	507
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	508 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	509 buf[k] = (v->diffuse * col(k));
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	510 glfcns.glMaterialfv (LIGHT_MODE, GL_DIFFUSE, buf);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	511
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	512 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	513 buf[k] = v->specular * (v->specular_color_refl +
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	514 (1 - v->specular_color_refl) * col(k));
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	515 glfcns.glMaterialfv (LIGHT_MODE, GL_SPECULAR, buf);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	516
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	517 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	518 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	519 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	520
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	521 if (light_mode == FLAT && first)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	522 glfcns.glNormal3dv (v->face_normal.data ());
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	523 else if (light_mode == GOURAUD)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	524 glfcns.glNormal3dv (v->vertex_normal.data ());
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	525
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	526 glfcns.glVertex3dv (v->coords.data ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	527
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	528 first = false;
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	529 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	530
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	531 void combine (GLdouble xyz[3], void data[4], GLfloat w[4], void *out_data)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	532 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	533 //printf ("patch_tesselator::combine\n");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	534
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	535 vertex_data::vertex_data_rep *v[4];
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	536 int vmax = 4;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	537
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	538 for (int i = 0; i < 4; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	539 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	540 v[i] = reinterpret_cast<vertex_data::vertex_data_rep *> (data[i]);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	541
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	542 if (vmax == 4 && ! v[i])
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	543 vmax = i;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	544 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	545
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	546 Matrix vv (1, 3, 0.0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	547 Matrix cc;
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	548 Matrix vnn (1, 3, 0.0);
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	549 Matrix fnn (1, 3, 0.0);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	550 double aa = 0.0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	551
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	552 vv(0) = xyz[0];
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	553 vv(1) = xyz[1];
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	554 vv(2) = xyz[2];
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	555
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	556 if (v[0]->color.numel ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	557 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	558 cc.resize (1, 3, 0.0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	559 for (int ic = 0; ic < 3; ic++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	560 for (int iv = 0; iv < vmax; iv++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	561 cc(ic) += (w[iv] * v[iv]->color (ic));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	562 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	563
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	564 if (v[0]->vertex_normal.numel () > 0)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	565 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	566 for (int in = 0; in < 3; in++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	567 for (int iv = 0; iv < vmax; iv++)
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	568 vnn(in) += (w[iv] * v[iv]->vertex_normal (in));
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	569 }
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	570
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	571 if (v[0]->face_normal.numel () > 0)
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	572 {
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	573 for (int in = 0; in < 3; in++)
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	574 for (int iv = 0; iv < vmax; iv++)
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	575 fnn(in) += (w[iv] * v[iv]->face_normal (in));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	576 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	577
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	578 for (int iv = 0; iv < vmax; iv++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	579 aa += (w[iv] * v[iv]->alpha);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	580
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	581 vertex_data new_v (vv, cc, vnn, fnn, aa, v[0]->ambient, v[0]->diffuse,
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	582 v[0]->specular, v[0]->specular_exp,
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	583 v[0]->specular_color_refl);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	584 tmp_vdata.push_back (new_v);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	585
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	586 *out_data = new_v.get_rep ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	587 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	588
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	589 private:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	590
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	591 // No copying!
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	592
22865 89756f2f085b use c++11 style for deleting default copy constructor and assignment operator John W. Eaton <jwe@octave.org> parents: 22838 diff changeset	593 patch_tesselator (const patch_tesselator&) = delete;
89756f2f085b use c++11 style for deleting default copy constructor and assignment operator John W. Eaton <jwe@octave.org> parents: 22838 diff changeset	594
89756f2f085b use c++11 style for deleting default copy constructor and assignment operator John W. Eaton <jwe@octave.org> parents: 22838 diff changeset	595 patch_tesselator& operator = (const patch_tesselator&) = delete;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	596
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	597 opengl_renderer *renderer;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	598 int color_mode;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	599 int light_mode;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	600 int index;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	601 bool first;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	602 std::list<vertex_data> tmp_vdata;
7833 8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	603 };
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	604
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	605 #else
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	606
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	607 class
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	608 opengl_renderer::patch_tesselator
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	609 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	610 // Dummy class.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	611 };
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	612
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	613 #endif
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	614
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	615 opengl_renderer::opengl_renderer (opengl_functions& glfcns)
25889 2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	616 : m_glfcns (glfcns), toolkit (), xform (), xmin (), xmax (), ymin (),
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	617 ymax (), zmin (), zmax (), xZ1 (), xZ2 (), marker_id (),
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	618 filled_marker_id (), camera_pos (), camera_dir (), view_vector (),
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	619 interpreter ("none"), txt_renderer (), m_current_light (0),
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	620 m_max_lights (0), selecting (false), m_devpixratio (1.)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	621 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	622 // This constructor will fail if we don't have OpenGL or if the data
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	623 // types we assumed in our public interface aren't compatible with the
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	624 // OpenGL types.
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	625
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	626 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	627
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	628 // Ensure that we can't request an image larger than OpenGL can handle.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	629 // FIXME: should we check signed vs. unsigned?
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	630
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	631 static bool ok = (sizeof (int) <= sizeof (GLsizei));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	632
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	633 if (! ok)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	634 error ("the size of GLsizei is smaller than the size of int");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	635
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	636 #else
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	637
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	638 err_disabled_feature ("opengl_renderer", "OpenGL");
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	639
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	640 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	641 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	642
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	643 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	644 opengl_renderer::draw (const graphics_object& go, bool toplevel)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	645 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	646 if (! go.valid_object ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	647 return;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	648
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	649 const base_properties& props = go.get_properties ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	650
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	651 if (! toolkit)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	652 toolkit = props.get_toolkit ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	653
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	654 if (go.isa ("figure"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	655 draw_figure (dynamic_cast<const figure::properties&> (props));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	656 else if (go.isa ("axes"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	657 draw_axes (dynamic_cast<const axes::properties&> (props));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	658 else if (go.isa ("line"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	659 draw_line (dynamic_cast<const line::properties&> (props));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	660 else if (go.isa ("surface"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	661 draw_surface (dynamic_cast<const surface::properties&> (props));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	662 else if (go.isa ("patch"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	663 draw_patch (dynamic_cast<const patch::properties&> (props));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	664 else if (go.isa ("light"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	665 draw_light (dynamic_cast<const light::properties&> (props));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	666 else if (go.isa ("hggroup"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	667 draw_hggroup (dynamic_cast<const hggroup::properties&> (props));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	668 else if (go.isa ("text"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	669 draw_text (dynamic_cast<const text::properties&> (props));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	670 else if (go.isa ("image"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	671 draw_image (dynamic_cast<const image::properties&> (props));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	672 else if (go.isa ("uimenu") \|\| go.isa ("uicontrol")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	673 \|\| go.isa ("uicontextmenu") \|\| go.isa ("uitoolbar")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	674 \|\| go.isa ("uipushtool") \|\| go.isa ("uitoggletool"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	675 ; // SKIP
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	676 else if (go.isa ("uipanel"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	677 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	678 if (toplevel)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	679 draw_uipanel (dynamic_cast<const uipanel::properties&> (props), go);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	680 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	681 else if (go.isa ("uibuttongroup"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	682 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	683 if (toplevel)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	684 draw_uibuttongroup (dynamic_cast<const uibuttongroup::properties&> (props), go);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	685 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	686 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	687 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	688 warning ("opengl_renderer: cannot render object of type '%s'",
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	689 props.graphics_object_name ().c_str ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	690 }
22494 3564b6b6b8d1 Query OpenGL errors on initialization of GL context (bug #45542). Markus Mützel <markus.muetzel@gmx.de> parents: 22407 diff changeset	691
22500 1d3b71530539 fix compilation of gl-render.cc if OpenGL is missing John W. Eaton <jwe@octave.org> parents: 22494 diff changeset	692 #if defined (HAVE_OPENGL)
1d3b71530539 fix compilation of gl-render.cc if OpenGL is missing John W. Eaton <jwe@octave.org> parents: 22494 diff changeset	693
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	694 GLenum gl_error = m_glfcns.glGetError ();
22494 3564b6b6b8d1 Query OpenGL errors on initialization of GL context (bug #45542). Markus Mützel <markus.muetzel@gmx.de> parents: 22407 diff changeset	695 if (gl_error)
23042 c2ed86feba05 gl-render.cc: Show OpenGL error also as string Andreas Weber <andy.weber.aw@gmail.com> parents: 23012 diff changeset	696 warning ("opengl_renderer: Error '%s' (%d) occurred drawing '%s' object",
c2ed86feba05 gl-render.cc: Show OpenGL error also as string Andreas Weber <andy.weber.aw@gmail.com> parents: 23012 diff changeset	697 gluErrorString (gl_error), gl_error, props.graphics_object_name ().c_str ());
22500 1d3b71530539 fix compilation of gl-render.cc if OpenGL is missing John W. Eaton <jwe@octave.org> parents: 22494 diff changeset	698
1d3b71530539 fix compilation of gl-render.cc if OpenGL is missing John W. Eaton <jwe@octave.org> parents: 22494 diff changeset	699 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	700 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	701
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	702 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	703 opengl_renderer::draw_figure (const figure::properties& props)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	704 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	705 // Initialize OpenGL context
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	706
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	707 init_gl_context (props.is_graphicssmoothing (), props.get_color_rgb ());
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	708
21689 9467549bd5ff * gl-render.cc: Allow compilation without OPENGL. John W. Eaton <jwe@octave.org> parents: 21684 diff changeset	709 #if defined (HAVE_OPENGL)
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	710
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	711 props.set___gl_extensions__ (get_string (GL_EXTENSIONS));
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	712 props.set___gl_renderer__ (get_string (GL_RENDERER));
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	713 props.set___gl_vendor__ (get_string (GL_VENDOR));
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	714 props.set___gl_version__ (get_string (GL_VERSION));
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	715
21689 9467549bd5ff * gl-render.cc: Allow compilation without OPENGL. John W. Eaton <jwe@octave.org> parents: 21684 diff changeset	716 #endif
21684 1449e3b98941 store OpenGL version info in figure properties John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	717
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	718 // Draw children
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	719
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	720 draw (props.get_all_children (), false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	721 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	722
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	723 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	724 opengl_renderer::draw_uipanel (const uipanel::properties& props,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	725 const graphics_object& go)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	726 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	727 graphics_object fig = go.get_ancestor ("figure");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	728 const figure::properties& figProps =
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	729 dynamic_cast<const figure::properties&> (fig.get_properties ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	730
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	731 // Initialize OpenGL context
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	732
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	733 init_gl_context (figProps.is_graphicssmoothing (),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	734 props.get_backgroundcolor_rgb ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	735
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	736 // Draw children
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	737
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	738 draw (props.get_all_children (), false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	739 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	740
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	741 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	742 opengl_renderer::draw_uibuttongroup (const uibuttongroup::properties& props,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	743 const graphics_object& go)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	744 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	745 graphics_object fig = go.get_ancestor ("figure");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	746 const figure::properties& figProps =
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	747 dynamic_cast<const figure::properties&> (fig.get_properties ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	748
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	749 // Initialize OpenGL context
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	750
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	751 init_gl_context (figProps.is_graphicssmoothing (),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	752 props.get_backgroundcolor_rgb ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	753
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	754 // Draw children
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	755
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	756 draw (props.get_all_children (), false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	757 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	758
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	759 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	760 opengl_renderer::init_gl_context (bool enhanced, const Matrix& c)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	761 {
21689 9467549bd5ff * gl-render.cc: Allow compilation without OPENGL. John W. Eaton <jwe@octave.org> parents: 21684 diff changeset	762 #if defined (HAVE_OPENGL)
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	763
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	764 // Initialize OpenGL context
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	765
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	766 m_glfcns.glEnable (GL_DEPTH_TEST);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	767 m_glfcns.glDepthFunc (GL_LEQUAL);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	768 m_glfcns.glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	769 m_glfcns.glAlphaFunc (GL_GREATER, 0.0f);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	770 m_glfcns.glEnable (GL_NORMALIZE);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	771
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	772 if (enhanced)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	773 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	774 m_glfcns.glEnable (GL_BLEND);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	775 m_glfcns.glEnable (GL_MULTISAMPLE);
22494 3564b6b6b8d1 Query OpenGL errors on initialization of GL context (bug #45542). Markus Mützel <markus.muetzel@gmx.de> parents: 22407 diff changeset	776 bool has_multisample = false;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	777 if (! m_glfcns.glGetError ())
22494 3564b6b6b8d1 Query OpenGL errors on initialization of GL context (bug #45542). Markus Mützel <markus.muetzel@gmx.de> parents: 22407 diff changeset	778 {
3564b6b6b8d1 Query OpenGL errors on initialization of GL context (bug #45542). Markus Mützel <markus.muetzel@gmx.de> parents: 22407 diff changeset	779 GLint iMultiSample, iNumSamples;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	780 m_glfcns.glGetIntegerv (GL_SAMPLE_BUFFERS, &iMultiSample);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	781 m_glfcns.glGetIntegerv (GL_SAMPLES, &iNumSamples);
22494 3564b6b6b8d1 Query OpenGL errors on initialization of GL context (bug #45542). Markus Mützel <markus.muetzel@gmx.de> parents: 22407 diff changeset	782 if (iMultiSample == GL_TRUE && iNumSamples > 0)
3564b6b6b8d1 Query OpenGL errors on initialization of GL context (bug #45542). Markus Mützel <markus.muetzel@gmx.de> parents: 22407 diff changeset	783 has_multisample = true;
3564b6b6b8d1 Query OpenGL errors on initialization of GL context (bug #45542). Markus Mützel <markus.muetzel@gmx.de> parents: 22407 diff changeset	784 }
3564b6b6b8d1 Query OpenGL errors on initialization of GL context (bug #45542). Markus Mützel <markus.muetzel@gmx.de> parents: 22407 diff changeset	785
3564b6b6b8d1 Query OpenGL errors on initialization of GL context (bug #45542). Markus Mützel <markus.muetzel@gmx.de> parents: 22407 diff changeset	786 if (! has_multisample)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	787 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	788 // MultiSample not implemented. Use old-style anti-aliasing
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	789 m_glfcns.glDisable (GL_MULTISAMPLE);
22494 3564b6b6b8d1 Query OpenGL errors on initialization of GL context (bug #45542). Markus Mützel <markus.muetzel@gmx.de> parents: 22407 diff changeset	790 // Disabling GL_MULTISAMPLE will raise a gl error if it is not
3564b6b6b8d1 Query OpenGL errors on initialization of GL context (bug #45542). Markus Mützel <markus.muetzel@gmx.de> parents: 22407 diff changeset	791 // implemented. Thus, call glGetError to reset the error state.
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	792 m_glfcns.glGetError ();
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	793
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	794 m_glfcns.glEnable (GL_LINE_SMOOTH);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	795 m_glfcns.glHint (GL_LINE_SMOOTH_HINT, GL_NICEST);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	796 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	797 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	798 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	799 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	800 m_glfcns.glDisable (GL_BLEND);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	801 m_glfcns.glDisable (GL_LINE_SMOOTH);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	802 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	803
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	804 // Clear background
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	805
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	806 if (c.numel () >= 3)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	807 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	808 m_glfcns.glClearColor (c(0), c(1), c(2), 1);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	809 m_glfcns.glClear (GL_COLOR_BUFFER_BIT \| GL_DEPTH_BUFFER_BIT);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	810 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	811
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	812 GLenum gl_error = m_glfcns.glGetError ();
22494 3564b6b6b8d1 Query OpenGL errors on initialization of GL context (bug #45542). Markus Mützel <markus.muetzel@gmx.de> parents: 22407 diff changeset	813 if (gl_error)
23042 c2ed86feba05 gl-render.cc: Show OpenGL error also as string Andreas Weber <andy.weber.aw@gmail.com> parents: 23012 diff changeset	814 warning ("opengl_renderer: Error '%s' (%d) occurred in init_gl_context",
c2ed86feba05 gl-render.cc: Show OpenGL error also as string Andreas Weber <andy.weber.aw@gmail.com> parents: 23012 diff changeset	815 gluErrorString (gl_error), gl_error);
22494 3564b6b6b8d1 Query OpenGL errors on initialization of GL context (bug #45542). Markus Mützel <markus.muetzel@gmx.de> parents: 22407 diff changeset	816
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	817 #else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	818
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	819 octave_unused_parameter (enhanced);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	820 octave_unused_parameter (c);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	821
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	822 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	823 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	824
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	825 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	826
21689 9467549bd5ff * gl-render.cc: Allow compilation without OPENGL. John W. Eaton <jwe@octave.org> parents: 21684 diff changeset	827 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	828 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	829
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	830 void
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	831 opengl_renderer::render_grid (const double linewidth,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	832 const std::string& gridstyle,
22347 2b1612cf38e4 gl-render.cc/.h: (minor)gridcolor and (minor)gridalpha for OpenGL toolkits (bug #48429) Markus Mützel <markus.muetzel@gmx.de> parents: 22331 diff changeset	833 const Matrix& gridcolor, const double gridalpha,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	834 const Matrix& ticks, double lim1, double lim2,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	835 double p1, double p1N, double p2, double p2N,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	836 int xyz, bool is_3D)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	837 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	838 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	839
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	840 m_glfcns.glColor4d (gridcolor(0), gridcolor(1), gridcolor(2), gridalpha);
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	841 set_linestyle (gridstyle, true, linewidth);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	842 m_glfcns.glBegin (GL_LINES);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	843 for (int i = 0; i < ticks.numel (); i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	844 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	845 double val = ticks(i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	846 if (lim1 <= val && val <= lim2)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	847 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	848 if (xyz == X_AXIS)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	849 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	850 m_glfcns.glVertex3d (val, p1N, p2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	851 m_glfcns.glVertex3d (val, p1, p2);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	852 if (is_3D)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	853 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	854 m_glfcns.glVertex3d (val, p1, p2N);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	855 m_glfcns.glVertex3d (val, p1, p2);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	856 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	857 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	858 else if (xyz == Y_AXIS)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	859 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	860 m_glfcns.glVertex3d (p1N, val, p2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	861 m_glfcns.glVertex3d (p1, val, p2);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	862 if (is_3D)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	863 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	864 m_glfcns.glVertex3d (p1, val, p2N);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	865 m_glfcns.glVertex3d (p1, val, p2);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	866 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	867 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	868 else if (xyz == Z_AXIS)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	869 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	870 m_glfcns.glVertex3d (p1N, p2, val);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	871 m_glfcns.glVertex3d (p1, p2, val);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	872 m_glfcns.glVertex3d (p1, p2N, val);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	873 m_glfcns.glVertex3d (p1, p2, val);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	874 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	875 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	876 }
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	877 m_glfcns.glEnd ();
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	878 set_linestyle ("-"); // Disable LineStipple
22347 2b1612cf38e4 gl-render.cc/.h: (minor)gridcolor and (minor)gridalpha for OpenGL toolkits (bug #48429) Markus Mützel <markus.muetzel@gmx.de> parents: 22331 diff changeset	879 double black[3] = {0, 0, 0};
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	880 m_glfcns.glColor3dv (black);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	881
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	882 #else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	883
22500 1d3b71530539 fix compilation of gl-render.cc if OpenGL is missing John W. Eaton <jwe@octave.org> parents: 22494 diff changeset	884 octave_unused_parameter (linewidth);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	885 octave_unused_parameter (gridstyle);
22347 2b1612cf38e4 gl-render.cc/.h: (minor)gridcolor and (minor)gridalpha for OpenGL toolkits (bug #48429) Markus Mützel <markus.muetzel@gmx.de> parents: 22331 diff changeset	886 octave_unused_parameter (gridcolor);
2b1612cf38e4 gl-render.cc/.h: (minor)gridcolor and (minor)gridalpha for OpenGL toolkits (bug #48429) Markus Mützel <markus.muetzel@gmx.de> parents: 22331 diff changeset	887 octave_unused_parameter (gridalpha);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	888 octave_unused_parameter (ticks);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	889 octave_unused_parameter (lim1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	890 octave_unused_parameter (lim2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	891 octave_unused_parameter (p1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	892 octave_unused_parameter (p1N);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	893 octave_unused_parameter (p2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	894 octave_unused_parameter (p2N);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	895 octave_unused_parameter (xyz);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	896 octave_unused_parameter (is_3D);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	897
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	898 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	899 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	900
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	901 panic_impossible ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	902
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	903 #endif
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	904 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	905
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	906 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	907 opengl_renderer::render_tickmarks (const Matrix& ticks,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	908 double lim1, double lim2,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	909 double p1, double p1N,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	910 double p2, double p2N,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	911 double dx, double dy, double dz,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	912 int xyz, bool mirror)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	913 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	914 #if defined (HAVE_OPENGL)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	915
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	916 m_glfcns.glBegin (GL_LINES);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	917
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	918 for (int i = 0; i < ticks.numel (); i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	919 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	920 double val = ticks(i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	921
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	922 if (lim1 <= val && val <= lim2)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	923 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	924 if (xyz == X_AXIS)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	925 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	926 m_glfcns.glVertex3d (val, p1, p2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	927 m_glfcns.glVertex3d (val, p1+dy, p2+dz);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	928 if (mirror)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	929 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	930 m_glfcns.glVertex3d (val, p1N, p2N);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	931 m_glfcns.glVertex3d (val, p1N-dy, p2N-dz);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	932 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	933 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	934 else if (xyz == Y_AXIS)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	935 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	936 m_glfcns.glVertex3d (p1, val, p2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	937 m_glfcns.glVertex3d (p1+dx, val, p2+dz);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	938 if (mirror)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	939 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	940 m_glfcns.glVertex3d (p1N, val, p2N);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	941 m_glfcns.glVertex3d (p1N-dx, val, p2N-dz);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	942 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	943 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	944 else if (xyz == Z_AXIS)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	945 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	946 m_glfcns.glVertex3d (p1, p2, val);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	947 m_glfcns.glVertex3d (p1+dx, p2+dy, val);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	948 if (mirror)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	949 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	950 m_glfcns.glVertex3d (p1N, p2N, val);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	951 m_glfcns.glVertex3d (p1N-dx, p2N-dy, val);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	952 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	953 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	954 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	955 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	956
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	957 m_glfcns.glEnd ();
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	958
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	959 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	960
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	961 octave_unused_parameter (ticks);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	962 octave_unused_parameter (lim1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	963 octave_unused_parameter (lim2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	964 octave_unused_parameter (p1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	965 octave_unused_parameter (p1N);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	966 octave_unused_parameter (p2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	967 octave_unused_parameter (p2N);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	968 octave_unused_parameter (dx);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	969 octave_unused_parameter (dy);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	970 octave_unused_parameter (dz);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	971 octave_unused_parameter (xyz);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	972 octave_unused_parameter (mirror);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	973
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	974 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	975 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	976
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	977 panic_impossible ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	978
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	979 #endif
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	980 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	981
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	982 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	983 opengl_renderer::render_ticktexts (const Matrix& ticks,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	984 const string_vector& ticklabels,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	985 double lim1, double lim2,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	986 double p1, double p2,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	987 int xyz, int ha, int va,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	988 int& wmax, int& hmax)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	989 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	990 #if defined (HAVE_OPENGL)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	991
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	992 int nticks = ticks.numel ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	993 int nlabels = ticklabels.numel ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	994
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	995 if (nlabels == 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	996 return;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	997
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	998 for (int i = 0; i < nticks; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	999 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1000 double val = ticks(i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1001
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1002 if (lim1 <= val && val <= lim2)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1003 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1004 Matrix b;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1005
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1006 std::string label (ticklabels(i % nlabels));
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23795 diff changeset	1007 label.erase (0, label.find_first_not_of (' '));
336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23795 diff changeset	1008 label = label.substr (0, label.find_last_not_of (' ')+1);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1009
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1010 // FIXME: As tick text is transparent, shouldn't it be
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1011 // drawn after axes object, for correct rendering?
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1012 if (xyz == X_AXIS)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1013 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1014 b = render_text (label, val, p1, p2, ha, va);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1015 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1016 else if (xyz == Y_AXIS)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1017 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1018 b = render_text (label, p1, val, p2, ha, va);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1019 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1020 else if (xyz == Z_AXIS)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1021 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1022 b = render_text (label, p1, p2, val, ha, va);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1023 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1024
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1025 wmax = std::max (wmax, static_cast<int> (b(2)));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1026 hmax = std::max (hmax, static_cast<int> (b(3)));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1027 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1028 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1029
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1030 #else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1031
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1032 octave_unused_parameter (ticks);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1033 octave_unused_parameter (ticklabels);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1034 octave_unused_parameter (lim1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1035 octave_unused_parameter (lim2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1036 octave_unused_parameter (p1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1037 octave_unused_parameter (p2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1038 octave_unused_parameter (xyz);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1039 octave_unused_parameter (ha);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1040 octave_unused_parameter (va);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1041 octave_unused_parameter (wmax);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1042 octave_unused_parameter (hmax);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1043
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1044 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1045 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1046
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1047 panic_impossible ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1048
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1049 #endif
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1050 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1051
25863 8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1052 void
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1053 opengl_renderer::draw_zoom_rect (int x1, int y1, int x2, int y2)
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1054 {
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1055 #if defined (HAVE_OPENGL)
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1056
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1057 m_glfcns.glVertex2d (x1, y1);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1058 m_glfcns.glVertex2d (x2, y1);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1059 m_glfcns.glVertex2d (x2, y2);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1060 m_glfcns.glVertex2d (x1, y2);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1061 m_glfcns.glVertex2d (x1, y1);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1062
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1063 #else
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1064
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1065 octave_unused_parameter (x1);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1066 octave_unused_parameter (x2);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1067 octave_unused_parameter (y1);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1068 octave_unused_parameter (y2);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1069
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1070 // This shouldn't happen because construction of opengl_renderer
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1071 // objects is supposed to be impossible if OpenGL is not available.
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1072
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1073 panic_impossible ();
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1074
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1075 #endif
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1076 }
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1077
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1078 void
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1079 opengl_renderer::draw_zoom_box (int width, int height,
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1080 int x1, int y1, int x2, int y2,
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1081 const Matrix& overlaycolor,
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1082 double overlayalpha,
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1083 const Matrix& bordercolor,
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1084 double borderalpha, double borderwidth)
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1085 {
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1086 #if defined (HAVE_OPENGL)
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1087
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1088 m_glfcns.glMatrixMode (GL_MODELVIEW);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1089 m_glfcns.glPushMatrix ();
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1090 m_glfcns.glLoadIdentity ();
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1091
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1092 m_glfcns.glMatrixMode (GL_PROJECTION);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1093 m_glfcns.glPushMatrix ();
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1094 m_glfcns.glLoadIdentity ();
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1095 m_glfcns.glOrtho (0, width, height, 0, 1, -1);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1096
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1097 m_glfcns.glPushAttrib (GL_DEPTH_BUFFER_BIT \| GL_CURRENT_BIT);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1098 m_glfcns.glDisable (GL_DEPTH_TEST);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1099
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1100 m_glfcns.glBegin (GL_POLYGON);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1101 m_glfcns.glColor4f (overlaycolor(0), overlaycolor(1), overlaycolor(2),
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1102 overlayalpha);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1103 draw_zoom_rect (x1, y1, x2, y2);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1104 m_glfcns.glEnd ();
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1105
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1106 m_glfcns.glLineWidth (borderwidth);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1107 m_glfcns.glBegin (GL_LINE_STRIP);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1108 m_glfcns.glColor4f (bordercolor(0), bordercolor(1), bordercolor(2),
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1109 borderalpha);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1110 draw_zoom_rect (x1, y1, x2, y2);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1111 m_glfcns.glEnd ();
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1112
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1113 m_glfcns.glPopAttrib ();
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1114
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1115 m_glfcns.glMatrixMode (GL_MODELVIEW);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1116 m_glfcns.glPopMatrix ();
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1117
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1118 m_glfcns.glMatrixMode (GL_PROJECTION);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1119 m_glfcns.glPopMatrix ();
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1120
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1121 #else
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1122
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1123 octave_unused_parameter (width);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1124 octave_unused_parameter (height);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1125 octave_unused_parameter (x1);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1126 octave_unused_parameter (x2);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1127 octave_unused_parameter (y1);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1128 octave_unused_parameter (y2);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1129 octave_unused_parameter (overlaycolor);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1130 octave_unused_parameter (overlayalpha);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1131 octave_unused_parameter (bordercolor);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1132 octave_unused_parameter (borderalpha);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1133 octave_unused_parameter (borderwidth);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1134
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1135 // This shouldn't happen because construction of opengl_renderer
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1136 // objects is supposed to be impossible if OpenGL is not available.
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1137
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1138 panic_impossible ();
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1139
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1140 #endif
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1141 }
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1142
23535 2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1143 uint8NDArray
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1144 opengl_renderer::get_pixels (int width, int height)
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1145 {
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1146 #if defined (HAVE_OPENGL)
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1147
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1148 m_glfcns.glPixelStorei (GL_PACK_ALIGNMENT, 1);
23535 2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1149 uint8NDArray pix(dim_vector (3, width, height), 0);
25998 8d2b3e3ff182 print.m: Implement "-opengl", "-painters" and "-RGBImage" options (bug #52866) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25980 diff changeset	1150
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1151 m_glfcns.glReadPixels(0, 0, width, height, GL_RGB, GL_UNSIGNED_BYTE,
25998 8d2b3e3ff182 print.m: Implement "-opengl", "-painters" and "-RGBImage" options (bug #52866) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25980 diff changeset	1152 pix.fortran_vec ());
23535 2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1153
23562 35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	1154 // Permute and flip data
23535 2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1155 Array<octave_idx_type> perm (dim_vector (3, 1));
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1156 perm(0) = 2;
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1157 perm(1) = 1;
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1158 perm(2) = 0;
23562 35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	1159
23535 2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1160 Array<idx_vector> idx (dim_vector (3, 1));
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1161 idx(0) = idx_vector::make_range (height - 1, -1, height);
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1162 idx(1) = idx_vector::colon;
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1163 idx(2) = idx_vector::colon;
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1164
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1165 return pix.permute (perm).index (idx);
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1166
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1167 #else
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1168
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25058 diff changeset	1169 // This shouldn't happen because construction of opengl_renderer
078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25058 diff changeset	1170 // objects is supposed to be impossible if OpenGL is not available.
23535 2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1171
23562 35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	1172 octave_unused_parameter (width);
35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	1173 octave_unused_parameter (height);
35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	1174
35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	1175 panic_impossible ();
23535 2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1176
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1177 #endif
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1178 }
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1179
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1180 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1181 opengl_renderer::finish (void)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1182 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1183 #if defined (HAVE_OPENGL)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1184
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1185 m_glfcns.glFinish ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1186
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1187 #else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1188
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1189 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1190 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1191
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1192 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	1193
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1194 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1195 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1196
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1197 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1198 opengl_renderer::setup_opengl_transformation (const axes::properties& props)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1199 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1200 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1201
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1202 // setup OpenGL transformation
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1203
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1204 Matrix x_zlim = props.get_transform_zlim ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1205
25826 2c42ed37cfc2 Increase OpenGL clipping limits in ortho view (bug #54551). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25820 diff changeset	1206 xZ1 = std::max (-1e6, x_zlim(0)-(x_zlim(1)-x_zlim(0))*100.0);
2c42ed37cfc2 Increase OpenGL clipping limits in ortho view (bug #54551). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25820 diff changeset	1207 xZ2 = std::min (1e6, x_zlim(1)+(x_zlim(1)-x_zlim(0))*100.0);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1208
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1209 Matrix x_mat1 = props.get_opengl_matrix_1 ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1210 Matrix x_mat2 = props.get_opengl_matrix_2 ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1211
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1212 m_glfcns.glMatrixMode (GL_MODELVIEW);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1213 m_glfcns.glLoadIdentity ();
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1214 m_glfcns.glScaled (1, 1, -1);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1215 m_glfcns.glMultMatrixd (x_mat1.data ());
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1216 m_glfcns.glMatrixMode (GL_PROJECTION);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1217 m_glfcns.glLoadIdentity ();
25884 4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25871 diff changeset	1218
25889 2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	1219 Matrix vp = get_viewport_scaled ();
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	1220 m_glfcns.glOrtho (0, vp(2), vp(3), 0, xZ1, xZ2);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1221 m_glfcns.glMultMatrixd (x_mat2.data ());
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1222 m_glfcns.glMatrixMode (GL_MODELVIEW);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1223
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1224 m_glfcns.glClear (GL_DEPTH_BUFFER_BIT);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1225
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1226 // store axes transformation data
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1227
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1228 xform = props.get_transform ();
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1229
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1230 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	1231
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1232 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1233
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1234 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1235 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1236
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1237 panic_impossible ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1238
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1239 #endif
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1240 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1241
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1242 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1243 opengl_renderer::draw_axes_planes (const axes::properties& props)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1244 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1245 #if defined (HAVE_OPENGL)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1246
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1247 Matrix axe_color = props.get_color_rgb ();
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	1248 if (axe_color.isempty () \|\| ! props.is_visible ())
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1249 return;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1250
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1251 double xPlane = props.get_xPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1252 double yPlane = props.get_yPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1253 double zPlane = props.get_zPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1254 double xPlaneN = props.get_xPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1255 double yPlaneN = props.get_yPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1256 double zPlaneN = props.get_zPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1257 bool is2d = props.get_is2D ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1258
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1259 // Axes planes
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1260 set_color (axe_color);
24173 730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	1261 set_polygon_offset (true, 9.0);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1262
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1263 m_glfcns.glBegin (GL_QUADS);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1264
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1265 if (! is2d)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1266 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1267 // X plane
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1268 m_glfcns.glVertex3d (xPlane, yPlaneN, zPlaneN);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1269 m_glfcns.glVertex3d (xPlane, yPlane, zPlaneN);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1270 m_glfcns.glVertex3d (xPlane, yPlane, zPlane);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1271 m_glfcns.glVertex3d (xPlane, yPlaneN, zPlane);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1272
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1273 // Y plane
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1274 m_glfcns.glVertex3d (xPlaneN, yPlane, zPlaneN);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1275 m_glfcns.glVertex3d (xPlane, yPlane, zPlaneN);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1276 m_glfcns.glVertex3d (xPlane, yPlane, zPlane);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1277 m_glfcns.glVertex3d (xPlaneN, yPlane, zPlane);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1278 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1279
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1280 // Z plane
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1281 m_glfcns.glVertex3d (xPlaneN, yPlaneN, zPlane);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1282 m_glfcns.glVertex3d (xPlane, yPlaneN, zPlane);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1283 m_glfcns.glVertex3d (xPlane, yPlane, zPlane);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1284 m_glfcns.glVertex3d (xPlaneN, yPlane, zPlane);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1285
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1286 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1287
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1288 set_polygon_offset (false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1289
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1290 #else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1291
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1292 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1293
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1294 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1295 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1296
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1297 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	1298
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1299 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1300 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1301
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1302 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1303 opengl_renderer::draw_axes_boxes (const axes::properties& props)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1304 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1305 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1306
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1307 if (! props.is_visible ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1308 return;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1309
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1310 bool xySym = props.get_xySym ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1311 bool layer2Dtop = props.get_layer2Dtop ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1312 bool is2d = props.get_is2D ();
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1313 bool isXOrigin = props.xaxislocation_is ("origin")
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25058 diff changeset	1314 && ! props.yscale_is ("log");
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1315 bool isYOrigin = props.yaxislocation_is ("origin")
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25058 diff changeset	1316 && ! props.xscale_is ("log");
22363 0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1317 bool boxFull = (props.get_boxstyle () == "full");
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1318 double linewidth = props.get_linewidth ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1319 double xPlane = props.get_xPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1320 double yPlane = props.get_yPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1321 double zPlane = props.get_zPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1322 double xPlaneN = props.get_xPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1323 double yPlaneN = props.get_yPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1324 double zPlaneN = props.get_zPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1325 double xpTick = props.get_xpTick ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1326 double ypTick = props.get_ypTick ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1327 double zpTick = props.get_zpTick ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1328 double xpTickN = props.get_xpTickN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1329 double ypTickN = props.get_ypTickN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1330 double zpTickN = props.get_zpTickN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1331
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1332 bool plotyy = (props.has_property ("__plotyy_axes__"));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1333
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1334 // Axes box
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1335
24807 8585b3f9c28c Use "butt" linecap to workaround split lines in printout (bug #53229). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24725 diff changeset	1336 set_linecap ("square");
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1337 set_linestyle ("-", true, linewidth);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1338
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1339 m_glfcns.glBegin (GL_LINES);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1340
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1341 if (layer2Dtop)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1342 std::swap (zpTick, zpTickN);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1343
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1344 // X box
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1345 set_color (props.get_xcolor_rgb ());
22711 074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1346
074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1347 if (! isXOrigin \|\| props.is_box() \|\| ! is2d)
074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1348 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1349 m_glfcns.glVertex3d (xPlaneN, ypTick, zpTick);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1350 m_glfcns.glVertex3d (xPlane, ypTick, zpTick);
22711 074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1351 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1352
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1353 if (props.is_box ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1354 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1355 m_glfcns.glVertex3d (xPlaneN, ypTickN, zpTick);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1356 m_glfcns.glVertex3d (xPlane, ypTickN, zpTick);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1357 if (! is2d)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1358 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1359 m_glfcns.glVertex3d (xPlaneN, ypTickN, zpTickN);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1360 m_glfcns.glVertex3d (xPlane, ypTickN, zpTickN);
22363 0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1361 if (boxFull)
0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1362 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1363 m_glfcns.glVertex3d (xPlaneN, ypTick, zpTickN);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1364 m_glfcns.glVertex3d (xPlane, ypTick, zpTickN);
22363 0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1365 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1366 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1367 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1368
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1369 // Y box
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1370 set_color (props.get_ycolor_rgb ());
22711 074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1371 if (! isYOrigin \|\| props.is_box() \|\| ! is2d)
074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1372 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1373 m_glfcns.glVertex3d (xpTick, yPlaneN, zpTick);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1374 m_glfcns.glVertex3d (xpTick, yPlane, zpTick);
22711 074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1375 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1376
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1377 if (props.is_box () && ! plotyy)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1378 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1379 m_glfcns.glVertex3d (xpTickN, yPlaneN, zpTick);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1380 m_glfcns.glVertex3d (xpTickN, yPlane, zpTick);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1381
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1382 if (! is2d)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1383 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1384 m_glfcns.glVertex3d (xpTickN, yPlaneN, zpTickN);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1385 m_glfcns.glVertex3d (xpTickN, yPlane, zpTickN);
22363 0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1386 if (boxFull)
0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1387 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1388 m_glfcns.glVertex3d (xpTick, yPlaneN, zpTickN);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1389 m_glfcns.glVertex3d (xpTick, yPlane, zpTickN);
22363 0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1390 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1391 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1392 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1393
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1394 // Z box
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1395 if (! is2d)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1396 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1397 set_color (props.get_zcolor_rgb ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1398
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1399 if (xySym)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1400 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1401 m_glfcns.glVertex3d (xPlaneN, yPlane, zPlaneN);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1402 m_glfcns.glVertex3d (xPlaneN, yPlane, zPlane);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1403 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1404 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1405 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1406 m_glfcns.glVertex3d (xPlane, yPlaneN, zPlaneN);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1407 m_glfcns.glVertex3d (xPlane, yPlaneN, zPlane);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1408 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1409
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1410 if (props.is_box ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1411 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1412 m_glfcns.glVertex3d (xPlane, yPlane, zPlaneN);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1413 m_glfcns.glVertex3d (xPlane, yPlane, zPlane);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1414
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1415 if (xySym)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1416 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1417 m_glfcns.glVertex3d (xPlane, yPlaneN, zPlaneN);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1418 m_glfcns.glVertex3d (xPlane, yPlaneN, zPlane);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1419 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1420 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1421 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1422 m_glfcns.glVertex3d (xPlaneN, yPlane, zPlaneN);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1423 m_glfcns.glVertex3d (xPlaneN, yPlane, zPlane);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1424 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1425
22363 0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1426 if (boxFull)
0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1427 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1428 m_glfcns.glVertex3d (xPlaneN, yPlaneN, zPlaneN);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1429 m_glfcns.glVertex3d (xPlaneN, yPlaneN, zPlane);
22363 0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1430 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1431 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1432 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1433
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1434 m_glfcns.glEnd ();
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1435
25260 601cc3a063f5 Fix OpenGL line-stipple bug manifested as Nouveau driver crash (bug #53644) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25103 diff changeset	1436 set_linestyle ("-"); // Disable LineStipple
601cc3a063f5 Fix OpenGL line-stipple bug manifested as Nouveau driver crash (bug #53644) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25103 diff changeset	1437
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1438 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	1439
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1440 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1441
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1442 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1443 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1444
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1445 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	1446
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1447 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1448 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1449
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1450 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1451 opengl_renderer::draw_axes_x_grid (const axes::properties& props)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1452 {
22740 3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1453 #if defined (HAVE_OPENGL)
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1454
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1455 int xstate = props.get_xstate ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1456
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	1457 if (xstate != AXE_DEPTH_DIR
24634 ab2321d4ba03 maint: strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1458 && (props.is_visible ()
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	1459 \|\| (selecting && props.pickableparts_is ("all"))))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1460 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1461 int zstate = props.get_zstate ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1462 bool x2Dtop = props.get_x2Dtop ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1463 bool layer2Dtop = props.get_layer2Dtop ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1464 bool xyzSym = props.get_xyzSym ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1465 bool nearhoriz = props.get_nearhoriz ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1466 double xticklen = props.get_xticklen ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1467 double xtickoffset = props.get_xtickoffset ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1468 double fy = props.get_fy ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1469 double fz = props.get_fz ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1470 double x_min = props.get_x_min ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1471 double x_max = props.get_x_max ();
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1472 double y_min = props.get_y_min ();
868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1473 double y_max = props.get_y_max ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1474 double yPlane = props.get_yPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1475 double yPlaneN = props.get_yPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1476 double ypTick = props.get_ypTick ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1477 double ypTickN = props.get_ypTickN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1478 double zPlane = props.get_zPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1479 double zPlaneN = props.get_zPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1480 double zpTick = props.get_zpTick ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1481 double zpTickN = props.get_zpTickN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1482
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1483 // X grid
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1484
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1485 double linewidth = props.get_linewidth ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1486 std::string gridstyle = props.get_gridlinestyle ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1487 std::string minorgridstyle = props.get_minorgridlinestyle ();
22347 2b1612cf38e4 gl-render.cc/.h: (minor)gridcolor and (minor)gridalpha for OpenGL toolkits (bug #48429) Markus Mützel <markus.muetzel@gmx.de> parents: 22331 diff changeset	1488 Matrix gridcolor = props.get_gridcolor_rgb ();
2b1612cf38e4 gl-render.cc/.h: (minor)gridcolor and (minor)gridalpha for OpenGL toolkits (bug #48429) Markus Mützel <markus.muetzel@gmx.de> parents: 22331 diff changeset	1489 Matrix minorgridcolor = props.get_minorgridcolor_rgb ();
2b1612cf38e4 gl-render.cc/.h: (minor)gridcolor and (minor)gridalpha for OpenGL toolkits (bug #48429) Markus Mützel <markus.muetzel@gmx.de> parents: 22331 diff changeset	1490 double gridalpha = props.get_gridalpha ();
2b1612cf38e4 gl-render.cc/.h: (minor)gridcolor and (minor)gridalpha for OpenGL toolkits (bug #48429) Markus Mützel <markus.muetzel@gmx.de> parents: 22331 diff changeset	1491 double minorgridalpha = props.get_minorgridalpha ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1492 bool do_xgrid = (props.is_xgrid () && (gridstyle != "none"));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1493 bool do_xminorgrid = (props.is_xminorgrid ()
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1494 && (minorgridstyle != "none"));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1495 bool do_xminortick = props.is_xminortick ();
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1496 bool is_origin = props.xaxislocation_is ("origin") && props.get_is2D ()
868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1497 && ! props.yscale_is ("log");
868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1498 bool is_origin_low = is_origin && (y_min + y_max) < 0;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1499 Matrix xticks = xform.xscale (props.get_xtick ().matrix_value ());
22623 76f1164d2135 Rename [xyz]mtick properties to [xyz]minortickvalues (bug #49205). Rik <rik@octave.org> parents: 22622 diff changeset	1500 Matrix xmticks = xform.xscale (props.get_xminortickvalues ().matrix_value ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1501 string_vector xticklabels = props.get_xticklabel ().string_vector_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1502 int wmax = 0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1503 int hmax = 0;
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	1504 bool tick_along_z = nearhoriz \|\| math::isinf (fy);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1505 bool mirror = props.is_box () && xstate != AXE_ANY_DIR;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1506
22528 5a1167e15c0e Fix color of (minor) grid (bug #48429). Markus Mützel <markus.muetzel@gmx.de> parents: 22500 diff changeset	1507 if (props.xcolormode_is ("manual"))
5a1167e15c0e Fix color of (minor) grid (bug #48429). Markus Mützel <markus.muetzel@gmx.de> parents: 22500 diff changeset	1508 {
5a1167e15c0e Fix color of (minor) grid (bug #48429). Markus Mützel <markus.muetzel@gmx.de> parents: 22500 diff changeset	1509 // use axis color for (minor)gridcolor
5a1167e15c0e Fix color of (minor) grid (bug #48429). Markus Mützel <markus.muetzel@gmx.de> parents: 22500 diff changeset	1510 if (props.gridcolormode_is ("auto"))
5a1167e15c0e Fix color of (minor) grid (bug #48429). Markus Mützel <markus.muetzel@gmx.de> parents: 22500 diff changeset	1511 gridcolor = props.get_xcolor_rgb ();
5a1167e15c0e Fix color of (minor) grid (bug #48429). Markus Mützel <markus.muetzel@gmx.de> parents: 22500 diff changeset	1512 if (props.minorgridcolormode_is ("auto"))
5a1167e15c0e Fix color of (minor) grid (bug #48429). Markus Mützel <markus.muetzel@gmx.de> parents: 22500 diff changeset	1513 minorgridcolor = props.get_xcolor_rgb ();
5a1167e15c0e Fix color of (minor) grid (bug #48429). Markus Mützel <markus.muetzel@gmx.de> parents: 22500 diff changeset	1514 }
5a1167e15c0e Fix color of (minor) grid (bug #48429). Markus Mützel <markus.muetzel@gmx.de> parents: 22500 diff changeset	1515
22348 9deb86bb5632 gl-render.cc: Draw minor grid lines at major ticks if major grid is off (bug #48528) Markus Mützel <markus.muetzel@gmx.de> parents: 22347 diff changeset	1516 // set styles when drawing only minor grid
9deb86bb5632 gl-render.cc: Draw minor grid lines at major ticks if major grid is off (bug #48528) Markus Mützel <markus.muetzel@gmx.de> parents: 22347 diff changeset	1517 if (do_xminorgrid && ! do_xgrid)
9deb86bb5632 gl-render.cc: Draw minor grid lines at major ticks if major grid is off (bug #48528) Markus Mützel <markus.muetzel@gmx.de> parents: 22347 diff changeset	1518 {
9deb86bb5632 gl-render.cc: Draw minor grid lines at major ticks if major grid is off (bug #48528) Markus Mützel <markus.muetzel@gmx.de> parents: 22347 diff changeset	1519 gridstyle = minorgridstyle;
9deb86bb5632 gl-render.cc: Draw minor grid lines at major ticks if major grid is off (bug #48528) Markus Mützel <markus.muetzel@gmx.de> parents: 22347 diff changeset	1520 gridcolor = minorgridcolor;
9deb86bb5632 gl-render.cc: Draw minor grid lines at major ticks if major grid is off (bug #48528) Markus Mützel <markus.muetzel@gmx.de> parents: 22347 diff changeset	1521 gridalpha = minorgridalpha;
9deb86bb5632 gl-render.cc: Draw minor grid lines at major ticks if major grid is off (bug #48528) Markus Mützel <markus.muetzel@gmx.de> parents: 22347 diff changeset	1522 do_xgrid = true;
9deb86bb5632 gl-render.cc: Draw minor grid lines at major ticks if major grid is off (bug #48528) Markus Mützel <markus.muetzel@gmx.de> parents: 22347 diff changeset	1523 }
9deb86bb5632 gl-render.cc: Draw minor grid lines at major ticks if major grid is off (bug #48528) Markus Mützel <markus.muetzel@gmx.de> parents: 22347 diff changeset	1524
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1525 // minor grid lines
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1526 if (do_xminorgrid)
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1527 render_grid (linewidth,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1528 minorgridstyle, minorgridcolor, minorgridalpha,
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1529 xmticks, x_min, x_max,
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1530 yPlane, yPlaneN, layer2Dtop ? zPlaneN : zPlane, zPlaneN,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1531 0, (zstate != AXE_DEPTH_DIR));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1532
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1533 // grid lines
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1534 if (do_xgrid)
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1535 render_grid (linewidth,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1536 gridstyle, gridcolor, gridalpha,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1537 xticks, x_min, x_max,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1538 yPlane, yPlaneN, layer2Dtop ? zPlaneN : zPlane, zPlaneN,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1539 0, (zstate != AXE_DEPTH_DIR));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1540
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1541 set_color (props.get_xcolor_rgb ());
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1542
22711 074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1543 // axis line
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1544 double y_axis_pos = 0.;
22711 074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1545 if (is_origin)
074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1546 {
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25058 diff changeset	1547 y_axis_pos = math::max (math::min (0., y_max), y_min);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1548 m_glfcns.glBegin (GL_LINES);
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1549 set_color (props.get_ycolor_rgb ());
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1550 m_glfcns.glVertex3d (x_min, y_axis_pos, zpTick);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1551 m_glfcns.glVertex3d (x_max, y_axis_pos, zpTick);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1552 m_glfcns.glEnd ();
22711 074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1553 }
074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1554
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1555 // minor tick marks
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1556 if (do_xminortick)
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1557 {
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1558 if (tick_along_z)
22711 074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1559 render_tickmarks (xmticks, x_min, x_max,
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1560 is_origin ? y_axis_pos : ypTick, ypTick,
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1561 zpTick, zpTickN, 0., 0.,
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	1562 (is_origin_low ? -1. : 1.) *
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	1563 math::signum (zpTick-zpTickN)fzxticklen/2,
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1564 0, ! is_origin && mirror);
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1565 else
22711 074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1566 render_tickmarks (xmticks, x_min, x_max,
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1567 is_origin ? y_axis_pos : ypTick, ypTickN,
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1568 zpTick, zpTick, 0.,
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	1569 (is_origin_low ? -1. : 1.) *
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	1570 math::signum (ypTick-ypTickN)fyxticklen/2,
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1571 0., 0, ! is_origin && mirror);
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1572 }
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1573
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1574 // tick marks
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1575 if (tick_along_z)
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1576 render_tickmarks (xticks, x_min, x_max,
868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1577 is_origin ? y_axis_pos : ypTick, ypTick,
868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1578 zpTick, zpTickN, 0., 0.,
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	1579 (is_origin_low ? -1. : 1.) *
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	1580 math::signum (zpTick-zpTickN)fzxticklen,
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1581 0, ! is_origin && mirror);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1582 else
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1583 render_tickmarks (xticks, x_min, x_max,
868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1584 is_origin ? y_axis_pos : ypTick, ypTickN,
868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1585 zpTick, zpTick, 0.,
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	1586 (is_origin_low ? -1. : 1.) *
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	1587 math::signum (ypTick-ypTickN)fyxticklen,
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1588 0., 0, ! is_origin && mirror);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1589
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1590 // tick texts
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1591 if (xticklabels.numel () > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1592 {
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	1593 int halign = (xstate == AXE_HORZ_DIR
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	1594 ? 1
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	1595 : (xyzSym \|\| is_origin_low ? 0 : 2));
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	1596 int valign = (xstate == AXE_VERT_DIR
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	1597 ? 1
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	1598 : (x2Dtop \|\| is_origin_low ? 0 : 2));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1599
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1600 if (tick_along_z)
22711 074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1601 render_ticktexts (xticks, xticklabels, x_min, x_max,
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1602 is_origin ? y_axis_pos : ypTick,
868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1603 zpTick +
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	1604 (is_origin_low ? -1. : 1.) *
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	1605 math::signum (zpTick-zpTickN)fzxtickoffset,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1606 0, halign, valign, wmax, hmax);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1607 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1608 render_ticktexts (xticks, xticklabels, x_min, x_max,
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1609 (is_origin ? y_axis_pos : ypTick) +
868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1610 (is_origin_low ? -1. : 1.) *
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	1611 math::signum (ypTick-ypTickN)fyxtickoffset,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1612 zpTick, 0, halign, valign, wmax, hmax);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1613 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1614
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1615 gh_manager::get_object (props.get_xlabel ()).set ("visible", "on");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1616 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1617 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1618 gh_manager::get_object (props.get_xlabel ()).set ("visible", "off");
22740 3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1619
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1620 #else
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1621
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1622 octave_unused_parameter (props);
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1623
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1624 // This shouldn't happen because construction of opengl_renderer
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1625 // objects is supposed to be impossible if OpenGL is not available.
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1626
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1627 panic_impossible ();
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1628
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1629 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1630 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1631
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1632 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1633 opengl_renderer::draw_axes_y_grid (const axes::properties& props)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1634 {
22740 3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1635 #if defined (HAVE_OPENGL)
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1636
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1637 int ystate = props.get_ystate ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1638
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	1639 if (ystate != AXE_DEPTH_DIR && props.is_visible ()
24634 ab2321d4ba03 maint: strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1640 && (props.is_visible ()
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	1641 \|\| (selecting && props.pickableparts_is ("all"))))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1642 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1643 int zstate = props.get_zstate ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1644 bool y2Dright = props.get_y2Dright ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1645 bool layer2Dtop = props.get_layer2Dtop ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1646 bool xyzSym = props.get_xyzSym ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1647 bool nearhoriz = props.get_nearhoriz ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1648 double yticklen = props.get_yticklen ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1649 double ytickoffset = props.get_ytickoffset ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1650 double fx = props.get_fx ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1651 double fz = props.get_fz ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1652 double xPlane = props.get_xPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1653 double xPlaneN = props.get_xPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1654 double xpTick = props.get_xpTick ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1655 double xpTickN = props.get_xpTickN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1656 double y_min = props.get_y_min ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1657 double y_max = props.get_y_max ();
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1658 double x_min = props.get_x_min ();
868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1659 double x_max = props.get_x_max ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1660 double zPlane = props.get_zPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1661 double zPlaneN = props.get_zPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1662 double zpTick = props.get_zpTick ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1663 double zpTickN = props.get_zpTickN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1664
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1665 // Y grid
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1666
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1667 double linewidth = props.get_linewidth ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1668 std::string gridstyle = props.get_gridlinestyle ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1669 std::string minorgridstyle = props.get_minorgridlinestyle ();
22347 2b1612cf38e4 gl-render.cc/.h: (minor)gridcolor and (minor)gridalpha for OpenGL toolkits (bug #48429) Markus Mützel <markus.muetzel@gmx.de> parents: 22331 diff changeset	1670 Matrix gridcolor = props.get_gridcolor_rgb ();
2b1612cf38e4 gl-render.cc/.h: (minor)gridcolor and (minor)gridalpha for OpenGL toolkits (bug #48429) Markus Mützel <markus.muetzel@gmx.de> parents: 22331 diff changeset	1671 Matrix minorgridcolor = props.get_minorgridcolor_rgb ();
2b1612cf38e4 gl-render.cc/.h: (minor)gridcolor and (minor)gridalpha for OpenGL toolkits (bug #48429) Markus Mützel <markus.muetzel@gmx.de> parents: 22331 diff changeset	1672 double gridalpha = props.get_gridalpha ();
2b1612cf38e4 gl-render.cc/.h: (minor)gridcolor and (minor)gridalpha for OpenGL toolkits (bug #48429) Markus Mützel <markus.muetzel@gmx.de> parents: 22331 diff changeset	1673 double minorgridalpha = props.get_minorgridalpha ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1674 bool do_ygrid = (props.is_ygrid () && (gridstyle != "none"));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1675 bool do_yminorgrid = (props.is_yminorgrid ()
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1676 && (minorgridstyle != "none"));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1677 bool do_yminortick = props.is_yminortick ();
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1678 bool is_origin = props.yaxislocation_is ("origin") && props.get_is2D ()
868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1679 && ! props.xscale_is ("log");
868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1680 bool is_origin_low = is_origin && (x_min + x_max) < 0;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1681 Matrix yticks = xform.yscale (props.get_ytick ().matrix_value ());
22623 76f1164d2135 Rename [xyz]mtick properties to [xyz]minortickvalues (bug #49205). Rik <rik@octave.org> parents: 22622 diff changeset	1682 Matrix ymticks = xform.yscale (props.get_yminortickvalues ().matrix_value ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1683 string_vector yticklabels = props.get_yticklabel ().string_vector_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1684 int wmax = 0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1685 int hmax = 0;
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	1686 bool tick_along_z = nearhoriz \|\| math::isinf (fx);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1687 bool mirror = props.is_box () && ystate != AXE_ANY_DIR
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	1688 && (! props.has_property ("__plotyy_axes__"));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1689
22528 5a1167e15c0e Fix color of (minor) grid (bug #48429). Markus Mützel <markus.muetzel@gmx.de> parents: 22500 diff changeset	1690 if (props.ycolormode_is ("manual"))
5a1167e15c0e Fix color of (minor) grid (bug #48429). Markus Mützel <markus.muetzel@gmx.de> parents: 22500 diff changeset	1691 {
5a1167e15c0e Fix color of (minor) grid (bug #48429). Markus Mützel <markus.muetzel@gmx.de> parents: 22500 diff changeset	1692 // use axis color for (minor)gridcolor
5a1167e15c0e Fix color of (minor) grid (bug #48429). Markus Mützel <markus.muetzel@gmx.de> parents: 22500 diff changeset	1693 if (props.gridcolormode_is ("auto"))
5a1167e15c0e Fix color of (minor) grid (bug #48429). Markus Mützel <markus.muetzel@gmx.de> parents: 22500 diff changeset	1694 gridcolor = props.get_ycolor_rgb ();
5a1167e15c0e Fix color of (minor) grid (bug #48429). Markus Mützel <markus.muetzel@gmx.de> parents: 22500 diff changeset	1695 if (props.minorgridcolormode_is ("auto"))
5a1167e15c0e Fix color of (minor) grid (bug #48429). Markus Mützel <markus.muetzel@gmx.de> parents: 22500 diff changeset	1696 minorgridcolor = props.get_ycolor_rgb ();
5a1167e15c0e Fix color of (minor) grid (bug #48429). Markus Mützel <markus.muetzel@gmx.de> parents: 22500 diff changeset	1697 }
5a1167e15c0e Fix color of (minor) grid (bug #48429). Markus Mützel <markus.muetzel@gmx.de> parents: 22500 diff changeset	1698
22348 9deb86bb5632 gl-render.cc: Draw minor grid lines at major ticks if major grid is off (bug #48528) Markus Mützel <markus.muetzel@gmx.de> parents: 22347 diff changeset	1699 // set styles when drawing only minor grid
9deb86bb5632 gl-render.cc: Draw minor grid lines at major ticks if major grid is off (bug #48528) Markus Mützel <markus.muetzel@gmx.de> parents: 22347 diff changeset	1700 if (do_yminorgrid && ! do_ygrid)
9deb86bb5632 gl-render.cc: Draw minor grid lines at major ticks if major grid is off (bug #48528) Markus Mützel <markus.muetzel@gmx.de> parents: 22347 diff changeset	1701 {
9deb86bb5632 gl-render.cc: Draw minor grid lines at major ticks if major grid is off (bug #48528) Markus Mützel <markus.muetzel@gmx.de> parents: 22347 diff changeset	1702 gridstyle = minorgridstyle;
9deb86bb5632 gl-render.cc: Draw minor grid lines at major ticks if major grid is off (bug #48528) Markus Mützel <markus.muetzel@gmx.de> parents: 22347 diff changeset	1703 gridcolor = minorgridcolor;
9deb86bb5632 gl-render.cc: Draw minor grid lines at major ticks if major grid is off (bug #48528) Markus Mützel <markus.muetzel@gmx.de> parents: 22347 diff changeset	1704 gridalpha = minorgridalpha;
9deb86bb5632 gl-render.cc: Draw minor grid lines at major ticks if major grid is off (bug #48528) Markus Mützel <markus.muetzel@gmx.de> parents: 22347 diff changeset	1705 do_ygrid = true;
9deb86bb5632 gl-render.cc: Draw minor grid lines at major ticks if major grid is off (bug #48528) Markus Mützel <markus.muetzel@gmx.de> parents: 22347 diff changeset	1706 }
9deb86bb5632 gl-render.cc: Draw minor grid lines at major ticks if major grid is off (bug #48528) Markus Mützel <markus.muetzel@gmx.de> parents: 22347 diff changeset	1707
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1708 // minor grid lines
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1709 if (do_yminorgrid)
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1710 render_grid (linewidth,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1711 minorgridstyle, minorgridcolor, minorgridalpha,
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1712 ymticks, y_min, y_max,
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1713 xPlane, xPlaneN, layer2Dtop ? zPlaneN : zPlane, zPlaneN,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1714 1, (zstate != AXE_DEPTH_DIR));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1715
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1716 // grid lines
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1717 if (do_ygrid)
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1718 render_grid (linewidth,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1719 gridstyle, gridcolor, gridalpha,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1720 yticks, y_min, y_max,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1721 xPlane, xPlaneN, layer2Dtop ? zPlaneN : zPlane, zPlaneN,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1722 1, (zstate != AXE_DEPTH_DIR));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1723
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1724 set_color (props.get_ycolor_rgb ());
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1725
22711 074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1726 // axis line
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1727 double x_axis_pos = 0.;
22711 074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1728 if (is_origin)
074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1729 {
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25058 diff changeset	1730 x_axis_pos = math::max (math::min (0., x_max), x_min);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1731 m_glfcns.glBegin (GL_LINES);
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1732 set_color (props.get_ycolor_rgb ());
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1733 m_glfcns.glVertex3d (x_axis_pos, y_min, zpTick);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1734 m_glfcns.glVertex3d (x_axis_pos, y_max, zpTick);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1735 m_glfcns.glEnd ();
22711 074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1736 }
074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1737
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1738 // minor tick marks
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1739 if (do_yminortick)
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1740 {
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1741 if (tick_along_z)
22711 074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1742 render_tickmarks (ymticks, y_min, y_max,
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1743 is_origin ? x_axis_pos : xpTick, xpTick,
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1744 zpTick, zpTickN, 0., 0.,
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	1745 (is_origin_low ? -1. : 1.) *
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	1746 math::signum (zpTick-zpTickN)fzyticklen/2,
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1747 1, ! is_origin && mirror);
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1748 else
22711 074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1749 render_tickmarks (ymticks, y_min, y_max,
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1750 is_origin ? x_axis_pos : xpTick, xpTickN,
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1751 zpTick, zpTick,
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	1752 (is_origin_low ? -1. : 1.) *
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	1753 math::signum (xpTick-xpTickN)fxyticklen/2,
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1754 0., 0., 1, ! is_origin && mirror);
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1755 }
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1756
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1757 // tick marks
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1758 if (tick_along_z)
22711 074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1759 render_tickmarks (yticks, y_min, y_max,
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1760 is_origin ? x_axis_pos : xpTick, xpTick,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1761 zpTick, zpTickN, 0., 0.,
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	1762 (is_origin_low ? -1. : 1.) *
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	1763 math::signum (zpTick-zpTickN)fzyticklen,
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1764 1, ! is_origin && mirror);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1765 else
22711 074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1766 render_tickmarks (yticks, y_min, y_max,
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1767 is_origin ? x_axis_pos : xpTick, xpTickN,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1768 zpTick, zpTick,
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	1769 (is_origin_low ? -1. : 1.) *
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	1770 math::signum (xPlaneN-xPlane)fxyticklen,
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1771 0., 0., 1, ! is_origin && mirror);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1772
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1773 // tick texts
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1774 if (yticklabels.numel () > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1775 {
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	1776 int halign = (ystate == AXE_HORZ_DIR
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	1777 ? 1
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	1778 : (! xyzSym \|\| y2Dright \|\| is_origin_low ? 0 : 2));
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	1779 int valign = (ystate == AXE_VERT_DIR
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	1780 ? 1
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	1781 : (is_origin_low ? 0 : 2));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1782
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1783 if (tick_along_z)
22711 074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1784 render_ticktexts (yticks, yticklabels, y_min, y_max,
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1785 is_origin ? x_axis_pos : xpTick,
868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1786 zpTick +
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	1787 (is_origin_low ? -1. : 1.) *
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	1788 math::signum (zpTick-zpTickN)fzytickoffset,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1789 1, halign, valign, wmax, hmax);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1790 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1791 render_ticktexts (yticks, yticklabels, y_min, y_max,
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1792 (is_origin ? x_axis_pos : xpTick) +
868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1793 (is_origin_low ? -1. : 1.) *
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	1794 math::signum (xpTick-xpTickN)fxytickoffset,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1795 zpTick, 1, halign, valign, wmax, hmax);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1796 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1797
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1798 gh_manager::get_object (props.get_ylabel ()).set ("visible", "on");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1799 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1800 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1801 gh_manager::get_object (props.get_ylabel ()).set ("visible", "off");
22740 3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1802
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1803 #else
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1804
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1805 octave_unused_parameter (props);
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1806
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1807 // This shouldn't happen because construction of opengl_renderer
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1808 // objects is supposed to be impossible if OpenGL is not available.
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1809
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1810 panic_impossible ();
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1811
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1812 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1813 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1814
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1815 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1816 opengl_renderer::draw_axes_z_grid (const axes::properties& props)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1817 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1818 int zstate = props.get_zstate ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1819
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	1820 if (zstate != AXE_DEPTH_DIR && props.is_visible ()
24634 ab2321d4ba03 maint: strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1821 && (props.is_visible ()
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	1822 \|\| (selecting && props.pickableparts_is ("all"))))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1823 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1824 bool xySym = props.get_xySym ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1825 bool zSign = props.get_zSign ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1826 double zticklen = props.get_zticklen ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1827 double ztickoffset = props.get_ztickoffset ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1828 double fx = props.get_fx ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1829 double fy = props.get_fy ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1830 double xPlane = props.get_xPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1831 double xPlaneN = props.get_xPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1832 double yPlane = props.get_yPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1833 double yPlaneN = props.get_yPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1834 double z_min = props.get_z_min ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1835 double z_max = props.get_z_max ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1836
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1837 // Z Grid
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1838
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1839 double linewidth = props.get_linewidth ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1840 std::string gridstyle = props.get_gridlinestyle ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1841 std::string minorgridstyle = props.get_minorgridlinestyle ();
22347 2b1612cf38e4 gl-render.cc/.h: (minor)gridcolor and (minor)gridalpha for OpenGL toolkits (bug #48429) Markus Mützel <markus.muetzel@gmx.de> parents: 22331 diff changeset	1842 Matrix gridcolor = props.get_gridcolor_rgb ();
2b1612cf38e4 gl-render.cc/.h: (minor)gridcolor and (minor)gridalpha for OpenGL toolkits (bug #48429) Markus Mützel <markus.muetzel@gmx.de> parents: 22331 diff changeset	1843 Matrix minorgridcolor = props.get_minorgridcolor_rgb ();
2b1612cf38e4 gl-render.cc/.h: (minor)gridcolor and (minor)gridalpha for OpenGL toolkits (bug #48429) Markus Mützel <markus.muetzel@gmx.de> parents: 22331 diff changeset	1844 double gridalpha = props.get_gridalpha ();
2b1612cf38e4 gl-render.cc/.h: (minor)gridcolor and (minor)gridalpha for OpenGL toolkits (bug #48429) Markus Mützel <markus.muetzel@gmx.de> parents: 22331 diff changeset	1845 double minorgridalpha = props.get_minorgridalpha ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1846 bool do_zgrid = (props.is_zgrid () && (gridstyle != "none"));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1847 bool do_zminorgrid = (props.is_zminorgrid ()
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1848 && (minorgridstyle != "none"));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1849 bool do_zminortick = props.is_zminortick ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1850 Matrix zticks = xform.zscale (props.get_ztick ().matrix_value ());
22623 76f1164d2135 Rename [xyz]mtick properties to [xyz]minortickvalues (bug #49205). Rik <rik@octave.org> parents: 22622 diff changeset	1851 Matrix zmticks = xform.zscale (props.get_zminortickvalues ().matrix_value ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1852 string_vector zticklabels = props.get_zticklabel ().string_vector_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1853 int wmax = 0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1854 int hmax = 0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1855 bool mirror = props.is_box () && zstate != AXE_ANY_DIR;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1856
22528 5a1167e15c0e Fix color of (minor) grid (bug #48429). Markus Mützel <markus.muetzel@gmx.de> parents: 22500 diff changeset	1857 if (props.zcolormode_is ("manual"))
5a1167e15c0e Fix color of (minor) grid (bug #48429). Markus Mützel <markus.muetzel@gmx.de> parents: 22500 diff changeset	1858 {
5a1167e15c0e Fix color of (minor) grid (bug #48429). Markus Mützel <markus.muetzel@gmx.de> parents: 22500 diff changeset	1859 // use axis color for (minor)gridcolor
5a1167e15c0e Fix color of (minor) grid (bug #48429). Markus Mützel <markus.muetzel@gmx.de> parents: 22500 diff changeset	1860 if (props.gridcolormode_is ("auto"))
5a1167e15c0e Fix color of (minor) grid (bug #48429). Markus Mützel <markus.muetzel@gmx.de> parents: 22500 diff changeset	1861 gridcolor = props.get_zcolor_rgb ();
5a1167e15c0e Fix color of (minor) grid (bug #48429). Markus Mützel <markus.muetzel@gmx.de> parents: 22500 diff changeset	1862 if (props.minorgridcolormode_is ("auto"))
5a1167e15c0e Fix color of (minor) grid (bug #48429). Markus Mützel <markus.muetzel@gmx.de> parents: 22500 diff changeset	1863 minorgridcolor = props.get_zcolor_rgb ();
5a1167e15c0e Fix color of (minor) grid (bug #48429). Markus Mützel <markus.muetzel@gmx.de> parents: 22500 diff changeset	1864 }
5a1167e15c0e Fix color of (minor) grid (bug #48429). Markus Mützel <markus.muetzel@gmx.de> parents: 22500 diff changeset	1865
22348 9deb86bb5632 gl-render.cc: Draw minor grid lines at major ticks if major grid is off (bug #48528) Markus Mützel <markus.muetzel@gmx.de> parents: 22347 diff changeset	1866 // set styles when drawing only minor grid
9deb86bb5632 gl-render.cc: Draw minor grid lines at major ticks if major grid is off (bug #48528) Markus Mützel <markus.muetzel@gmx.de> parents: 22347 diff changeset	1867 if (do_zminorgrid && ! do_zgrid)
9deb86bb5632 gl-render.cc: Draw minor grid lines at major ticks if major grid is off (bug #48528) Markus Mützel <markus.muetzel@gmx.de> parents: 22347 diff changeset	1868 {
9deb86bb5632 gl-render.cc: Draw minor grid lines at major ticks if major grid is off (bug #48528) Markus Mützel <markus.muetzel@gmx.de> parents: 22347 diff changeset	1869 gridstyle = minorgridstyle;
9deb86bb5632 gl-render.cc: Draw minor grid lines at major ticks if major grid is off (bug #48528) Markus Mützel <markus.muetzel@gmx.de> parents: 22347 diff changeset	1870 gridcolor = minorgridcolor;
9deb86bb5632 gl-render.cc: Draw minor grid lines at major ticks if major grid is off (bug #48528) Markus Mützel <markus.muetzel@gmx.de> parents: 22347 diff changeset	1871 gridalpha = minorgridalpha;
9deb86bb5632 gl-render.cc: Draw minor grid lines at major ticks if major grid is off (bug #48528) Markus Mützel <markus.muetzel@gmx.de> parents: 22347 diff changeset	1872 do_zgrid = true;
9deb86bb5632 gl-render.cc: Draw minor grid lines at major ticks if major grid is off (bug #48528) Markus Mützel <markus.muetzel@gmx.de> parents: 22347 diff changeset	1873 }
9deb86bb5632 gl-render.cc: Draw minor grid lines at major ticks if major grid is off (bug #48528) Markus Mützel <markus.muetzel@gmx.de> parents: 22347 diff changeset	1874
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1875 // minor grid lines
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1876 if (do_zminorgrid)
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1877 render_grid (linewidth,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1878 minorgridstyle, minorgridcolor, minorgridalpha,
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1879 zmticks, z_min, z_max,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1880 xPlane, xPlaneN, yPlane, yPlaneN, 2, true);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1881
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1882 // grid lines
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1883 if (do_zgrid)
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1884 render_grid (linewidth,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1885 gridstyle, gridcolor, gridalpha,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1886 zticks, z_min, z_max,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1887 xPlane, xPlaneN, yPlane, yPlaneN, 2, true);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1888
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1889 set_color (props.get_zcolor_rgb ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1890
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1891 // minor tick marks
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1892 if (do_zminortick)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1893 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1894 if (xySym)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1895 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	1896 if (math::isinf (fy))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1897 render_tickmarks (zmticks, z_min, z_max, xPlaneN, xPlane,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1898 yPlane, yPlane,
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	1899 math::signum (xPlaneN-xPlane)fxzticklen/2,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1900 0., 0., 2, mirror);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1901 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1902 render_tickmarks (zmticks, z_min, z_max, xPlaneN, xPlaneN,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1903 yPlane, yPlane, 0.,
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	1904 math::signum (yPlane-yPlaneN)fyzticklen/2,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1905 0., 2, false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1906 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1907 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1908 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	1909 if (math::isinf (fx))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1910 render_tickmarks (zmticks, z_min, z_max, xPlane, xPlane,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1911 yPlaneN, yPlane, 0.,
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	1912 math::signum (yPlaneN-yPlane)fyzticklen/2,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1913 0., 2, mirror);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1914 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1915 render_tickmarks (zmticks, z_min, z_max, xPlane, xPlane,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1916 yPlaneN, yPlaneN,
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	1917 math::signum (xPlane-xPlaneN)fxzticklen/2,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1918 0., 0., 2, false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1919 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1920 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1921
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1922 // tick marks
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1923 if (xySym)
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1924 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	1925 if (math::isinf (fy))
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1926 render_tickmarks (zticks, z_min, z_max, xPlaneN, xPlane,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1927 yPlane, yPlane,
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	1928 math::signum (xPlaneN-xPlane)fxzticklen,
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1929 0., 0., 2, mirror);
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1930 else
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1931 render_tickmarks (zticks, z_min, z_max, xPlaneN, xPlaneN,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1932 yPlane, yPlane, 0.,
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	1933 math::signum (yPlane-yPlaneN)fyzticklen,
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1934 0., 2, false);
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1935 }
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1936 else
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1937 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	1938 if (math::isinf (fx))
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1939 render_tickmarks (zticks, z_min, z_max, xPlaneN, xPlane,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1940 yPlaneN, yPlane, 0.,
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	1941 math::signum (yPlaneN-yPlane)fyzticklen,
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1942 0., 2, mirror);
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1943 else
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1944 render_tickmarks (zticks, z_min, z_max, xPlane, xPlane,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1945 yPlaneN, yPlane,
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	1946 math::signum (xPlane-xPlaneN)fxzticklen,
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1947 0., 0., 2, false);
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1948 }
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1949
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1950 // tick texts
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1951 if (zticklabels.numel () > 0)
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1952 {
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1953 int halign = 2;
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1954 int valign = (zstate == AXE_VERT_DIR ? 1 : (zSign ? 3 : 2));
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1955
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1956 if (xySym)
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1957 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	1958 if (math::isinf (fy))
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1959 render_ticktexts (zticks, zticklabels, z_min, z_max,
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	1960 xPlaneN + math::signum (xPlaneN-xPlane)fxztickoffset,
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1961 yPlane, 2, halign, valign, wmax, hmax);
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1962 else
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1963 render_ticktexts (zticks, zticklabels, z_min, z_max, xPlaneN,
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	1964 yPlane + math::signum (yPlane-yPlaneN)fyztickoffset,
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1965 2, halign, valign, wmax, hmax);
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1966 }
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1967 else
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1968 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	1969 if (math::isinf (fx))
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1970 render_ticktexts (zticks, zticklabels, z_min, z_max, xPlane,
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	1971 yPlaneN + math::signum (yPlaneN-yPlane)fyztickoffset,
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1972 2, halign, valign, wmax, hmax);
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1973 else
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1974 render_ticktexts (zticks, zticklabels, z_min, z_max,
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	1975 xPlane + math::signum (xPlane-xPlaneN)fxztickoffset,
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1976 yPlaneN, 2, halign, valign, wmax, hmax);
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1977 }
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1978 }
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1979
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1980 gh_manager::get_object (props.get_zlabel ()).set ("visible", "on");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1981 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1982 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1983 gh_manager::get_object (props.get_zlabel ()).set ("visible", "off");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1984 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1985
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1986 void
23546 06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	1987 opengl_renderer::draw_axes_grids (const axes::properties& props)
06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	1988 {
23562 35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	1989 #if defined (HAVE_OPENGL)
23546 06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	1990 // Disable line smoothing for axes
06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	1991 GLboolean antialias;
23562 35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	1992
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1993 m_glfcns.glGetBooleanv (GL_LINE_SMOOTH, &antialias);
23562 35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	1994
23546 06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	1995 if (antialias == GL_TRUE)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1996 m_glfcns.glDisable (GL_LINE_SMOOTH);
23546 06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	1997
24807 8585b3f9c28c Use "butt" linecap to workaround split lines in printout (bug #53229). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24725 diff changeset	1998 set_linecap ("butt");
23546 06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	1999 set_linewidth (props.get_linewidth ());
06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	2000 set_font (props);
06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	2001 set_interpreter (props.get_ticklabelinterpreter ());
06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	2002
06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	2003 draw_axes_x_grid (props);
06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	2004 draw_axes_y_grid (props);
06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	2005 draw_axes_z_grid (props);
06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	2006
06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	2007 if (antialias == GL_TRUE)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2008 m_glfcns.glEnable (GL_LINE_SMOOTH);
23562 35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	2009 #else
35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	2010
35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	2011 octave_unused_parameter (props);
35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	2012
35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	2013 // This shouldn't happen because construction of opengl_renderer
35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	2014 // objects is supposed to be impossible if OpenGL is not available.
35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	2015
35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	2016 panic_impossible ();
35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	2017
35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	2018 #endif
23546 06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	2019 }
06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	2020
06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	2021 void
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	2022 opengl_renderer::draw_all_lights (const base_properties& props,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	2023 std::list<graphics_object>& obj_list)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2024 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2025 #if defined (HAVE_OPENGL)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2026 Matrix children = props.get_all_children ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2027
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2028 for (octave_idx_type i = children.numel () - 1; i >= 0; i--)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2029 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2030 graphics_object go = gh_manager::get_object (children(i));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2031
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2032 base_properties p = go.get_properties ();
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2033
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2034 if (p.is_visible ()
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2035 \|\| (selecting && p.pickableparts_is ("all")))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2036 {
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2037 if (go.isa ("light") && ! selecting)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2038 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2039 if (m_current_light-GL_LIGHT0 < m_max_lights)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2040 {
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2041 set_clipping (p.is_clipping ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2042 draw (go);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2043 m_current_light++;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2044 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2045 }
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2046 else if (go.isa ("hggroup")
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2047 && ! (selecting && p.pickableparts_is ("none")))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2048 draw_all_lights (go.get_properties (), obj_list);
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2049 else if (! (selecting && p.pickableparts_is ("none")))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2050 obj_list.push_back (go);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2051 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2052 }
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2053 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	2054
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2055 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2056 octave_unused_parameter (obj_list);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2057
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2058 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2059 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2060
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2061 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	2062
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2063 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2064 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2065
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2066 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2067 opengl_renderer::draw_axes_children (const axes::properties& props)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2068 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2069 #if defined (HAVE_OPENGL)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2070 // list for non-light child objects
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2071 std::list<graphics_object> obj_list;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2072 std::list<graphics_object>::iterator it;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2073
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2074 // 1st pass: draw light objects
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2075
22349 2aac9ec7df29 Do not call GL functions before window is open. (bug #48669) Markus Mützel <markus.muetzel@gmx.de> parents: 22348 diff changeset	2076 // FIXME: max_lights only needs to be set once.
2aac9ec7df29 Do not call GL functions before window is open. (bug #48669) Markus Mützel <markus.muetzel@gmx.de> parents: 22348 diff changeset	2077 // It would be better if this could be in the constructor for gl_renderer
2aac9ec7df29 Do not call GL functions before window is open. (bug #48669) Markus Mützel <markus.muetzel@gmx.de> parents: 22348 diff changeset	2078 // but this seems to lead to calls of OpenGL functions before the context
2aac9ec7df29 Do not call GL functions before window is open. (bug #48669) Markus Mützel <markus.muetzel@gmx.de> parents: 22348 diff changeset	2079 // is actually initialized. See bug #48669.
2aac9ec7df29 Do not call GL functions before window is open. (bug #48669) Markus Mützel <markus.muetzel@gmx.de> parents: 22348 diff changeset	2080 // Check actual maximum number of lights possible
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2081 init_maxlights ();
22349 2aac9ec7df29 Do not call GL functions before window is open. (bug #48669) Markus Mützel <markus.muetzel@gmx.de> parents: 22348 diff changeset	2082
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2083 // Start with the last element of the array of child objects to
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2084 // display them in the order they were added to the array.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2085
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2086 if (props.get_num_lights () > m_max_lights)
25423 13b1b9a0d9c5 Move management of lights in axes from GL to graphics backend. Markus Mützel <markus.muetzel@gmx.de> parents: 25419 diff changeset	2087 warning_with_id ("Octave:max-lights-exceeded",
13b1b9a0d9c5 Move management of lights in axes from GL to graphics backend. Markus Mützel <markus.muetzel@gmx.de> parents: 25419 diff changeset	2088 "light: Maximum number of lights (%d) in these axes is "
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2089 "exceeded.", m_max_lights);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2090
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2091 m_current_light = GL_LIGHT0;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2092 draw_all_lights (props, obj_list);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2093
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2094 // disable other OpenGL lights
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2095 for (unsigned int i = props.get_num_lights (); i < m_max_lights; i++)
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2096 m_glfcns.glDisable (GL_LIGHT0 + i);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2097
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2098 // save camera position and set ambient light color before drawing
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2099 // other objects
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2100 view_vector = props.get_cameraposition ().matrix_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2101
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2102 float cb[4] = { 1.0, 1.0, 1.0, 1.0 };
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2103 ColumnVector ambient_color = props.get_ambientlightcolor_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2104 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2105 cb[i] = ambient_color(i);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2106 m_glfcns.glLightfv (GL_LIGHT0, GL_AMBIENT, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2107
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2108 // 2nd pass: draw other objects (with units set to "data")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2109
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2110 it = obj_list.begin ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2111 while (it != obj_list.end ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2112 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2113 graphics_object go = (*it);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2114
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2115 // FIXME: check whether object has "units" property and it is set
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2116 // to "data"
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2117 if (! go.isa ("text") \|\| go.get ("units").string_value () == "data")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2118 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2119 set_clipping (go.get_properties ().is_clipping ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2120 draw (go);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2121
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2122 it = obj_list.erase (it);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2123 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2124 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2125 it++;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2126 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2127
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2128 // 3rd pass: draw remaining objects
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2129
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2130 m_glfcns.glDisable (GL_DEPTH_TEST);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2131
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2132 for (it = obj_list.begin (); it != obj_list.end (); it++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2133 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2134 graphics_object go = (*it);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2135
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2136 set_clipping (go.get_properties ().is_clipping ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2137 draw (go);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2138 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2139
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2140 set_clipping (false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2141
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2142 // FIXME: finalize rendering (transparency processing)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2143 // FIXME: draw zoom box, if needed
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2144
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2145 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	2146
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2147 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2148
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2149 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2150 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2151
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2152 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	2153
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2154 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2155 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2156
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2157 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2158 opengl_renderer::draw_axes (const axes::properties& props)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2159 {
22258 553490ffc203 Fix compile error and warning with '--without-opengl' (bug #48724) Markus Mützel <markus.muetzel@gmx.de> parents: 22192 diff changeset	2160 #if defined (HAVE_OPENGL)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2161
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2162 // Legends are not drawn when "visible" is "off".
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2163 if (! props.is_visible () && props.get_tag () == "legend")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2164 return;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2165
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2166 // Don't draw the axes and its children if we are in selection and
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2167 // pickable parts is "none".
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2168 if (selecting && props.pickableparts_is ("none"))
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2169 return;
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2170
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2171 static double floatmax = std::numeric_limits<float>::max ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2172
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2173 double x_min = props.get_x_min ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2174 double x_max = props.get_x_max ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2175 double y_min = props.get_y_min ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2176 double y_max = props.get_y_max ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2177 double z_min = props.get_z_min ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2178 double z_max = props.get_z_max ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2179
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2180 if (x_max > floatmax \|\| y_max > floatmax \|\| z_max > floatmax
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2181 \|\| x_min < -floatmax \|\| y_min < -floatmax \|\| z_min < -floatmax)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2182 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2183 warning ("opengl_renderer: data values greater than float capacity. (1) Scale data, or (2) Use gnuplot");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2184 return;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2185 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2186
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2187 setup_opengl_transformation (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2188
23863 56b7352fa456 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23859 diff changeset	2189 // For 2D axes with only 2D primitives, draw from back to front without
23859 7148b237f94f Fix regression introduced by cset 06805aabbdd1 (bug #50750). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23807 diff changeset	2190 // depth sorting
7148b237f94f Fix regression introduced by cset 06805aabbdd1 (bug #50750). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23807 diff changeset	2191 bool is2D = props.get_is2D (true);
23546 06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	2192 if (is2D)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2193 m_glfcns.glDisable (GL_DEPTH_TEST);
23546 06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	2194 else
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2195 m_glfcns.glEnable (GL_DEPTH_TEST);
23546 06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	2196
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2197 draw_axes_planes (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2198
23546 06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	2199 if (! is2D \|\| props.layer_is ("bottom"))
24178 857b553177a5 Fix regression with axes lines layer (see bug #39692 comment #24) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24173 diff changeset	2200 {
857b553177a5 Fix regression with axes lines layer (see bug #39692 comment #24) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24173 diff changeset	2201 draw_axes_grids (props);
857b553177a5 Fix regression with axes lines layer (see bug #39692 comment #24) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24173 diff changeset	2202 if (props.get_tag () != "legend" \|\| props.get_box () != "off")
857b553177a5 Fix regression with axes lines layer (see bug #39692 comment #24) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24173 diff changeset	2203 draw_axes_boxes (props);
857b553177a5 Fix regression with axes lines layer (see bug #39692 comment #24) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24173 diff changeset	2204 }
22357 8f23b5b23235 Avoid grid overlaying axes box (bug #48842) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22349 diff changeset	2205
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2206 set_clipbox (x_min, x_max, y_min, y_max, z_min, z_max);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2207
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2208 draw_axes_children (props);
23562 35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	2209
23546 06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	2210 if (is2D && props.layer_is ("top"))
24178 857b553177a5 Fix regression with axes lines layer (see bug #39692 comment #24) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24173 diff changeset	2211 {
857b553177a5 Fix regression with axes lines layer (see bug #39692 comment #24) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24173 diff changeset	2212 draw_axes_grids (props);
857b553177a5 Fix regression with axes lines layer (see bug #39692 comment #24) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24173 diff changeset	2213 if (props.get_tag () != "legend" \|\| props.get_box () != "off")
857b553177a5 Fix regression with axes lines layer (see bug #39692 comment #24) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24173 diff changeset	2214 draw_axes_boxes (props);
857b553177a5 Fix regression with axes lines layer (see bug #39692 comment #24) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24173 diff changeset	2215 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2216
22258 553490ffc203 Fix compile error and warning with '--without-opengl' (bug #48724) Markus Mützel <markus.muetzel@gmx.de> parents: 22192 diff changeset	2217 #else
553490ffc203 Fix compile error and warning with '--without-opengl' (bug #48724) Markus Mützel <markus.muetzel@gmx.de> parents: 22192 diff changeset	2218
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2219 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2220
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2221 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2222 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2223
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2224 panic_impossible ();
22258 553490ffc203 Fix compile error and warning with '--without-opengl' (bug #48724) Markus Mützel <markus.muetzel@gmx.de> parents: 22192 diff changeset	2225
553490ffc203 Fix compile error and warning with '--without-opengl' (bug #48724) Markus Mützel <markus.muetzel@gmx.de> parents: 22192 diff changeset	2226 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2227 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2228
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2229 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2230 opengl_renderer::draw_line (const line::properties& props)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2231 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2232 #if defined (HAVE_OPENGL)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2233
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2234 bool draw_all = selecting && props.pickableparts_is ("all");
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2235
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2236 Matrix x = xform.xscale (props.get_xdata ().matrix_value ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2237 Matrix y = xform.yscale (props.get_ydata ().matrix_value ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2238 Matrix z = xform.zscale (props.get_zdata ().matrix_value ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2239
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2240 bool has_z = (z.numel () > 0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2241 int n = static_cast<int> (std::min (std::min (x.numel (), y.numel ()),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2242 (has_z ? z.numel ()
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2243 : std::numeric_limits<int>::max ())));
25896 c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	2244 uint8_t clip_mask = (props.is_clipping () ? 0x7F : 0x40);
c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	2245 uint8_t clip_ok = 0x40;
c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	2246
c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	2247 std::vector<uint8_t> clip (n);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2248
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2249 if (has_z)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2250 for (int i = 0; i < n; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2251 clip[i] = (clip_code (x(i), y(i), z(i)) & clip_mask);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2252 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2253 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2254 double z_mid = (zmin+zmax)/2;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2255
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2256 for (int i = 0; i < n; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2257 clip[i] = (clip_code (x(i), y(i), z_mid) & clip_mask);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2258 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2259
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2260 if (! props.linestyle_is ("none") && ! props.color_is ("none"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2261 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2262 set_color (props.get_color_rgb ());
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	2263 set_linestyle (props.get_linestyle (), false, props.get_linewidth ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2264 set_linewidth (props.get_linewidth ());
22838 1444a65085ca Make axes corners join in printout (bug #39643) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22759 diff changeset	2265 set_linecap ("butt");
22759 39f39eb4e476 Implement "linejoin" property (bug #48387) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22755 diff changeset	2266 set_linejoin (props.get_linejoin ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2267
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2268 if (has_z)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2269 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2270 bool flag = false;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2271
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2272 for (int i = 1; i < n; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2273 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2274 if ((clip[i-1] & clip[i]) == clip_ok)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2275 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2276 if (! flag)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2277 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2278 flag = true;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2279 m_glfcns.glBegin (GL_LINE_STRIP);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2280 m_glfcns.glVertex3d (x(i-1), y(i-1), z(i-1));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2281 }
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2282 m_glfcns.glVertex3d (x(i), y(i), z(i));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2283 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2284 else if (flag)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2285 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2286 flag = false;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2287 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2288 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2289 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2290
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2291 if (flag)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2292 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2293 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2294 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2295 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2296 bool flag = false;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2297
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2298 for (int i = 1; i < n; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2299 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2300 if ((clip[i-1] & clip[i]) == clip_ok)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2301 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2302 if (! flag)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2303 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2304 flag = true;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2305 m_glfcns.glBegin (GL_LINE_STRIP);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2306 m_glfcns.glVertex2d (x(i-1), y(i-1));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2307 }
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2308 m_glfcns.glVertex2d (x(i), y(i));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2309 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2310 else if (flag)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2311 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2312 flag = false;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2313 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2314 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2315 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2316
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2317 if (flag)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2318 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2319 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2320
22358 dc73bbd66363 Make sure all lines associated with axes respect axes linewidth property. Rik <rik@octave.org> parents: 22357 diff changeset	2321 set_linewidth (0.5f);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2322 set_linestyle ("-");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2323 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2324
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2325 set_clipping (false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2326
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2327 if (! props.marker_is ("none")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2328 && ! (props.markeredgecolor_is ("none")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2329 && props.markerfacecolor_is ("none")))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2330 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2331 Matrix lc, fc;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2332
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2333 if (draw_all)
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2334 lc = Matrix (1, 3, 0.0);
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2335 else if (props.markeredgecolor_is ("auto"))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2336 lc = props.get_color_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2337 else if (! props.markeredgecolor_is ("none"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2338 lc = props.get_markeredgecolor_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2339
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2340 if (draw_all)
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2341 fc = Matrix (1, 3, 0.0);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2342 if (props.markerfacecolor_is ("auto"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2343 fc = props.get_color_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2344 else if (! props.markerfacecolor_is ("none"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2345 fc = props.get_markerfacecolor_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2346
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2347 init_marker (props.get_marker (), props.get_markersize (),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2348 props.get_linewidth ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2349
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2350 for (int i = 0; i < n; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2351 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2352 if (clip[i] == clip_ok)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2353 draw_marker (x(i), y(i),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2354 has_z ? z(i) : 0.0,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2355 lc, fc);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2356 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2357
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2358 end_marker ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2359 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2360
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2361 set_clipping (props.is_clipping ());
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2362
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2363 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	2364
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2365 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2366
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2367 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2368 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2369
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2370 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	2371
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2372 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2373 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2374
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2375 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2376 opengl_renderer::draw_surface (const surface::properties& props)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2377 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2378 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2379
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2380 bool draw_all = selecting && props.pickableparts_is ("all");
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2381
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2382 const Matrix x = xform.xscale (props.get_xdata ().matrix_value ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2383 const Matrix y = xform.yscale (props.get_ydata ().matrix_value ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2384 const Matrix z = xform.zscale (props.get_zdata ().matrix_value ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2385
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2386 int zr = z.rows ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2387 int zc = z.columns ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2388
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2389 NDArray c;
25867 49ffa78f9243 Use "facenormals" for flat lighting on surfaces (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25864 diff changeset	2390 const NDArray vn = props.get_vertexnormals ().array_value ();
25871 d8e7532edf5f Don't render with lighting if dimensions of normals don't match. Markus Mützel <markus.muetzel@gmx.de> parents: 25867 diff changeset	2391 dim_vector vn_dims = vn.dims ();
d8e7532edf5f Don't render with lighting if dimensions of normals don't match. Markus Mützel <markus.muetzel@gmx.de> parents: 25867 diff changeset	2392 bool has_vertex_normals = ((vn_dims(0) == z.rows ()) &&
d8e7532edf5f Don't render with lighting if dimensions of normals don't match. Markus Mützel <markus.muetzel@gmx.de> parents: 25867 diff changeset	2393 (vn_dims(1) == z.columns ()) &&
d8e7532edf5f Don't render with lighting if dimensions of normals don't match. Markus Mützel <markus.muetzel@gmx.de> parents: 25867 diff changeset	2394 (vn_dims(2) == 3));
25867 49ffa78f9243 Use "facenormals" for flat lighting on surfaces (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25864 diff changeset	2395 const NDArray fn = props.get_facenormals ().array_value ();
25871 d8e7532edf5f Don't render with lighting if dimensions of normals don't match. Markus Mützel <markus.muetzel@gmx.de> parents: 25867 diff changeset	2396 dim_vector fn_dims = fn.dims ();
d8e7532edf5f Don't render with lighting if dimensions of normals don't match. Markus Mützel <markus.muetzel@gmx.de> parents: 25867 diff changeset	2397 bool has_face_normals = ((fn_dims(0) == z.rows () - 1) &&
d8e7532edf5f Don't render with lighting if dimensions of normals don't match. Markus Mützel <markus.muetzel@gmx.de> parents: 25867 diff changeset	2398 (fn_dims(1) == z.columns () - 1) &&
d8e7532edf5f Don't render with lighting if dimensions of normals don't match. Markus Mützel <markus.muetzel@gmx.de> parents: 25867 diff changeset	2399 (fn_dims(2) == 3));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2400
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2401 // FIXME: handle transparency
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2402 Matrix a;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2403
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2404 int fc_mode = (props.facecolor_is_rgb () ? 0 :
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2405 (props.facecolor_is ("flat") ? 1 :
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2406 (props.facecolor_is ("interp") ? 2 :
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2407 (props.facecolor_is ("texturemap") ? 3 : -1))));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2408 int fl_mode = (props.facelighting_is ("none") ? 0 :
25871 d8e7532edf5f Don't render with lighting if dimensions of normals don't match. Markus Mützel <markus.muetzel@gmx.de> parents: 25867 diff changeset	2409 (props.facelighting_is ("flat") ?
d8e7532edf5f Don't render with lighting if dimensions of normals don't match. Markus Mützel <markus.muetzel@gmx.de> parents: 25867 diff changeset	2410 (has_face_normals ? 1 : 0) :
d8e7532edf5f Don't render with lighting if dimensions of normals don't match. Markus Mützel <markus.muetzel@gmx.de> parents: 25867 diff changeset	2411 (has_vertex_normals ? 2 : 0)));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2412 int fa_mode = (props.facealpha_is_double () ? 0 :
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2413 (props.facealpha_is ("flat") ? 1 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2414 int ec_mode = (props.edgecolor_is_rgb () ? 0 :
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2415 (props.edgecolor_is ("flat") ? 1 :
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2416 (props.edgecolor_is ("interp") ? 2 : -1)));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2417 int el_mode = (props.edgelighting_is ("none") ? 0 :
25871 d8e7532edf5f Don't render with lighting if dimensions of normals don't match. Markus Mützel <markus.muetzel@gmx.de> parents: 25867 diff changeset	2418 (props.edgelighting_is ("flat") ?
d8e7532edf5f Don't render with lighting if dimensions of normals don't match. Markus Mützel <markus.muetzel@gmx.de> parents: 25867 diff changeset	2419 (has_face_normals ? 1 : 0) :
d8e7532edf5f Don't render with lighting if dimensions of normals don't match. Markus Mützel <markus.muetzel@gmx.de> parents: 25867 diff changeset	2420 (has_vertex_normals ? 2 : 0)));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2421 int ea_mode = (props.edgealpha_is_double () ? 0 :
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2422 (props.edgealpha_is ("flat") ? 1 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2423 int bfl_mode = (props.backfacelighting_is ("lit") ? 0 :
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2424 (props.backfacelighting_is ("reverselit") ? 1 : 2));
25423 13b1b9a0d9c5 Move management of lights in axes from GL to graphics backend. Markus Mützel <markus.muetzel@gmx.de> parents: 25419 diff changeset	2425 bool do_lighting = props.get_do_lighting ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2426
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2427 Matrix fcolor = (fc_mode == TEXTURE ? Matrix (1, 3, 1.0)
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	2428 : props.get_facecolor_rgb ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2429 Matrix ecolor = props.get_edgecolor_rgb ();
24154 78ff6ba5cbb1 Add basic support of "facealpha" for surfaces and patches in OpenGL (bug #39535) Markus Mützel <markus.muetzel@gmx.de> parents: 23863 diff changeset	2430 double fa = 1.0;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2431
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2432 float as = props.get_ambientstrength ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2433 float ds = props.get_diffusestrength ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2434 float ss = props.get_specularstrength ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2435 float se = props.get_specularexponent () * 5; // to fit Matlab
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2436 float scr = props.get_specularcolorreflectance ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2437 float cb[4] = { 0.0, 0.0, 0.0, 1.0 };
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2438
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2439 opengl_texture tex (m_glfcns);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2440
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2441 int i1, i2, j1, j2;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2442 bool x_mat = (x.rows () == z.rows ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2443 bool y_mat = (y.columns () == z.columns ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2444
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2445 i1 = i2 = j1 = j2 = 0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2446
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2447 if ((fc_mode > 0 && fc_mode < 3) \|\| ec_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2448 c = props.get_color_data ().array_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2449
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2450 boolMatrix clip (z.dims (), false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2451
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2452 for (int i = 0; i < zr; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2453 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2454 if (x_mat)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2455 i1 = i;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2456
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2457 for (int j = 0; j < zc; j++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2458 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2459 if (y_mat)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2460 j1 = j;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2461
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2462 clip(i,j) = is_nan_or_inf (x(i1,j), y(i,j1), z(i,j));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2463 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2464 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2465
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2466 if (fa_mode > 0 \|\| ea_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2467 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2468 // FIXME: implement alphadata conversion
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2469 //a = props.get_alpha_data ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2470 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2471
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2472 if (fl_mode > 0 \|\| el_mode > 0)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2473 m_glfcns.glMaterialf (LIGHT_MODE, GL_SHININESS, se);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2474
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2475 // FIXME: good candidate for caching,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2476 // transferring pixel data to OpenGL is time consuming.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2477 if (fc_mode == TEXTURE)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2478 tex = opengl_texture::create (m_glfcns, props.get_color_data ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2479
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2480 if (draw_all \|\| ! props.facecolor_is ("none"))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2481 {
24154 78ff6ba5cbb1 Add basic support of "facealpha" for surfaces and patches in OpenGL (bug #39535) Markus Mützel <markus.muetzel@gmx.de> parents: 23863 diff changeset	2482 if (fa_mode == 0)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2483 {
24154 78ff6ba5cbb1 Add basic support of "facealpha" for surfaces and patches in OpenGL (bug #39535) Markus Mützel <markus.muetzel@gmx.de> parents: 23863 diff changeset	2484 fa = props.get_facealpha_double ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2485 if (fc_mode == UNIFORM \|\| fc_mode == TEXTURE)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2486 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2487 m_glfcns.glColor4d (fcolor(0), fcolor(1), fcolor(2), fa);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2488 if (fl_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2489 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2490 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2491 cb[i] = as * fcolor(i);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2492 m_glfcns.glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2493
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2494 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2495 cb[i] = ds * fcolor(i);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2496 m_glfcns.glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2497
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2498 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2499 cb[i] = ss * (scr + (1-scr) * fcolor(i));
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2500 m_glfcns.glMaterialfv (LIGHT_MODE, GL_SPECULAR, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2501 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2502 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2503
25423 13b1b9a0d9c5 Move management of lights in axes from GL to graphics backend. Markus Mützel <markus.muetzel@gmx.de> parents: 25419 diff changeset	2504 if ((fl_mode > 0) && do_lighting)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2505 m_glfcns.glEnable (GL_LIGHTING);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2506 m_glfcns.glShadeModel ((fc_mode == INTERP \|\| fl_mode == GOURAUD)
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	2507 ? GL_SMOOTH : GL_FLAT);
24173 730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	2508 set_polygon_offset (true, 1.0);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2509 if (fc_mode == TEXTURE)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2510 m_glfcns.glEnable (GL_TEXTURE_2D);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2511
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2512 for (int i = 1; i < zc; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2513 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2514 if (y_mat)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2515 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2516 i1 = i-1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2517 i2 = i;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2518 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2519
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2520 for (int j = 1; j < zr; j++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2521 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2522
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2523 if (clip(j-1, i-1) \|\| clip(j, i-1)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2524 \|\| clip(j-1, i) \|\| clip(j, i))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2525 continue;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2526
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2527 if (fc_mode == FLAT)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2528 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2529 // "flat" only needs color at lower-left vertex
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	2530 if (! math::isfinite (c(j-1,i-1)))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2531 continue;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2532 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2533 else if (fc_mode == INTERP)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2534 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2535 // "interp" needs valid color at all 4 vertices
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	2536 if (! (math::isfinite (c(j-1, i-1)) && math::isfinite (c(j, i-1))
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	2537 && math::isfinite (c(j-1, i)) && math::isfinite (c(j, i))))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2538 continue;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2539 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2540
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2541 if (x_mat)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2542 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2543 j1 = j-1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2544 j2 = j;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2545 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2546
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2547 m_glfcns.glBegin (GL_QUADS);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2548
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2549 // Vertex 1
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2550 if (fc_mode == TEXTURE)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2551 tex.tex_coord (double (i-1) / (zc-1),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2552 double (j-1) / (zr-1));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2553 else if (fc_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2554 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2555 // FIXME: is there a smarter way to do this?
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2556 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2557 cb[k] = c(j-1, i-1, k);
24154 78ff6ba5cbb1 Add basic support of "facealpha" for surfaces and patches in OpenGL (bug #39535) Markus Mützel <markus.muetzel@gmx.de> parents: 23863 diff changeset	2558 cb[3] = fa;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2559 m_glfcns.glColor4fv (cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2560
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2561 if (fl_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2562 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2563 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2564 cb[k] *= as;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2565 m_glfcns.glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2566
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2567 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2568 cb[k] = ds * c(j-1, i-1, k);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2569 m_glfcns.glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2570
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2571 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2572 cb[k] = ss * (scr + (1-scr) * c(j-1, i-1, k));
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2573 m_glfcns.glMaterialfv (LIGHT_MODE, GL_SPECULAR, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2574 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2575 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2576 if (fl_mode > 0)
25867 49ffa78f9243 Use "facenormals" for flat lighting on surfaces (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25864 diff changeset	2577 set_normal (bfl_mode, (fl_mode == GOURAUD ? vn : fn),
49ffa78f9243 Use "facenormals" for flat lighting on surfaces (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25864 diff changeset	2578 j-1, i-1);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2579
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2580 m_glfcns.glVertex3d (x(j1,i-1), y(j-1,i1), z(j-1,i-1));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2581
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2582 // Vertex 2
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2583 if (fc_mode == TEXTURE)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2584 tex.tex_coord (double (i) / (zc-1), double (j-1) / (zr-1));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2585 else if (fc_mode == INTERP)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2586 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2587 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2588 cb[k] = c(j-1, i, k);
24154 78ff6ba5cbb1 Add basic support of "facealpha" for surfaces and patches in OpenGL (bug #39535) Markus Mützel <markus.muetzel@gmx.de> parents: 23863 diff changeset	2589 cb[3] = fa;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2590 m_glfcns.glColor4fv (cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2591
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2592 if (fl_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2593 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2594 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2595 cb[k] *= as;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2596 m_glfcns.glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2597
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2598 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2599 cb[k] = ds * c(j-1, i, k);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2600 m_glfcns.glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2601
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2602 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2603 cb[k] = ss * (scr + (1-scr) * c(j-1, i, k));
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2604 m_glfcns.glMaterialfv (LIGHT_MODE, GL_SPECULAR, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2605 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2606 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2607
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2608 if (fl_mode == GOURAUD)
25867 49ffa78f9243 Use "facenormals" for flat lighting on surfaces (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25864 diff changeset	2609 set_normal (bfl_mode, vn, j-1, i);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2610
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2611 m_glfcns.glVertex3d (x(j1,i), y(j-1,i2), z(j-1,i));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2612
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2613 // Vertex 3
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2614 if (fc_mode == TEXTURE)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2615 tex.tex_coord (double (i) / (zc-1), double (j) / (zr-1));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2616 else if (fc_mode == INTERP)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2617 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2618 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2619 cb[k] = c(j, i, k);
24154 78ff6ba5cbb1 Add basic support of "facealpha" for surfaces and patches in OpenGL (bug #39535) Markus Mützel <markus.muetzel@gmx.de> parents: 23863 diff changeset	2620 cb[3] = fa;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2621 m_glfcns.glColor4fv (cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2622
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2623 if (fl_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2624 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2625 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2626 cb[k] *= as;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2627 m_glfcns.glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2628
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2629 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2630 cb[k] = ds * c(j, i, k);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2631 m_glfcns.glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2632
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2633 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2634 cb[k] = ss * (scr + (1-scr) * c(j, i, k));
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2635 m_glfcns.glMaterialfv (LIGHT_MODE, GL_SPECULAR, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2636 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2637 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2638 if (fl_mode == GOURAUD)
25867 49ffa78f9243 Use "facenormals" for flat lighting on surfaces (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25864 diff changeset	2639 set_normal (bfl_mode, vn, j, i);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2640
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2641 m_glfcns.glVertex3d (x(j2,i), y(j,i2), z(j,i));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2642
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2643 // Vertex 4
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2644 if (fc_mode == TEXTURE)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2645 tex.tex_coord (double (i-1) / (zc-1), double (j) / (zr-1));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2646 else if (fc_mode == INTERP)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2647 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2648 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2649 cb[k] = c(j, i-1, k);
24154 78ff6ba5cbb1 Add basic support of "facealpha" for surfaces and patches in OpenGL (bug #39535) Markus Mützel <markus.muetzel@gmx.de> parents: 23863 diff changeset	2650 cb[3] = fa;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2651 m_glfcns.glColor4fv (cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2652
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2653 if (fl_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2654 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2655 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2656 cb[k] *= as;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2657 m_glfcns.glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2658
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2659 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2660 cb[k] = ds * c(j, i-1, k);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2661 m_glfcns.glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2662
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2663 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2664 cb[k] = ss * (scr + (1-scr) * c(j, i-1, k));
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2665 m_glfcns.glMaterialfv (LIGHT_MODE, GL_SPECULAR, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2666 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2667 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2668 if (fl_mode == GOURAUD)
25867 49ffa78f9243 Use "facenormals" for flat lighting on surfaces (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25864 diff changeset	2669 set_normal (bfl_mode, vn, j, i-1);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2670
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2671 m_glfcns.glVertex3d (x(j2,i-1), y(j,i1), z(j,i-1));
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2672
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2673 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2674 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2675 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2676
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2677 set_polygon_offset (false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2678 if (fc_mode == TEXTURE)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2679 m_glfcns.glDisable (GL_TEXTURE_2D);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2680
25423 13b1b9a0d9c5 Move management of lights in axes from GL to graphics backend. Markus Mützel <markus.muetzel@gmx.de> parents: 25419 diff changeset	2681 if ((fl_mode > 0) && do_lighting)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2682 m_glfcns.glDisable (GL_LIGHTING);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2683 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2684 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2685 {
24154 78ff6ba5cbb1 Add basic support of "facealpha" for surfaces and patches in OpenGL (bug #39535) Markus Mützel <markus.muetzel@gmx.de> parents: 23863 diff changeset	2686 // FIXME: implement flat, interp and texturemap transparency
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2687 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2688 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2689
22391 c5da5e5e9846 Fix inconsistent on-screen/printout patch and surface edges (bug #48873). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22369 diff changeset	2690 if (! props.edgecolor_is ("none") && ! props.linestyle_is ("none"))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2691 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2692 if (props.get_edgealpha_double () == 1)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2693 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2694 if (ec_mode == UNIFORM)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2695 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2696 m_glfcns.glColor3dv (ecolor.data ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2697 if (fl_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2698 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2699 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2700 cb[i] = as * ecolor(i);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2701 m_glfcns.glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2702
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2703 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2704 cb[i] = ds * ecolor(i);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2705 m_glfcns.glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2706
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2707 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2708 cb[i] = ss * (scr + (1-scr) * ecolor(i));
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2709 m_glfcns.glMaterialfv (LIGHT_MODE, GL_SPECULAR, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2710 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2711 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2712
25423 13b1b9a0d9c5 Move management of lights in axes from GL to graphics backend. Markus Mützel <markus.muetzel@gmx.de> parents: 25419 diff changeset	2713 if ((el_mode > 0) && do_lighting)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2714 m_glfcns.glEnable (GL_LIGHTING);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2715 m_glfcns.glShadeModel ((ec_mode == INTERP \|\| el_mode == GOURAUD)
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	2716 ? GL_SMOOTH : GL_FLAT);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2717
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	2718 set_linestyle (props.get_linestyle (), false,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	2719 props.get_linewidth ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2720 set_linewidth (props.get_linewidth ());
22838 1444a65085ca Make axes corners join in printout (bug #39643) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22759 diff changeset	2721 set_linecap ("butt");
22759 39f39eb4e476 Implement "linejoin" property (bug #48387) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22755 diff changeset	2722 set_linejoin ("miter");
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2723
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2724 // Mesh along Y-axis
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2725
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2726 if (props.meshstyle_is ("both") \|\| props.meshstyle_is ("column"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2727 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2728 for (int i = 0; i < zc; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2729 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2730 if (y_mat)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2731 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2732 i1 = i-1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2733 i2 = i;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2734 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2735
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2736 for (int j = 1; j < zr; j++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2737 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2738 if (clip(j-1,i) \|\| clip(j,i))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2739 continue;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2740
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2741 if (ec_mode == FLAT)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2742 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2743 // "flat" only needs color at lower-left vertex
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	2744 if (! math::isfinite (c(j-1,i)))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2745 continue;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2746 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2747 else if (ec_mode == INTERP)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2748 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2749 // "interp" needs valid color at both vertices
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	2750 if (! (math::isfinite (c(j-1, i)) && math::isfinite (c(j, i))))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2751 continue;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2752 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2753
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2754 if (x_mat)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2755 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2756 j1 = j-1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2757 j2 = j;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2758 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2759
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2760 m_glfcns.glBegin (GL_LINES);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2761
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2762 // Vertex 1
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2763 if (ec_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2764 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2765 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2766 cb[k] = c(j-1, i, k);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2767 m_glfcns.glColor3fv (cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2768
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2769 if (el_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2770 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2771 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2772 cb[k] *= as;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2773 m_glfcns.glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2774
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2775 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2776 cb[k] = ds * c(j-1, i, k);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2777 m_glfcns.glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2778
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2779 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2780 cb[k] = ss * (scr + (1-scr) * c(j-1, i, k));
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2781 m_glfcns.glMaterialfv (LIGHT_MODE, GL_SPECULAR, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2782 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2783 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2784 if (el_mode > 0)
25867 49ffa78f9243 Use "facenormals" for flat lighting on surfaces (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25864 diff changeset	2785 set_normal (bfl_mode, (el_mode == GOURAUD ? vn : fn),
49ffa78f9243 Use "facenormals" for flat lighting on surfaces (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25864 diff changeset	2786 j-1, i);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2787
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2788 m_glfcns.glVertex3d (x(j1,i), y(j-1,i2), z(j-1,i));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2789
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2790 // Vertex 2
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2791 if (ec_mode == INTERP)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2792 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2793 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2794 cb[k] = c(j, i, k);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2795 m_glfcns.glColor3fv (cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2796
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2797 if (el_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2798 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2799 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2800 cb[k] *= as;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2801 m_glfcns.glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2802
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2803 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2804 cb[k] = ds * c(j, i, k);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2805 m_glfcns.glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2806
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2807 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2808 cb[k] = ss * (scr + (1-scr) * c(j, i, k));
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2809 m_glfcns.glMaterialfv (LIGHT_MODE, GL_SPECULAR, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2810 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2811 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2812 if (el_mode == GOURAUD)
25867 49ffa78f9243 Use "facenormals" for flat lighting on surfaces (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25864 diff changeset	2813 set_normal (bfl_mode, vn, j, i);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2814
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2815 m_glfcns.glVertex3d (x(j2,i), y(j,i2), z(j,i));
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2816
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2817 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2818 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2819 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2820 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2821
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2822 // Mesh along X-axis
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2823
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2824 if (props.meshstyle_is ("both") \|\| props.meshstyle_is ("row"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2825 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2826 for (int j = 0; j < zr; j++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2827 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2828 if (x_mat)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2829 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2830 j1 = j-1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2831 j2 = j;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2832 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2833
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2834 for (int i = 1; i < zc; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2835 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2836 if (clip(j,i-1) \|\| clip(j,i))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2837 continue;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2838
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2839 if (ec_mode == FLAT)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2840 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2841 // "flat" only needs color at lower-left vertex
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	2842 if (! math::isfinite (c(j,i-1)))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2843 continue;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2844 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2845 else if (ec_mode == INTERP)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2846 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2847 // "interp" needs valid color at both vertices
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	2848 if (! (math::isfinite (c(j, i-1)) && math::isfinite (c(j, i))))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2849 continue;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2850 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2851
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2852 if (y_mat)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2853 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2854 i1 = i-1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2855 i2 = i;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2856 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2857
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2858 m_glfcns.glBegin (GL_LINES);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2859
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2860 // Vertex 1
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2861 if (ec_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2862 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2863 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2864 cb[k] = c(j, i-1, k);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2865 m_glfcns.glColor3fv (cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2866
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2867 if (el_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2868 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2869 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2870 cb[k] *= as;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2871 m_glfcns.glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2872
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2873 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2874 cb[k] = ds * c(j, i-1, k);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2875 m_glfcns.glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2876
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2877 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2878 cb[k] = ss * (scr + (1-scr) * c(j, i-1, k));
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2879 m_glfcns.glMaterialfv (LIGHT_MODE, GL_SPECULAR, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2880 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2881 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2882 if (el_mode > 0)
25867 49ffa78f9243 Use "facenormals" for flat lighting on surfaces (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25864 diff changeset	2883 set_normal (bfl_mode, (el_mode == GOURAUD ? vn : fn),
49ffa78f9243 Use "facenormals" for flat lighting on surfaces (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25864 diff changeset	2884 j, i-1);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2885
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2886 m_glfcns.glVertex3d (x(j2,i-1), y(j,i1), z(j,i-1));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2887
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2888 // Vertex 2
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2889 if (ec_mode == INTERP)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2890 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2891 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2892 cb[k] = c(j, i, k);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2893 m_glfcns.glColor3fv (cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2894
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2895 if (el_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2896 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2897 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2898 cb[k] *= as;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2899 m_glfcns.glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2900
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2901 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2902 cb[k] = ds * c(j, i, k);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2903 m_glfcns.glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2904
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2905 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2906 cb[k] = ss * (scr + (1-scr) * c(j, i, k));
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2907 m_glfcns.glMaterialfv (LIGHT_MODE, GL_SPECULAR, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2908 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2909 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2910 if (el_mode == GOURAUD)
25867 49ffa78f9243 Use "facenormals" for flat lighting on surfaces (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25864 diff changeset	2911 set_normal (bfl_mode, vn, j, i);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2912
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2913 m_glfcns.glVertex3d (x(j2,i), y(j,i2), z(j,i));
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2914
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2915 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2916 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2917 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2918 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2919
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	2920 set_linestyle ("-"); // Disable LineStipple
22358 dc73bbd66363 Make sure all lines associated with axes respect axes linewidth property. Rik <rik@octave.org> parents: 22357 diff changeset	2921 set_linewidth (0.5f);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2922
25423 13b1b9a0d9c5 Move management of lights in axes from GL to graphics backend. Markus Mützel <markus.muetzel@gmx.de> parents: 25419 diff changeset	2923 if ((el_mode > 0) && do_lighting)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2924 m_glfcns.glDisable (GL_LIGHTING);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2925 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2926 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2927 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2928 // FIXME: implement transparency
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2929 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2930 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2931
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2932 if (! props.marker_is ("none")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2933 && ! (props.markeredgecolor_is ("none")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2934 && props.markerfacecolor_is ("none")))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2935 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2936 // FIXME: check how transparency should be handled in markers
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2937 // FIXME: check what to do with marker facecolor set to auto
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2938 // and facecolor set to none.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2939
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2940 bool do_edge = draw_all \|\| ! props.markeredgecolor_is ("none");
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2941 bool do_face = draw_all \|\| ! props.markerfacecolor_is ("none");
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2942
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2943 Matrix mecolor = (draw_all ? Matrix (1, 3, 0.0) :
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2944 props.get_markeredgecolor_rgb ());
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2945 Matrix mfcolor = (draw_all ? Matrix (1, 3, 0.0) :
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2946 props.get_markerfacecolor_rgb ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2947 Matrix cc (1, 3, 0.0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2948
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	2949 if (mecolor.isempty () && props.markeredgecolor_is ("auto"))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2950 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2951 mecolor = props.get_edgecolor_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2952 do_edge = ! props.edgecolor_is ("none");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2953 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2954
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	2955 if (mfcolor.isempty () && props.markerfacecolor_is ("auto"))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2956 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2957 mfcolor = props.get_facecolor_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2958 do_face = ! props.facecolor_is ("none");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2959 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2960
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	2961 if ((mecolor.isempty () \|\| mfcolor.isempty ()) && c.isempty ())
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2962 c = props.get_color_data ().array_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2963
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2964 init_marker (props.get_marker (), props.get_markersize (),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2965 props.get_linewidth ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2966
25896 c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	2967 uint8_t clip_mask = (props.is_clipping () ? 0x7F : 0x40);
c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	2968 uint8_t clip_ok = 0x40;
c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	2969
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2970 for (int i = 0; i < zc; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2971 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2972 if (y_mat)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2973 i1 = i;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2974
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2975 for (int j = 0; j < zr; j++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2976 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2977 if (x_mat)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2978 j1 = j;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2979
25896 c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	2980 if ((clip_code (x(j1,i), y(j,i1), z(j,i)) & clip_mask)
c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	2981 != clip_ok)
c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	2982 continue;
c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	2983
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	2984 if ((do_edge && mecolor.isempty ())
80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	2985 \|\| (do_face && mfcolor.isempty ()))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2986 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	2987 if (! math::isfinite (c(j,i)))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2988 continue; // Skip NaNs in color data
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2989
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2990 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2991 cc(k) = c(j,i,k);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2992 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2993
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	2994 Matrix lc = (do_edge ? (mecolor.isempty () ? cc : mecolor)
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	2995 : Matrix ());
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	2996 Matrix fc = (do_face ? (mfcolor.isempty () ? cc : mfcolor)
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	2997 : Matrix ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2998
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2999 draw_marker (x(j1,i), y(j,i1), z(j,i), lc, fc);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3000 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3001 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3002
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3003 end_marker ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3004 }
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3005
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3006 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3007
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3008 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3009
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3010 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3011 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3012
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3013 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3014
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3015 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3016 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3017
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3018 // FIXME: global optimization (rendering, data structures...),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3019 // there is probably a smarter/faster/less-memory-consuming way to do this.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3020 void
23433 c9fab0bc983e maint: Use convention 'int& x' for naming references. Rik <rik@octave.org> parents: 23396 diff changeset	3021 opengl_renderer::draw_patch (const patch::properties& props)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3022 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3023 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3024
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3025 // Do not render if the patch has incoherent data
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3026 std::string msg;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3027 if (props.has_bad_data (msg))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3028 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3029 warning ("opengl_renderer: %s. Not rendering.", msg.c_str ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3030 return;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3031 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3032
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3033 bool draw_all = selecting && props.pickableparts_is ("all");
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3034 const Matrix f = props.get_faces ().matrix_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3035 const Matrix v = xform.scale (props.get_vertices ().matrix_value ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3036 Matrix c;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3037 Matrix a;
24154 78ff6ba5cbb1 Add basic support of "facealpha" for surfaces and patches in OpenGL (bug #39535) Markus Mützel <markus.muetzel@gmx.de> parents: 23863 diff changeset	3038 double fa = 1.0;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3039
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3040 int nv = v.rows ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3041 int nf = f.rows ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3042 int fcmax = f.columns ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3043
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3044 bool has_z = (v.columns () > 2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3045 bool has_facecolor = false;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3046 bool has_facealpha = false;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3047
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3048 int fc_mode = ((props.facecolor_is ("none")
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3049 \|\| props.facecolor_is_rgb () \|\| draw_all) ? 0 :
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3050 (props.facecolor_is ("flat") ? 1 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3051 int fl_mode = (props.facelighting_is ("none") ? 0 :
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3052 (props.facelighting_is ("flat") ? 1 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3053 int fa_mode = (props.facealpha_is_double () ? 0 :
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3054 (props.facealpha_is ("flat") ? 1 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3055 int ec_mode = ((props.edgecolor_is ("none")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3056 \|\| props.edgecolor_is_rgb ()) ? 0 :
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3057 (props.edgecolor_is ("flat") ? 1 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3058 int el_mode = (props.edgelighting_is ("none") ? 0 :
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3059 (props.edgelighting_is ("flat") ? 1 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3060 int ea_mode = (props.edgealpha_is_double () ? 0 :
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3061 (props.edgealpha_is ("flat") ? 1 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3062 int bfl_mode = (props.backfacelighting_is ("lit") ? 0 :
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3063 (props.backfacelighting_is ("reverselit") ? 1 : 2));
25423 13b1b9a0d9c5 Move management of lights in axes from GL to graphics backend. Markus Mützel <markus.muetzel@gmx.de> parents: 25419 diff changeset	3064 bool do_lighting = props.get_do_lighting ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3065
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3066 Matrix fcolor = props.get_facecolor_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3067 Matrix ecolor = props.get_edgecolor_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3068
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3069 float as = props.get_ambientstrength ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3070 float ds = props.get_diffusestrength ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3071 float ss = props.get_specularstrength ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3072 float se = props.get_specularexponent () * 5; // to fit Matlab
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3073 float scr = props.get_specularcolorreflectance ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3074
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3075 const Matrix vn = props.get_vertexnormals ().matrix_value ();
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3076 bool has_vertex_normals = (vn.rows () == nv);
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3077 const Matrix fn = props.get_facenormals ().matrix_value ();
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3078 bool has_face_normals = (fn.rows () == nf);
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3079
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3080 boolMatrix clip (1, nv, false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3081
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3082 if (has_z)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3083 for (int i = 0; i < nv; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3084 clip(i) = is_nan_or_inf (v(i,0), v(i,1), v(i,2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3085 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3086 for (int i = 0; i < nv; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3087 clip(i) = is_nan_or_inf (v(i,0), v(i,1), 0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3088
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3089 boolMatrix clip_f (1, nf, false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3090 Array<int> count_f (dim_vector (nf, 1), 0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3091
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3092 for (int i = 0; i < nf; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3093 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3094 bool fclip = false;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3095 int count = 0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3096
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3097 for (int j = 0; j < fcmax && ! math::isnan (f(i,j)); j++, count++)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3098 fclip = (fclip \|\| clip(int (f(i,j) - 1)));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3099
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3100 clip_f(i) = fclip;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3101 count_f(i) = count;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3102 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3103
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3104 if (draw_all \|\| fc_mode > 0 \|\| ec_mode > 0)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3105 {
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3106 if (draw_all)
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3107 c = Matrix (1, 3, 0.0);
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3108 else
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3109 c = props.get_color_data ().matrix_value ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3110
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3111 if (c.rows () == 1)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3112 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3113 // Single color specifications, we can simplify a little bit
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3114
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3115 if (draw_all \|\| fc_mode > 0)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3116 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3117 fcolor = c;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3118 fc_mode = UNIFORM;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3119 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3120
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3121 if (draw_all \|\| ec_mode > 0)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3122 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3123 ecolor = c;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3124 ec_mode = UNIFORM;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3125 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3126
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3127 c = Matrix ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3128 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3129 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3130 has_facecolor = ((c.numel () > 0) && (c.rows () == f.rows ()));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3131 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3132
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3133 if (fa_mode > 0 \|\| ea_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3134 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3135 // FIXME: retrieve alpha data from patch object
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3136 //a = props.get_alpha_data ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3137 has_facealpha = ((a.numel () > 0) && (a.rows () == f.rows ()));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3138 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3139
24154 78ff6ba5cbb1 Add basic support of "facealpha" for surfaces and patches in OpenGL (bug #39535) Markus Mützel <markus.muetzel@gmx.de> parents: 23863 diff changeset	3140 if (fa_mode == 0)
78ff6ba5cbb1 Add basic support of "facealpha" for surfaces and patches in OpenGL (bug #39535) Markus Mützel <markus.muetzel@gmx.de> parents: 23863 diff changeset	3141 fa = props.get_facealpha_double ();
78ff6ba5cbb1 Add basic support of "facealpha" for surfaces and patches in OpenGL (bug #39535) Markus Mützel <markus.muetzel@gmx.de> parents: 23863 diff changeset	3142
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3143 octave_idx_type fr = f.rows ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3144 std::vector<vertex_data> vdata (f.numel ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3145
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3146 for (int i = 0; i < nf; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3147 for (int j = 0; j < count_f(i); j++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3148 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3149 int idx = int (f(i,j) - 1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3150
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3151 Matrix vv (1, 3, 0.0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3152 Matrix cc;
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3153 Matrix vnn (1, 3, 0.0);
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3154 Matrix fnn (1, 3, 0.0);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3155 double aa = 1.0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3156
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3157 vv(0) = v(idx,0); vv(1) = v(idx,1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3158 if (has_z)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3159 vv(2) = v(idx,2);
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3160 if (((fl_mode == FLAT) \|\| (el_mode == FLAT)) && has_face_normals)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3161 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3162 double dir = 1.0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3163 if (bfl_mode > 0)
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3164 dir = ((fn(i,0) * view_vector(0)
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3165 + fn(i,1) * view_vector(1)
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3166 + fn(i,2) * view_vector(2) < 0)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3167 ? ((bfl_mode > 1) ? 0.0 : -1.0) : 1.0);
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3168 fnn(0) = dir * fn(i,0);
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3169 fnn(1) = dir * fn(i,1);
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3170 fnn(2) = dir * fn(i,2);
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3171 }
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3172 if (((fl_mode == GOURAUD) \|\| (el_mode == GOURAUD)) &&
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3173 has_vertex_normals)
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3174 {
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3175 double dir = 1.0;
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3176 if (bfl_mode > 0)
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3177 dir = ((vn(idx,0) * view_vector(0)
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3178 + vn(idx,1) * view_vector(1)
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3179 + vn(idx,2) * view_vector(2) < 0)
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3180 ? ((bfl_mode > 1) ? 0.0 : -1.0) : 1.0);
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3181 vnn(0) = dir * vn(idx,0);
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3182 vnn(1) = dir * vn(idx,1);
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3183 vnn(2) = dir * vn(idx,2);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3184 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3185 if (c.numel () > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3186 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3187 cc.resize (1, 3);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3188 if (has_facecolor)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3189 cc(0) = c(i,0), cc(1) = c(i,1), cc(2) = c(i,2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3190 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3191 cc(0) = c(idx,0), cc(1) = c(idx,1), cc(2) = c(idx,2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3192 }
24154 78ff6ba5cbb1 Add basic support of "facealpha" for surfaces and patches in OpenGL (bug #39535) Markus Mützel <markus.muetzel@gmx.de> parents: 23863 diff changeset	3193 if (fa_mode == 0)
78ff6ba5cbb1 Add basic support of "facealpha" for surfaces and patches in OpenGL (bug #39535) Markus Mützel <markus.muetzel@gmx.de> parents: 23863 diff changeset	3194 aa = fa;
78ff6ba5cbb1 Add basic support of "facealpha" for surfaces and patches in OpenGL (bug #39535) Markus Mützel <markus.muetzel@gmx.de> parents: 23863 diff changeset	3195 else if (a.numel () > 0)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3196 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3197 if (has_facealpha)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3198 aa = a(i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3199 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3200 aa = a(idx);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3201 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3202
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3203 vdata[i+j*fr] = vertex_data (vv, cc, vnn, fnn, aa, as, ds, ss, se, scr);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3204 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3205
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3206 if (fl_mode > 0 \|\| el_mode > 0)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3207 m_glfcns.glMaterialf (LIGHT_MODE, GL_SHININESS, se);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3208
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3209 std::list<std::list<octave_idx_type>>::const_iterator it1;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3210
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3211 if (draw_all \|\| ! props.facecolor_is ("none"))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3212 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3213 // FIXME: adapt to double-radio property
24154 78ff6ba5cbb1 Add basic support of "facealpha" for surfaces and patches in OpenGL (bug #39535) Markus Mützel <markus.muetzel@gmx.de> parents: 23863 diff changeset	3214 if (fa_mode == 0)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3215 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3216 if (fc_mode == UNIFORM)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3217 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3218 m_glfcns.glColor4d (fcolor(0), fcolor(1), fcolor(2), fa);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3219 if (fl_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3220 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3221 float cb[4] = { 0, 0, 0, 1 };
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3222
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3223 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3224 cb[i] = as * fcolor(i);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3225 m_glfcns.glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3226
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3227 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3228 cb[i] = ds * fcolor(i);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3229 m_glfcns.glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3230
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3231 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3232 cb[i] = ss * (scr + (1-scr) * fcolor(i));
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3233 m_glfcns.glMaterialfv (LIGHT_MODE, GL_SPECULAR, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3234 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3235 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3236
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3237 if ((fl_mode > 0) && do_lighting)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3238 m_glfcns.glEnable (GL_LIGHTING);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3239
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3240 // NOTE: Push filled part of patch backwards to avoid Z-fighting
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3241 // with tesselator outline. A value of 1.0 seems to work fine.
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3242 // Value can't be too large or the patch will be pushed below the
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3243 // axes planes at +2.5.
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3244 patch_tesselator tess (this, fc_mode, fl_mode, 1.0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3245
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3246 it1 = props.coplanar_last_idx.begin ();
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3247 std::list<octave_idx_type>::const_iterator it2;
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3248 octave_idx_type i_start, i_end;
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3249
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3250 for (int i = 0; i < nf; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3251 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3252 if (clip_f(i))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3253 continue;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3254
25419 7361fd8aed86 Fix segmentation fault with last change (bug #47677). Markus Mützel <markus.muetzel@gmx.de> parents: 25418 diff changeset	3255 bool is_non_planar = false;
7361fd8aed86 Fix segmentation fault with last change (bug #47677). Markus Mützel <markus.muetzel@gmx.de> parents: 25418 diff changeset	3256 if (props.coplanar_last_idx.size () > 0 && (*it1).size () > 1)
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3257 {
25419 7361fd8aed86 Fix segmentation fault with last change (bug #47677). Markus Mützel <markus.muetzel@gmx.de> parents: 25418 diff changeset	3258 is_non_planar = true;
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3259 it2 = (*it1).end ();
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3260 it2--;
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3261 }
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3262
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3263 // loop over planar subsets of face
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3264 do
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3265 {
25419 7361fd8aed86 Fix segmentation fault with last change (bug #47677). Markus Mützel <markus.muetzel@gmx.de> parents: 25418 diff changeset	3266 if (is_non_planar)
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3267 {
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3268 i_end = *it2;
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3269 if (it2 == (*it1).begin ())
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3270 i_start = 0;
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3271 else
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3272 {
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3273 it2--;
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3274 i_start = *it2 - 1;
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3275 }
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3276 }
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3277 else
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3278 {
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3279 i_end = count_f(i) - 1;
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3280 i_start = 0;
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3281 }
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3282
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3283 tess.begin_polygon (true);
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3284 tess.begin_contour ();
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3285
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3286 // Add vertices in reverse order for Matlab compatibility
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3287 for (int j = i_end; j > i_start; j--)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3288 {
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3289 vertex_data::vertex_data_rep *vv =
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3290 vdata[i+j*fr].get_rep ();
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3291
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3292 tess.add_vertex (vv->coords.fortran_vec (), vv);
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3293 }
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3294
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3295 if (count_f(i) > 0)
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3296 {
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3297 vertex_data::vertex_data_rep *vv = vdata[i].get_rep ();
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3298
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3299 if (fc_mode == FLAT)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3300 {
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3301 // For "flat" shading, use color of 1st vertex.
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3302 Matrix col = vv->color;
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3303
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3304 if (col.numel () == 3)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3305 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3306 m_glfcns.glColor4d (col(0), col(1), col(2), fa);
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3307 if (fl_mode > 0)
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3308 {
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3309 float cb[4] = { 0, 0, 0, 1 };
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3310
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3311 for (int k = 0; k < 3; k++)
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3312 cb[k] = (vv->ambient * col(k));
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3313 m_glfcns.glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3314
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3315 for (int k = 0; k < 3; k++)
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3316 cb[k] = (vv->diffuse * col(k));
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3317 m_glfcns.glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3318
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3319 for (int k = 0; k < 3; k++)
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3320 cb[k] = vv->specular *
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3321 (vv->specular_color_refl
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3322 + (1-vv->specular_color_refl) *
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3323 col(k));
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3324 m_glfcns.glMaterialfv (LIGHT_MODE, GL_SPECULAR, cb);
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3325 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3326 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3327 }
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3328
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3329 tess.add_vertex (vv->coords.fortran_vec (), vv);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3330 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3331
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3332 tess.end_contour ();
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3333 tess.end_polygon ();
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3334 } while (i_start > 0);
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3335
25419 7361fd8aed86 Fix segmentation fault with last change (bug #47677). Markus Mützel <markus.muetzel@gmx.de> parents: 25418 diff changeset	3336 if (is_non_planar)
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3337 it1++;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3338 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3339
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3340 if ((fl_mode > 0) && do_lighting)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3341 m_glfcns.glDisable (GL_LIGHTING);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3342 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3343 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3344 {
24154 78ff6ba5cbb1 Add basic support of "facealpha" for surfaces and patches in OpenGL (bug #39535) Markus Mützel <markus.muetzel@gmx.de> parents: 23863 diff changeset	3345 // FIXME: implement flat and interp transparency
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3346 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3347 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3348
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3349 if (draw_all
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3350 \|\| (! props.edgecolor_is ("none") && ! props.linestyle_is ("none")))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3351 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3352 // FIXME: adapt to double-radio property
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3353 if (props.get_edgealpha_double () == 1)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3354 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3355 if (ec_mode == UNIFORM)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3356 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3357 m_glfcns.glColor3dv (ecolor.data ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3358 if (el_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3359 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3360 float cb[4] = { 0, 0, 0, 1 };
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3361
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3362 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3363 cb[i] = (as * ecolor(i));
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3364 m_glfcns.glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3365
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3366 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3367 cb[i] = ds * ecolor(i);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3368 m_glfcns.glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3369
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3370 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3371 cb[i] = ss * (scr + (1-scr) * ecolor(i));
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3372 m_glfcns.glMaterialfv (LIGHT_MODE, GL_SPECULAR, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3373 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3374 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3375
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3376 if ((el_mode > 0) && do_lighting)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3377 m_glfcns.glEnable (GL_LIGHTING);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3378
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	3379 double linewidth = props.get_linewidth ();
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	3380 set_linestyle (props.get_linestyle (), false, linewidth);
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	3381 set_linewidth (linewidth);
22838 1444a65085ca Make axes corners join in printout (bug #39643) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22759 diff changeset	3382 set_linecap ("butt");
22759 39f39eb4e476 Implement "linejoin" property (bug #48387) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22755 diff changeset	3383 set_linejoin ("miter");
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3384
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3385 // NOTE: patch contour cannot be offset. Offset must occur with the
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3386 // filled portion of the patch above. The tesselator uses
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3387 // GLU_TESS_BOUNDARY_ONLY to get the outline of the patch and OpenGL
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3388 // automatically sets the glType to GL_LINE_LOOP. This primitive is
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3389 // not supported by glPolygonOffset which is used to do Z offsets.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3390 patch_tesselator tess (this, ec_mode, el_mode);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3391
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3392 it1 = props.coplanar_last_idx.begin ();
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3393
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3394 for (int i = 0; i < nf; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3395 {
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3396 bool is_non_planar = false;
25419 7361fd8aed86 Fix segmentation fault with last change (bug #47677). Markus Mützel <markus.muetzel@gmx.de> parents: 25418 diff changeset	3397 if (props.coplanar_last_idx.size () > 0 && (*it1).size () > 1)
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3398 is_non_planar = true;
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3399 if (clip_f(i) \|\| is_non_planar)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3400 {
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3401 // This is an unclosed contour or a non-planar face.
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3402 // Draw it as a line.
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3403 bool flag = false;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3404
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3405 m_glfcns.glShadeModel ((ec_mode == INTERP \|\| el_mode == GOURAUD)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3406 ? GL_SMOOTH : GL_FLAT);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3407
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3408 // Add vertices in reverse order for Matlab compatibility
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3409 for (int j = count_f(i)-1; j >= 0; j--)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3410 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3411 if (! clip(int (f(i,j) - 1)))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3412 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3413 vertex_data::vertex_data_rep *vv
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3414 = vdata[i+j*fr].get_rep ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3415 const Matrix m = vv->coords;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3416 if (! flag)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3417 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3418 flag = true;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3419 m_glfcns.glBegin (GL_LINE_STRIP);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3420 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3421 if (ec_mode != UNIFORM)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3422 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3423 Matrix col = vv->color;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3424
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3425 if (col.numel () == 3)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3426 m_glfcns.glColor3dv (col.data ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3427 }
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3428 m_glfcns.glVertex3d (m(0), m(1), m(2));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3429 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3430 else if (flag)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3431 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3432 flag = false;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3433 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3434 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3435 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3436 // Do loop body with vertex N to "close" GL_LINE_STRIP
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3437 // from vertex 0 to vertex N.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3438 int j = count_f(i)-1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3439 if (flag && ! clip(int (f(i,j) - 1)))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3440 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3441 vertex_data::vertex_data_rep *vv
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3442 = vdata[i+j*fr].get_rep ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3443 const Matrix m = vv->coords;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3444 if (ec_mode != UNIFORM)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3445 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3446 Matrix col = vv->color;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3447
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3448 if (col.numel () == 3)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3449 m_glfcns.glColor3dv (col.data ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3450 }
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3451 m_glfcns.glVertex3d (m(0), m(1), m(2));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3452 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3453
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3454 if (flag)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3455 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3456 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3457 else // Normal edge contour drawn with tesselator
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3458 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3459 tess.begin_polygon (false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3460 tess.begin_contour ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3461
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3462 for (int j = count_f(i)-1; j >= 0; j--)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3463 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3464 vertex_data::vertex_data_rep *vv
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3465 = vdata[i+j*fr].get_rep ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3466 tess.add_vertex (vv->coords.fortran_vec (), vv);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3467 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3468
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3469 tess.end_contour ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3470 tess.end_polygon ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3471 }
25419 7361fd8aed86 Fix segmentation fault with last change (bug #47677). Markus Mützel <markus.muetzel@gmx.de> parents: 25418 diff changeset	3472 if (is_non_planar)
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3473 it1++;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3474 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3475
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	3476 set_linestyle ("-"); // Disable LineStipple
22358 dc73bbd66363 Make sure all lines associated with axes respect axes linewidth property. Rik <rik@octave.org> parents: 22357 diff changeset	3477 set_linewidth (0.5f);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3478
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3479 if ((el_mode > 0) && do_lighting)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3480 m_glfcns.glDisable (GL_LIGHTING);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3481 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3482 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3483 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3484 // FIXME: implement transparency
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3485 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3486 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3487
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3488 if (! props.marker_is ("none")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3489 && ! (props.markeredgecolor_is ("none")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3490 && props.markerfacecolor_is ("none")))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3491 {
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3492 bool do_edge = draw_all \|\| ! props.markeredgecolor_is ("none");
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3493 bool do_face = draw_all \|\| ! props.markerfacecolor_is ("none");
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3494
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3495 Matrix mecolor = (draw_all ? Matrix (1, 3, 0.0) :
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3496 props.get_markeredgecolor_rgb ());
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3497 Matrix mfcolor = (draw_all ? Matrix (1, 3, 0.0) :
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3498 props.get_markerfacecolor_rgb ());
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3499
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3500 bool has_markerfacecolor = draw_all \|\| false;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3501
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	3502 if ((mecolor.isempty () && ! props.markeredgecolor_is ("none"))
80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	3503 \|\| (mfcolor.isempty () && ! props.markerfacecolor_is ("none")))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3504 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3505 Matrix mc = props.get_color_data ().matrix_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3506
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3507 if (mc.rows () == 1)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3508 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3509 // Single color specifications, we can simplify a little bit
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	3510 if (mfcolor.isempty () && ! props.markerfacecolor_is ("none"))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3511 mfcolor = mc;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3512
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	3513 if (mecolor.isempty () && ! props.markeredgecolor_is ("none"))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3514 mecolor = mc;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3515 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3516 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3517 {
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	3518 if (c.isempty ())
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3519 c = props.get_color_data ().matrix_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3520 has_markerfacecolor = ((c.numel () > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3521 && (c.rows () == f.rows ()));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3522 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3523 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3524
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3525 init_marker (props.get_marker (), props.get_markersize (),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3526 props.get_linewidth ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3527
25896 c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	3528 uint8_t clip_mask = (props.is_clipping () ? 0x7F : 0x40);
c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	3529 uint8_t clip_ok = 0x40;
c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	3530
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3531 for (int i = 0; i < nf; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3532 for (int j = 0; j < count_f(i); j++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3533 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3534 int idx = int (f(i,j) - 1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3535
25896 c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	3536 if ((clip_code (v(idx,0), v(idx,1), (has_z ? v(idx,2) : 0))
c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	3537 & clip_mask) != clip_ok)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3538 continue;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3539
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3540 Matrix cc;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3541 if (c.numel () > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3542 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3543 cc.resize (1, 3);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3544 if (has_markerfacecolor)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3545 cc(0) = c(i,0), cc(1) = c(i,1), cc(2) = c(i,2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3546 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3547 cc(0) = c(idx,0), cc(1) = c(idx,1), cc(2) = c(idx,2);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3548 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3549
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	3550 Matrix lc = (do_edge ? (mecolor.isempty () ? cc : mecolor)
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	3551 : Matrix ());
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	3552 Matrix fc = (do_face ? (mfcolor.isempty () ? cc : mfcolor)
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	3553 : Matrix ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3554
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3555 draw_marker (v(idx,0), v(idx,1), (has_z ? v(idx,2) : 0), lc, fc);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3556 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3557
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3558 end_marker ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3559 }
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3560
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3561 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3562
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3563 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3564
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3565 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3566 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3567
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3568 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3569
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3570 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3571 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3572
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3573 void
23433 c9fab0bc983e maint: Use convention 'int& x' for naming references. Rik <rik@octave.org> parents: 23396 diff changeset	3574 opengl_renderer::draw_light (const light::properties& props)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3575 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3576 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3577
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3578 // enable light source
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3579 m_glfcns.glEnable (m_current_light);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3580
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3581 // light position
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3582 float pos[4] = { 0, 0, 0, 0 }; // X,Y,Z,infinite/local
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3583 Matrix lpos = props.get_position ().matrix_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3584 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3585 pos[i] = lpos(i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3586 if (props.style_is ("local"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3587 pos[3] = 1;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3588 m_glfcns.glLightfv (m_current_light, GL_POSITION, pos);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3589
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3590 // light color
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3591 float col[4] = { 1, 1, 1, 1 }; // R,G,B,ALPHA (the latter has no meaning)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3592 Matrix lcolor = props.get_color ().matrix_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3593 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3594 col[i] = lcolor(i);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3595 m_glfcns.glLightfv (m_current_light, GL_DIFFUSE, col);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3596 m_glfcns.glLightfv (m_current_light, GL_SPECULAR, col);
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3597
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3598 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3599
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3600 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3601
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3602 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3603 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3604
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3605 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3606
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3607 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3608 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3609
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3610 void
23433 c9fab0bc983e maint: Use convention 'int& x' for naming references. Rik <rik@octave.org> parents: 23396 diff changeset	3611 opengl_renderer::draw_hggroup (const hggroup::properties& props)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3612 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3613 draw (props.get_children ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3614 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3615
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3616 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3617 opengl_renderer::draw_text (const text::properties& props)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3618 {
21789 6afdf40be534 Implement graphics object "light" (patch #8943). mmuetzel <markus.muetzel@gmx.de> parents: 21782 diff changeset	3619 #if defined (HAVE_OPENGL)
6afdf40be534 Implement graphics object "light" (patch #8943). mmuetzel <markus.muetzel@gmx.de> parents: 21782 diff changeset	3620
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	3621 if (props.get_string ().isempty ())
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3622 return;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3623
24173 730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3624 Matrix pos = xform.scale (props.get_data_position ());
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3625
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3626 // Handle clipping manually when drawing text background
25951 7a507e71d922 style fixes John W. Eaton <jwe@octave.org> parents: 25260 diff changeset	3627 if (! props.is_clipping ()
25952 12d4271aed87 maint: Merge stable to default. John W. Eaton <jwe@octave.org> parents: 25896 25951 diff changeset	3628 \|\| (clip_code (pos(0), pos(1), pos.numel () > 2 ? pos(2) : 0.0) == 0x40))
24173 730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3629 {
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3630 set_clipping (false);
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3631 draw_text_background (props);
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3632 set_clipping (props.is_clipping ());
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3633 }
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3634
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3635 set_font (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3636
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3637 const Matrix bbox = props.get_extent_matrix ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3638
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3639 bool blend = m_glfcns.glIsEnabled (GL_BLEND);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3640
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3641 m_glfcns.glEnable (GL_BLEND);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3642 m_glfcns.glEnable (GL_ALPHA_TEST);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3643 m_glfcns.glRasterPos3d (pos(0), pos(1), pos.numel () > 2 ? pos(2) : 0.0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3644 m_glfcns.glBitmap (0, 0, 0, 0, bbox(0), bbox(1), nullptr);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3645 m_glfcns.glDrawPixels (bbox(2), bbox(3), GL_RGBA, GL_UNSIGNED_BYTE,
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3646 props.get_pixels ().data ());
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3647 m_glfcns.glDisable (GL_ALPHA_TEST);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3648 if (! blend)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3649 m_glfcns.glDisable (GL_BLEND);
21789 6afdf40be534 Implement graphics object "light" (patch #8943). mmuetzel <markus.muetzel@gmx.de> parents: 21782 diff changeset	3650
6afdf40be534 Implement graphics object "light" (patch #8943). mmuetzel <markus.muetzel@gmx.de> parents: 21782 diff changeset	3651 #else
6afdf40be534 Implement graphics object "light" (patch #8943). mmuetzel <markus.muetzel@gmx.de> parents: 21782 diff changeset	3652
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3653 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3654
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3655 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3656 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3657
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3658 panic_impossible ();
21789 6afdf40be534 Implement graphics object "light" (patch #8943). mmuetzel <markus.muetzel@gmx.de> parents: 21782 diff changeset	3659
6afdf40be534 Implement graphics object "light" (patch #8943). mmuetzel <markus.muetzel@gmx.de> parents: 21782 diff changeset	3660 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3661 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3662
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3663 void
24173 730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3664 opengl_renderer::draw_text_background (const text::properties& props,
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3665 bool do_rotate)
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3666 {
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3667 #if defined (HAVE_OPENGL)
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3668
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3669 Matrix bgcol = props.get_backgroundcolor_rgb ();
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3670 Matrix ecol = props.get_edgecolor_rgb ();
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3671
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3672 if (bgcol.isempty () && ecol.isempty ())
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3673 return;
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3674
25889 2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	3675 Matrix pos = props.get_data_position ();
24173 730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3676 ColumnVector pixpos = get_transform ().transform (pos(0), pos(1),
25889 2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	3677 pos(2), true);
24173 730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3678
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3679 // Save current transform matrices and set orthogonal window coordinates
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3680 m_glfcns.glMatrixMode (GL_PROJECTION);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3681 m_glfcns.glPushMatrix ();
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3682 m_glfcns.glLoadIdentity ();
25884 4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25871 diff changeset	3683
25889 2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	3684 Matrix vp = get_viewport_scaled ();
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	3685 m_glfcns.glOrtho (0, vp(2), vp(3), 0, xZ1, xZ2);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3686 m_glfcns.glMatrixMode (GL_MODELVIEW);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3687 m_glfcns.glPushMatrix ();
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3688 m_glfcns.glLoadIdentity ();
24173 730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3689
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3690 // Translate coordinates so that the text anchor is (0,0)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3691 m_glfcns.glTranslated (pixpos(0), pixpos(1), -pixpos(2));
24173 730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3692
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3693 // FIXME: Only multiples of 90° are handled by the text renderer.
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3694 // Handle others here.
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3695 double rotation = props.get_rotation ();
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3696
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3697 if (do_rotate && rotation != 0.0 && rotation != 90.0
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3698 && rotation != 180.0 && rotation != 270.0)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3699 m_glfcns.glRotated (-rotation, 0.0, 0.0, 1.0);
24173 730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3700
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3701 double m = props.get_margin ();
25889 2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	3702 const Matrix bbox = props.get_extent_matrix ();
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	3703 double x0 = bbox (0) / m_devpixratio - m;
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	3704 double x1 = x0 + bbox(2) / m_devpixratio + 2 * m;
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	3705 double y0 = -(bbox (1) / m_devpixratio - m);
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	3706 double y1 = y0 - (bbox(3) / m_devpixratio + 2 * m);
24173 730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3707
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3708 if (! bgcol.isempty ())
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3709 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3710 m_glfcns.glColor3f (bgcol(0), bgcol(1), bgcol(2));
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3711
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3712 bool depth_test = m_glfcns.glIsEnabled (GL_DEPTH_TEST);
24173 730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3713 if (depth_test)
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3714 set_polygon_offset (true, 4.0);
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3715
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3716 m_glfcns.glBegin (GL_QUADS);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3717 m_glfcns.glVertex2d (x0, y0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3718 m_glfcns.glVertex2d (x1, y0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3719 m_glfcns.glVertex2d (x1, y1);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3720 m_glfcns.glVertex2d (x0, y1);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3721 m_glfcns.glEnd ();
24173 730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3722
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3723 if (depth_test)
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3724 set_polygon_offset (false);
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3725 }
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3726
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3727 if (! ecol.isempty ())
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3728 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3729 m_glfcns.glColor3f (ecol(0), ecol(1), ecol(2));
24173 730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3730
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3731 set_linestyle (props.get_linestyle (), false, props.get_linewidth ());
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3732 set_linewidth (props.get_linewidth ());
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3733
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3734 m_glfcns.glBegin (GL_LINE_STRIP);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3735 m_glfcns.glVertex2d (x0, y0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3736 m_glfcns.glVertex2d (x1, y0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3737 m_glfcns.glVertex2d (x1, y1);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3738 m_glfcns.glVertex2d (x0, y1);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3739 m_glfcns.glVertex2d (x0, y0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3740 m_glfcns.glEnd ();
25260 601cc3a063f5 Fix OpenGL line-stipple bug manifested as Nouveau driver crash (bug #53644) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25103 diff changeset	3741
601cc3a063f5 Fix OpenGL line-stipple bug manifested as Nouveau driver crash (bug #53644) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25103 diff changeset	3742 set_linestyle ("-");
24173 730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3743 }
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3744
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3745 // Restore previous coordinate system
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3746 m_glfcns.glPopMatrix();
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3747 m_glfcns.glMatrixMode (GL_PROJECTION);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3748 m_glfcns.glPopMatrix();
24173 730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3749
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3750 #else
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3751
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3752 octave_unused_parameter (props);
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3753 octave_unused_parameter (do_rotate);
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3754
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3755 // This shouldn't happen because construction of opengl_renderer
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3756 // objects is supposed to be impossible if OpenGL is not available.
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3757
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3758 panic_impossible ();
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3759
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3760 #endif
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3761 }
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3762
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3763 void
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3764 opengl_renderer::draw_image (const image::properties& props)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3765 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3766 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3767
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3768 octave_value cdata = props.get_color_data ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3769 dim_vector dv (cdata.dims ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3770 int h = dv(0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3771 int w = dv(1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3772
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3773 Matrix x = props.get_xdata ().matrix_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3774 Matrix y = props.get_ydata ().matrix_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3775
22369 17c9cc85842e Fix display of scaled images in OpenGL toolkits (bug #48879). Rik <rik@octave.org> parents: 22363 diff changeset	3776 // Someone wants us to draw an empty image? No way.
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	3777 if (x.isempty () \|\| y.isempty ())
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3778 return;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3779
25980 221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3780 // Sort x/ydata and mark flipped dimensions
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3781 bool xflip = false;
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3782 if (x(0) > x(1))
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3783 {
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3784 std::swap (x(0), x(1));
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3785 xflip = true;
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3786 }
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3787 else if (w > 1 && x(1) == x(0))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3788 x(1) = x(1) + (w-1);
25980 221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3789
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3790 bool yflip = false;
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3791 if (y(0) > y(1))
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3792 {
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3793 std::swap (y(0), y(1));
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3794 yflip = true;
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3795 }
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3796 else if (h > 1 && y(1) == y(0))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3797 y(1) = y(1) + (h-1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3798
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3799 const ColumnVector p0 = xform.transform (x(0), y(0), 0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3800 const ColumnVector p1 = xform.transform (x(1), y(1), 0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3801
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3802 if (math::isnan (p0(0)) \|\| math::isnan (p0(1))
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3803 \|\| math::isnan (p1(0)) \|\| math::isnan (p1(1)))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3804 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3805 warning ("opengl_renderer: image X,Y data too large to draw");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3806 return;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3807 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3808
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3809 // image pixel size in screen pixel units
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3810 float pix_dx, pix_dy;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3811 // image pixel size in normalized units
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3812 float nor_dx, nor_dy;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3813
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3814 if (w > 1)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3815 {
22369 17c9cc85842e Fix display of scaled images in OpenGL toolkits (bug #48879). Rik <rik@octave.org> parents: 22363 diff changeset	3816 pix_dx = (p1(0) - p0(0)) / (w-1);
17c9cc85842e Fix display of scaled images in OpenGL toolkits (bug #48879). Rik <rik@octave.org> parents: 22363 diff changeset	3817 nor_dx = (x(1) - x(0)) / (w-1);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3818 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3819 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3820 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3821 const ColumnVector p1w = xform.transform (x(1) + 1, y(1), 0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3822 pix_dx = p1w(0) - p0(0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3823 nor_dx = 1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3824 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3825
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3826 if (h > 1)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3827 {
22369 17c9cc85842e Fix display of scaled images in OpenGL toolkits (bug #48879). Rik <rik@octave.org> parents: 22363 diff changeset	3828 pix_dy = (p1(1) - p0(1)) / (h-1);
17c9cc85842e Fix display of scaled images in OpenGL toolkits (bug #48879). Rik <rik@octave.org> parents: 22363 diff changeset	3829 nor_dy = (y(1) - y(0)) / (h-1);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3830 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3831 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3832 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3833 const ColumnVector p1h = xform.transform (x(1), y(1) + 1, 0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3834 pix_dy = p1h(1) - p0(1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3835 nor_dy = 1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3836 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3837
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3838 // OpenGL won't draw any of the image if its origin is outside the
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3839 // viewport/clipping plane so we must do the clipping ourselves.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3840
25980 221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3841 int j0, j1, jj, i0, i1, ii;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3842 j0 = 0, j1 = w;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3843 i0 = 0, i1 = h;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3844
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3845 float im_xmin = x(0) - nor_dx/2;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3846 float im_xmax = x(1) + nor_dx/2;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3847 float im_ymin = y(0) - nor_dy/2;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3848 float im_ymax = y(1) + nor_dy/2;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3849 if (props.is_clipping ()) // clip to axes
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3850 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3851 if (im_xmin < xmin)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3852 j0 += (xmin - im_xmin)/nor_dx + 1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3853 if (im_xmax > xmax)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3854 j1 -= (im_xmax - xmax)/nor_dx;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3855
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3856 if (im_ymin < ymin)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3857 i0 += (ymin - im_ymin)/nor_dy + 1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3858 if (im_ymax > ymax)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3859 i1 -= (im_ymax - ymax)/nor_dy;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3860 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3861 else // clip to viewport
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3862 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3863 // FIXME: actually add the code to do it!
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3864 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3865
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3866 if (i0 >= i1 \|\| j0 >= j1)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3867 return;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3868
25884 4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25871 diff changeset	3869 m_glfcns.glPixelZoom (m_devpixratio * pix_dx,
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25871 diff changeset	3870 - m_devpixratio * pix_dy);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3871 m_glfcns.glRasterPos3d (im_xmin + nor_dxj0, im_ymin + nor_dyi0, 0);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3872
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3873 // by default this is 4
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3874 m_glfcns.glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3875
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3876 // Expect RGB data
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3877 if (dv.ndims () == 3 && dv(2) == 3)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3878 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3879 if (cdata.is_double_type ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3880 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3881 const NDArray xcdata = cdata.array_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3882
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3883 OCTAVE_LOCAL_BUFFER (GLfloat, a, 3(j1-j0)(i1-i0));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3884
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3885 for (int i = i0; i < i1; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3886 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3887 for (int j = j0, idx = (i-i0)(j1-j0)3; j < j1; j++, idx += 3)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3888 {
25980 221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3889 if (! yflip)
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3890 ii = i;
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3891 else
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3892 ii = h - i - 1;
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3893
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3894 if (! xflip)
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3895 jj = j;
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3896 else
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3897 jj = w - j - 1;
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3898
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3899 a[idx] = xcdata(ii,jj,0);
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3900 a[idx+1] = xcdata(ii,jj,1);
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3901 a[idx+2] = xcdata(ii,jj,2);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3902 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3903 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3904
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3905 draw_pixels (j1-j0, i1-i0, a);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3906
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3907 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3908 else if (cdata.is_single_type ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3909 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3910 const FloatNDArray xcdata = cdata.float_array_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3911
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3912 OCTAVE_LOCAL_BUFFER (GLfloat, a, 3(j1-j0)(i1-i0));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3913
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3914 for (int i = i0; i < i1; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3915 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3916 for (int j = j0, idx = (i-i0)(j1-j0)3; j < j1; j++, idx += 3)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3917 {
25980 221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3918 if (! yflip)
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3919 ii = i;
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3920 else
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3921 ii = h - i - 1;
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3922
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3923 if (! xflip)
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3924 jj = j;
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3925 else
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3926 jj = w - j - 1;
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3927
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3928 a[idx] = xcdata(ii,jj,0);
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3929 a[idx+1] = xcdata(ii,jj,1);
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3930 a[idx+2] = xcdata(ii,jj,2);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3931 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3932 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3933
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3934 draw_pixels (j1-j0, i1-i0, a);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3935
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3936 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3937 else if (cdata.is_uint8_type ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3938 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3939 const uint8NDArray xcdata = cdata.uint8_array_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3940
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3941 OCTAVE_LOCAL_BUFFER (GLubyte, a, 3(j1-j0)(i1-i0));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3942
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3943 for (int i = i0; i < i1; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3944 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3945 for (int j = j0, idx = (i-i0)(j1-j0)3; j < j1; j++, idx += 3)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3946 {
25980 221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3947 if (! yflip)
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3948 ii = i;
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3949 else
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3950 ii = h - i - 1;
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3951
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3952 if (! xflip)
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3953 jj = j;
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3954 else
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3955 jj = w - j - 1;
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3956
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3957 a[idx] = xcdata(ii,jj,0);
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3958 a[idx+1] = xcdata(ii,jj,1);
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3959 a[idx+2] = xcdata(ii,jj,2);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3960 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3961 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3962
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3963 draw_pixels (j1-j0, i1-i0, a);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3964
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3965 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3966 else if (cdata.is_uint16_type ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3967 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3968 const uint16NDArray xcdata = cdata.uint16_array_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3969
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3970 OCTAVE_LOCAL_BUFFER (GLushort, a, 3(j1-j0)(i1-i0));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3971
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3972 for (int i = i0; i < i1; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3973 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3974 for (int j = j0, idx = (i-i0)(j1-j0)3; j < j1; j++, idx += 3)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3975 {
25980 221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3976 if (! yflip)
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3977 ii = i;
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3978 else
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3979 ii = h - i - 1;
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3980
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3981 if (! xflip)
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3982 jj = j;
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3983 else
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3984 jj = w - j - 1;
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3985
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3986 a[idx] = xcdata(ii,jj,0);
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3987 a[idx+1] = xcdata(ii,jj,1);
221c039aa415 Fix rendering of images with permuted x/ydata (bug #49756). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25952 diff changeset	3988 a[idx+2] = xcdata(ii,jj,2);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3989 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3990 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3991
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3992 draw_pixels (j1-j0, i1-i0, a);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3993
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3994 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3995 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3996 warning ("opengl_renderer: invalid image data type (expected double, single, uint8, or uint16)");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3997 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3998 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3999 warning ("opengl_renderer: invalid image size (expected MxNx3 or MxN)");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4000
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4001 m_glfcns.glPixelZoom (1, 1);
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	4002
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4003 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4004
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4005 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4006
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4007 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4008 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4009
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4010 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4011
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4012 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4013 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4014
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4015 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4016 opengl_renderer::set_viewport (int w, int h)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4017 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4018 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4019
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4020 m_glfcns.glViewport (0, 0, w, h);
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4021
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4022 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4023
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4024 octave_unused_parameter (w);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4025 octave_unused_parameter (h);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4026
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4027 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4028 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4029
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4030 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4031
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4032 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4033 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4034
25889 2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4035 Matrix
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4036 opengl_renderer::get_viewport_scaled (void) const
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4037 {
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4038 Matrix retval (1, 4, 0.0);
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4039
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4040 #if defined (HAVE_OPENGL)
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4041 #if defined (HAVE_FRAMEWORK_OPENGL)
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4042 GLint vp[4];
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4043 #else
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4044 int vp[4];
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4045 #endif
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4046
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4047 m_glfcns.glGetIntegerv (GL_VIEWPORT, vp);
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4048
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4049 for (int i = 0; i < 4; i++)
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4050 retval(i) = static_cast<double> (vp[i]) / m_devpixratio;
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4051
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4052 #else
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4053
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4054 // This shouldn't happen because construction of opengl_renderer
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4055 // objects is supposed to be impossible if OpenGL is not available.
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4056
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4057 panic_impossible ();
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4058
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4059 #endif
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4060
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4061 return retval;
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4062 }
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4063
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4064 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4065 opengl_renderer::draw_pixels (int width, int height, const float *data)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4066 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4067 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4068
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4069 m_glfcns.glDrawPixels (width, height, GL_RGB, GL_FLOAT, data);
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4070
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4071 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4072
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4073 octave_unused_parameter (width);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4074 octave_unused_parameter (height);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4075 octave_unused_parameter (data);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4076
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4077 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4078 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4079
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4080 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4081
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4082 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4083 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4084
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4085 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4086 opengl_renderer::draw_pixels (int width, int height, const uint8_t *data)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4087 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4088 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4089
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4090 m_glfcns.glDrawPixels (width, height, GL_RGB, GL_UNSIGNED_BYTE, data);
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4091
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4092 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4093
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4094 octave_unused_parameter (width);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4095 octave_unused_parameter (height);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4096 octave_unused_parameter (data);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4097
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4098 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4099 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4100
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4101 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4102
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4103 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4104 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4105
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4106 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4107 opengl_renderer::draw_pixels (int width, int height, const uint16_t *data)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4108 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4109 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4110
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4111 m_glfcns.glDrawPixels (width, height, GL_RGB, GL_UNSIGNED_SHORT, data);
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4112
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4113 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4114
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4115 octave_unused_parameter (width);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4116 octave_unused_parameter (height);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4117 octave_unused_parameter (data);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4118
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4119 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4120 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4121
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4122 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4123
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4124 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4125 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4126
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4127 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4128 opengl_renderer::set_color (const Matrix& c)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4129 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4130 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4131
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4132 m_glfcns.glColor3dv (c.data ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4133
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4134 txt_renderer.set_color (c);
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4135
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4136 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4137
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4138 octave_unused_parameter (c);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4139
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4140 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4141 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4142
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4143 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4144
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4145 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4146 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4147
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4148 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4149 opengl_renderer::set_font (const base_properties& props)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4150 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4151 txt_renderer.set_font (props.get ("fontname").string_value (),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4152 props.get ("fontweight").string_value (),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4153 props.get ("fontangle").string_value (),
25884 4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25871 diff changeset	4154 props.get ("__fontsize_points__").double_value ()
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25871 diff changeset	4155 * m_devpixratio);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4156 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4157
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4158 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4159 opengl_renderer::set_polygon_offset (bool on, float offset)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4160 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4161 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4162
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4163 if (on)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4164 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4165 m_glfcns.glEnable (GL_POLYGON_OFFSET_FILL);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4166 m_glfcns.glEnable (GL_POLYGON_OFFSET_LINE);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4167 m_glfcns.glPolygonOffset (offset, offset);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4168 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4169 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4170 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4171 m_glfcns.glDisable (GL_POLYGON_OFFSET_FILL);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4172 m_glfcns.glDisable (GL_POLYGON_OFFSET_LINE);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4173 }
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4174
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4175 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4176
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4177 octave_unused_parameter (on);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4178 octave_unused_parameter (offset);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4179
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4180 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4181 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4182
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4183 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4184
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4185 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4186 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4187
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4188 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4189 opengl_renderer::set_linewidth (float w)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4190 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4191 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4192
25884 4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25871 diff changeset	4193 m_glfcns.glLineWidth (w * m_devpixratio);
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4194
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4195 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4196
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4197 octave_unused_parameter (w);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4198
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4199 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4200 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4201
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4202 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4203
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4204 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4205 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4206
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4207 void
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	4208 opengl_renderer::set_linestyle (const std::string& s, bool use_stipple,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	4209 double linewidth)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4210 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4211 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4212
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4213 bool solid = false;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4214
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4215 if (s == "-")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4216 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4217 m_glfcns.glLineStipple (1, static_cast<unsigned short> (0xFFFF));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4218 solid = true;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4219 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4220 else if (s == ":")
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4221 m_glfcns.glLineStipple (linewidth, static_cast<unsigned short> (0x5555));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4222 else if (s == "--")
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4223 m_glfcns.glLineStipple (linewidth, static_cast<unsigned short> (0x0F0F));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4224 else if (s == "-.")
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4225 m_glfcns.glLineStipple (linewidth, static_cast<unsigned short> (0x6F6F));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4226 else
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4227 m_glfcns.glLineStipple (1, static_cast<unsigned short> (0x0000));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4228
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4229 if (solid && ! use_stipple)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4230 m_glfcns.glDisable (GL_LINE_STIPPLE);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4231 else
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4232 m_glfcns.glEnable (GL_LINE_STIPPLE);
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4233
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4234 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4235
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4236 octave_unused_parameter (s);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4237 octave_unused_parameter (use_stipple);
22500 1d3b71530539 fix compilation of gl-render.cc if OpenGL is missing John W. Eaton <jwe@octave.org> parents: 22494 diff changeset	4238 octave_unused_parameter (linewidth);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4239
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4240 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4241 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4242
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4243 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4244
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4245 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4246 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4247
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4248 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4249 opengl_renderer::set_clipbox (double x1, double x2, double y1, double y2,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4250 double z1, double z2)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4251 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4252 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4253
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4254 double dx = (x2-x1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4255 double dy = (y2-y1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4256 double dz = (z2-z1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4257
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4258 x1 -= 0.001dx; x2 += 0.001dx;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4259 y1 -= 0.001dy; y2 += 0.001dy;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4260 z1 -= 0.001dz; z2 += 0.001dz;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4261
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4262 ColumnVector p (4, 0.0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4263
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4264 p(0) = -1; p(3) = x2;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4265 m_glfcns.glClipPlane (GL_CLIP_PLANE0, p.data ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4266 p(0) = 1; p(3) = -x1;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4267 m_glfcns.glClipPlane (GL_CLIP_PLANE1, p.data ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4268 p(0) = 0; p(1) = -1; p(3) = y2;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4269 m_glfcns.glClipPlane (GL_CLIP_PLANE2, p.data ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4270 p(1) = 1; p(3) = -y1;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4271 m_glfcns.glClipPlane (GL_CLIP_PLANE3, p.data ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4272 p(1) = 0; p(2) = -1; p(3) = z2;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4273 m_glfcns.glClipPlane (GL_CLIP_PLANE4, p.data ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4274 p(2) = 1; p(3) = -z1;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4275 m_glfcns.glClipPlane (GL_CLIP_PLANE5, p.data ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4276
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4277 xmin = x1; xmax = x2;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4278 ymin = y1; ymax = y2;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4279 zmin = z1; zmax = z2;
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4280
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4281 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4282
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4283 octave_unused_parameter (x1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4284 octave_unused_parameter (x2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4285 octave_unused_parameter (y1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4286 octave_unused_parameter (y2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4287 octave_unused_parameter (z1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4288 octave_unused_parameter (z2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4289
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4290 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4291 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4292
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4293 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4294
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4295 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4296 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4297
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4298 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4299 opengl_renderer::set_clipping (bool enable)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4300 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4301 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4302
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4303 bool has_clipping = (m_glfcns.glIsEnabled (GL_CLIP_PLANE0) == GL_TRUE);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4304
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4305 if (enable != has_clipping)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4306 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4307 if (enable)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4308 for (int i = 0; i < 6; i++)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4309 m_glfcns.glEnable (GL_CLIP_PLANE0+i);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4310 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4311 for (int i = 0; i < 6; i++)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4312 m_glfcns.glDisable (GL_CLIP_PLANE0+i);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4313 }
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4314
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4315 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4316
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4317 octave_unused_parameter (enable);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4318
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4319 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4320 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4321
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4322 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4323
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4324 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4325 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4326
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4327 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4328 opengl_renderer::init_marker (const std::string& m, double size, float width)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4329 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4330 #if defined (HAVE_OPENGL)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4331 m_glfcns.glMatrixMode (GL_PROJECTION);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4332 m_glfcns.glPushMatrix ();
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4333 m_glfcns.glLoadIdentity ();
25884 4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25871 diff changeset	4334
25889 2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4335 Matrix vp = get_viewport_scaled ();
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4336 m_glfcns.glOrtho (0, vp(2), vp(3), 0, xZ1, xZ2);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4337 m_glfcns.glMatrixMode (GL_MODELVIEW);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4338 m_glfcns.glPushMatrix ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4339
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4340 set_clipping (false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4341 set_linewidth (width);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4342
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4343 marker_id = make_marker_list (m, size, false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4344 filled_marker_id = make_marker_list (m, size, true);
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4345
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4346 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4347
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4348 octave_unused_parameter (m);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4349 octave_unused_parameter (size);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4350 octave_unused_parameter (width);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4351
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4352 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4353 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4354
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4355 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4356
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4357 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4358 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4359
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4360 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4361 opengl_renderer::end_marker (void)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4362 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4363 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4364
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4365 m_glfcns.glDeleteLists (marker_id, 1);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4366 m_glfcns.glDeleteLists (filled_marker_id, 1);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4367
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4368 m_glfcns.glMatrixMode (GL_MODELVIEW);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4369 m_glfcns.glPopMatrix ();
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4370 m_glfcns.glMatrixMode (GL_PROJECTION);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4371 m_glfcns.glPopMatrix ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4372 set_linewidth (0.5f);
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4373
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4374 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4375
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4376 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4377 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4378
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4379 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4380
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4381 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4382 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4383
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4384 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4385 opengl_renderer::draw_marker (double x, double y, double z,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4386 const Matrix& lc, const Matrix& fc)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4387 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4388 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4389
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4390 ColumnVector tmp = xform.transform (x, y, z, false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4391
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4392 m_glfcns.glLoadIdentity ();
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4393 m_glfcns.glTranslated (tmp(0), tmp(1), -tmp(2));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4394
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4395 if (filled_marker_id > 0 && fc.numel () > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4396 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4397 m_glfcns.glColor3dv (fc.data ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4398 set_polygon_offset (true, -1.0);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4399 m_glfcns.glCallList (filled_marker_id);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4400 if (lc.numel () > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4401 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4402 m_glfcns.glColor3dv (lc.data ());
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4403 m_glfcns.glPolygonMode (GL_FRONT_AND_BACK, GL_LINE);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4404 m_glfcns.glEdgeFlag (GL_TRUE);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4405 set_polygon_offset (true, -2.0);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4406 m_glfcns.glCallList (filled_marker_id);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4407 m_glfcns.glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4408 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4409 set_polygon_offset (false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4410 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4411 else if (marker_id > 0 && lc.numel () > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4412 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4413 m_glfcns.glColor3dv (lc.data ());
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4414 m_glfcns.glCallList (marker_id);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4415 }
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4416
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4417 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4418
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4419 octave_unused_parameter (x);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4420 octave_unused_parameter (y);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4421 octave_unused_parameter (z);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4422 octave_unused_parameter (lc);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4423 octave_unused_parameter (fc);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4424
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4425 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4426 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4427
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4428 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4429
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4430 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4431 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4432
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4433 void
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4434 opengl_renderer::init_maxlights (void)
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4435 {
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4436 #if defined (HAVE_OPENGL)
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4437
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4438 // Check actual maximum number of lights possible
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4439 if (m_max_lights == 0)
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4440 {
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4441 for (m_max_lights = 0; m_max_lights < GL_MAX_LIGHTS; m_max_lights++)
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4442 {
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4443 m_glfcns.glDisable (GL_LIGHT0 + m_max_lights);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4444 if (m_glfcns.glGetError ())
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4445 break;
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4446 }
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4447 }
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4448
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4449 #else
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4450
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4451 // This shouldn't happen because construction of opengl_renderer
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4452 // objects is supposed to be impossible if OpenGL is not available.
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4453
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4454 panic_impossible ();
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4455
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4456 #endif
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4457 }
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4458
25864 baeb93e9febc allow building without OpenGL to work again John W. Eaton <jwe@octave.org> parents: 25863 diff changeset	4459 #if defined (HAVE_OPENGL)
baeb93e9febc allow building without OpenGL to work again John W. Eaton <jwe@octave.org> parents: 25863 diff changeset	4460
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4461 std::string
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4462 opengl_renderer::get_string (GLenum id) const
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4463 {
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4464 // This is kind of ugly, but glGetString returns a pointer to GLubyte
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4465 // and there is no std::string constructor that matches. Is there a
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4466 // better way?
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4467
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4468 std::ostringstream buf;
25864 baeb93e9febc allow building without OpenGL to work again John W. Eaton <jwe@octave.org> parents: 25863 diff changeset	4469
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4470 buf << m_glfcns.glGetString (id);
25864 baeb93e9febc allow building without OpenGL to work again John W. Eaton <jwe@octave.org> parents: 25863 diff changeset	4471
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4472 return std::string (buf.str ());
25864 baeb93e9febc allow building without OpenGL to work again John W. Eaton <jwe@octave.org> parents: 25863 diff changeset	4473 }
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4474
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4475 #endif
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4476
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4477 void
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4478 opengl_renderer::set_normal (int bfl_mode, const NDArray& n, int j, int i)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4479 {
21797 e5f083f9704e eliminate some duplicate code in gl-render.cc John W. Eaton <jwe@octave.org> parents: 21790 diff changeset	4480 #if defined (HAVE_OPENGL)
e5f083f9704e eliminate some duplicate code in gl-render.cc John W. Eaton <jwe@octave.org> parents: 21790 diff changeset	4481
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4482 double x = n(j,i,0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4483 double y = n(j,i,1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4484 double z = n(j,i,2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4485
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4486 double d = sqrt (xx + yy + z*z);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4487
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4488 double dir = 1.0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4489
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4490 if (bfl_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4491 dir = ((x * view_vector(0) + y * view_vector(1) + z * view_vector(2) < 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4492 ? ((bfl_mode > 1) ? 0.0 : -1.0) : 1.0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4493
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4494 m_glfcns.glNormal3d (dirx/d, diry/d, dir*z/d);
21797 e5f083f9704e eliminate some duplicate code in gl-render.cc John W. Eaton <jwe@octave.org> parents: 21790 diff changeset	4495
e5f083f9704e eliminate some duplicate code in gl-render.cc John W. Eaton <jwe@octave.org> parents: 21790 diff changeset	4496 #else
e5f083f9704e eliminate some duplicate code in gl-render.cc John W. Eaton <jwe@octave.org> parents: 21790 diff changeset	4497
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4498 octave_unused_parameter (bfl_mode);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4499 octave_unused_parameter (n);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4500 octave_unused_parameter (j);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4501 octave_unused_parameter (i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4502
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4503 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4504 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4505
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4506 panic_impossible ();
21797 e5f083f9704e eliminate some duplicate code in gl-render.cc John W. Eaton <jwe@octave.org> parents: 21790 diff changeset	4507
e5f083f9704e eliminate some duplicate code in gl-render.cc John W. Eaton <jwe@octave.org> parents: 21790 diff changeset	4508 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4509 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4510
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4511 unsigned int
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4512 opengl_renderer::make_marker_list (const std::string& marker, double size,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4513 bool filled) const
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4514 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4515 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4516
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4517 char c = marker[0];
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4518
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4519 if (filled && (c == '+' \|\| c == 'x' \|\| c == '*' \|\| c == '.'))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4520 return 0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4521
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4522 unsigned int ID = m_glfcns.glGenLists (1);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4523 double sz = size * toolkit.get_screen_resolution () / 72.0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4524
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4525 // constants for the * marker
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4526 const double sqrt2d4 = 0.35355339059327;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4527 double tt = sz*sqrt2d4;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4528
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4529 m_glfcns.glNewList (ID, GL_COMPILE);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4530
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4531 switch (marker[0])
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	4532 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4533 case '+':
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4534 m_glfcns.glBegin (GL_LINES);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4535 m_glfcns.glVertex2d (-sz/2, 0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4536 m_glfcns.glVertex2d (sz/2, 0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4537 m_glfcns.glVertex2d (0, -sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4538 m_glfcns.glVertex2d (0, sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4539 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4540 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4541 case 'x':
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4542 m_glfcns.glBegin (GL_LINES);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4543 m_glfcns.glVertex2d (-sz/2, -sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4544 m_glfcns.glVertex2d (sz/2, sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4545 m_glfcns.glVertex2d (-sz/2, sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4546 m_glfcns.glVertex2d (sz/2, -sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4547 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4548 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4549 case '*':
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4550 m_glfcns.glBegin (GL_LINES);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4551 m_glfcns.glVertex2d (-sz/2, 0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4552 m_glfcns.glVertex2d (sz/2, 0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4553 m_glfcns.glVertex2d (0, -sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4554 m_glfcns.glVertex2d (0, sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4555 m_glfcns.glVertex2d (-tt, -tt);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4556 m_glfcns.glVertex2d (+tt, +tt);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4557 m_glfcns.glVertex2d (-tt, +tt);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4558 m_glfcns.glVertex2d (+tt, -tt);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4559 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4560 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4561 case '.':
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4562 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4563 // The dot marker is special and is drawn at 1/3rd the specified size
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4564
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4565 // Ensure that something is drawn even at very small markersizes
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4566 if (sz > 0 && sz < 3)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4567 sz = 3;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4568
25688 b2917b7858ba maint: Use Octave convention for spacing of C++ cast statements. Rik <rik@octave.org> parents: 25438 diff changeset	4569 int div = static_cast<int> (M_PI * sz / 12);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4570 if (! (div % 2))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4571 div += 1; // ensure odd number for left/right symmetry
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4572 div = std::max (div, 3); // ensure at least a few vertices are drawn
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4573 double ang_step = M_PI / div;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4574
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4575 m_glfcns.glBegin (GL_POLYGON);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4576 for (double ang = 0; ang < 2*M_PI; ang += ang_step)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4577 m_glfcns.glVertex2d (sz/6cos (ang), sz/6sin (ang));
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4578 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4579 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4580 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4581 case 's':
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4582 m_glfcns.glBegin (filled ? GL_POLYGON : GL_LINE_LOOP);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4583 m_glfcns.glVertex2d (-sz/2, -sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4584 m_glfcns.glVertex2d (-sz/2, sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4585 m_glfcns.glVertex2d (sz/2, sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4586 m_glfcns.glVertex2d (sz/2, -sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4587 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4588 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4589 case 'o':
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4590 {
25688 b2917b7858ba maint: Use Octave convention for spacing of C++ cast statements. Rik <rik@octave.org> parents: 25438 diff changeset	4591 int div = static_cast<int> (M_PI * sz / 4);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4592 if (! (div % 2))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4593 div += 1; // ensure odd number for left/right symmetry
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4594 div = std::max (div, 5); // ensure at least a few vertices are drawn
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4595 double ang_step = M_PI / div;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4596
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4597 m_glfcns.glBegin (filled ? GL_POLYGON : GL_LINE_LOOP);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4598 for (double ang = 0; ang < 2*M_PI; ang += ang_step)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4599 m_glfcns.glVertex2d (sz/2cos (ang), sz/2sin (ang));
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4600 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4601 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4602 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4603 case 'd':
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4604 m_glfcns.glBegin (filled ? GL_POLYGON : GL_LINE_LOOP);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4605 m_glfcns.glVertex2d (0, -sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4606 m_glfcns.glVertex2d (sz/2, 0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4607 m_glfcns.glVertex2d (0, sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4608 m_glfcns.glVertex2d (-sz/2, 0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4609 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4610 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4611 case 'v':
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4612 m_glfcns.glBegin (filled ? GL_POLYGON : GL_LINE_LOOP);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4613 m_glfcns.glVertex2d (0, sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4614 m_glfcns.glVertex2d (sz/2, -sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4615 m_glfcns.glVertex2d (-sz/2, -sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4616 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4617 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4618 case '^':
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4619 m_glfcns.glBegin (filled ? GL_POLYGON : GL_LINE_LOOP);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4620 m_glfcns.glVertex2d (0, -sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4621 m_glfcns.glVertex2d (-sz/2, sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4622 m_glfcns.glVertex2d (sz/2, sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4623 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4624 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4625 case '>':
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4626 m_glfcns.glBegin (filled ? GL_POLYGON : GL_LINE_LOOP);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4627 m_glfcns.glVertex2d (sz/2, 0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4628 m_glfcns.glVertex2d (-sz/2, sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4629 m_glfcns.glVertex2d (-sz/2, -sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4630 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4631 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4632 case '<':
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4633 m_glfcns.glBegin (filled ? GL_POLYGON : GL_LINE_LOOP);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4634 m_glfcns.glVertex2d (-sz/2, 0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4635 m_glfcns.glVertex2d (sz/2, -sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4636 m_glfcns.glVertex2d (sz/2, sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4637 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4638 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4639 case 'p':
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4640 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4641 double ang, r, dr;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4642 dr = 1.0 - sin (M_PI/10)/sin (3M_PI/10)1.02;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4643
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4644 m_glfcns.glBegin (filled ? GL_POLYGON : GL_LINE_LOOP);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4645 for (int i = 0; i < 2*5; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4646 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4647 ang = (-0.5 + double (i+1) / 5) * M_PI;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4648 r = 1.0 - (dr * fmod (double (i+1), 2.0));
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4649 m_glfcns.glVertex2d (sz/2rcos (ang), sz/2rsin (ang));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4650 }
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4651 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4652 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4653 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4654 case 'h':
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4655 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4656 double ang, r, dr;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4657 dr = 1.0 - 0.5/sin (M_PI/3)*1.02;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4658
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4659 m_glfcns.glBegin (filled ? GL_POLYGON : GL_LINE_LOOP);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4660 for (int i = 0; i < 2*6; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4661 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4662 ang = (0.5 + double (i+1) / 6.0) * M_PI;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4663 r = 1.0 - (dr * fmod (double (i+1), 2.0));
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4664 m_glfcns.glVertex2d (sz/2rcos (ang), sz/2rsin (ang));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4665 }
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4666 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4667 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4668 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4669 default:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4670 warning ("opengl_renderer: unsupported marker '%s'", marker.c_str ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4671 break;
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	4672 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4673
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4674 m_glfcns.glEndList ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4675
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4676 return ID;
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4677
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4678 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4679
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4680 octave_unused_parameter (marker);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4681 octave_unused_parameter (size);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4682 octave_unused_parameter (filled);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4683
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4684 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4685 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4686
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4687 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4688
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4689 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4690 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4691
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4692 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4693 opengl_renderer::text_to_pixels (const std::string& txt,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4694 uint8NDArray& pixels,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4695 Matrix& bbox,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4696 int halign, int valign, double rotation)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4697 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4698 txt_renderer.text_to_pixels (txt, pixels, bbox, halign, valign,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4699 rotation, interpreter);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4700 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4701
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4702 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4703 opengl_renderer::text_to_strlist (const std::string& txt,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4704 std::list<text_renderer::string>& lst,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4705 Matrix& bbox,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4706 int halign, int valign, double rotation)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4707 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4708 txt_renderer.text_to_strlist (txt, lst, bbox, halign, valign,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4709 rotation, interpreter);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4710 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4711
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4712 Matrix
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4713 opengl_renderer::render_text (const std::string& txt,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4714 double x, double y, double z,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4715 int halign, int valign, double rotation)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4716 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4717 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4718
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4719 Matrix bbox (1, 4, 0.0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4720
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4721 if (txt.empty ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4722 return bbox;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4723
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4724 if (txt_renderer.ok ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4725 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4726 uint8NDArray pixels;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4727 text_to_pixels (txt, pixels, bbox, halign, valign, rotation);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4728
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4729 bool blend = m_glfcns.glIsEnabled (GL_BLEND);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4730
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4731 m_glfcns.glEnable (GL_BLEND);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4732 m_glfcns.glEnable (GL_ALPHA_TEST);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4733 m_glfcns.glRasterPos3d (x, y, z);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4734 m_glfcns.glBitmap(0, 0, 0, 0, bbox(0), bbox(1), nullptr);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4735 m_glfcns.glDrawPixels (bbox(2), bbox(3),
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4736 GL_RGBA, GL_UNSIGNED_BYTE, pixels.data ());
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4737 m_glfcns.glDisable (GL_ALPHA_TEST);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4738
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4739 if (! blend)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4740 m_glfcns.glDisable (GL_BLEND);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4741 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4742
21209 67d2965af0b5 revamp text rendering classes John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	4743 return bbox;
67d2965af0b5 revamp text rendering classes John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	4744
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4745 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4746
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4747 octave_unused_parameter (txt);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4748 octave_unused_parameter (x);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4749 octave_unused_parameter (y);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4750 octave_unused_parameter (z);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4751 octave_unused_parameter (halign);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4752 octave_unused_parameter (valign);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4753 octave_unused_parameter (rotation);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4754
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4755 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4756 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4757
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4758 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4759
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4760 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4761 }
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	4762 }

Mercurial > octave

annotate libinterp/corefcn/gl-render.cc @ 25998:8d2b3e3ff182