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

annotate libinterp/corefcn/gl-render.cc @ 28399:2a0e566a03e1 stable

Don't scale text margin in printout (bug #58486) * gl-render.cc (opengl_renderer::draw_text_background): Use points_to_pixels rather than a fixed 4/3 ratio.

author	Pantxo Diribarne <pantxo.diribarne@gmail.com>
date	Tue, 02 Jun 2020 21:53:54 +0200
parents	5624fd0c5efb
children	80f873d55bff c9f7d1d7a6e7

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	3 // Copyright (C) 2008-2020 The Octave Project Developers
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ////////////////////////////////////////////////////////////////////////
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	25
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21691 diff changeset	26 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21209 diff changeset	27 # include "config.h"
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	28 #endif
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	29
25438 cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25423 diff changeset	30 #include <sstream>
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	31
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21691 diff changeset	32 #if defined (HAVE_WINDOWS_H)
21200 fcac5dbbf9ed maint: Indent #ifdef blocks in libinterp. Rik <rik@octave.org> parents: 21198 diff changeset	33 # define WIN32_LEAN_AND_MEAN
fcac5dbbf9ed maint: Indent #ifdef blocks in libinterp. Rik <rik@octave.org> parents: 21198 diff changeset	34 # 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	35 #endif
bd96c2efd4fe move include statements for OpenGL headers to a single file John W. Eaton <jwe@octave.org> parents: 21115 diff changeset	36
23479 06bf3a0b08bf maint: Use "" instead of <> for our own include files. John W. Eaton <jwe@octave.org> parents: 23450 diff changeset	37 #include "lo-mappers.h"
8377 25bc2d31e1bf improve OCTAVE_LOCAL_BUFFER Jaroslav Hajek <highegg@gmail.com> parents: 8263 diff changeset	38 #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	39 #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	40
629643522cc0 include errwarn.h in all files that use gripe_disabled_feature John W. Eaton <jwe@octave.org> parents: 21109 diff changeset	41 #include "errwarn.h"
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	42 #include "gl-render.h"
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	43 #include "interpreter-private.h"
21196 bd96c2efd4fe move include statements for OpenGL headers to a single file John W. Eaton <jwe@octave.org> parents: 21115 diff changeset	44 #include "oct-opengl.h"
21209 67d2965af0b5 revamp text rendering classes John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	45 #include "text-renderer.h"
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	46
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	47 namespace octave
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	48 {
24725 edef866fba7b * gl-render.cc: Fix compilation error when HAVE_OPENGL is not defined. John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	49 #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	50
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	51 static int
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	52 next_power_of_2 (int n)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	53 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	54 int m = 1;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	55
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	56 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	57 m <<= 1;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	58
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	59 return m;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	60 }
22393 026067ffcf66 fix build with minimal dependencies John W. Eaton <jwe@octave.org> parents: 22391 diff changeset	61
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	62 #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	63
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	64 // Use symbolic names for axes
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	65 enum
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	66 {
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	67 X_AXIS,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	68 Y_AXIS,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	69 Z_AXIS
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	70 };
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	71
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	72 // Use symbolic names for color mode
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	73 enum
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	74 {
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	75 UNIFORM,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	76 FLAT,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	77 INTERP,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	78 TEXTURE
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	79 };
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	80
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	81 // Use symbolic names for lighting
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	82 enum
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	83 {
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	84 NONE,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	85 //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	86 GOURAUD = 2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	87 };
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	88
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	89 // Win32 API requires the CALLBACK attributes for
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	90 // 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	91 // other platforms.
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21691 diff changeset	92 #if ! defined (CALLBACK)
21200 fcac5dbbf9ed maint: Indent #ifdef blocks in libinterp. Rik <rik@octave.org> parents: 21198 diff changeset	93 # 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	94 #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	95
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	96 class
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	97 opengl_texture
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	98 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	99 protected:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	100 class texture_rep
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	101 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	102 public:
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	103 texture_rep (opengl_functions& glfcns)
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	104 : 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	105 valid (false), count (1)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	106 { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	107
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	108 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	109 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	110 : 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	111 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	112 valid (true), count (1)
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	113 { }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	114
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	115 ~texture_rep (void)
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 if (valid)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	118 m_glfcns.glDeleteTextures (1, &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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	121 void bind (int mode) const
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	122 { 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	123
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	124 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	125 { 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	126
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	127 opengl_functions& m_glfcns;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	128 GLuint id;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	129 int w, h;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	130 int tw, th;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	131 double tx, ty;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	132 bool valid;
27446 c23aee2104de consistently use octave_idx_type for reference counts John W. Eaton <jwe@octave.org> parents: 27335 diff changeset	133 refcount<octave_idx_type> count;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	134 };
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	135
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	136 texture_rep *rep;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	137
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	138 private:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	139 opengl_texture (texture_rep *_rep) : rep (_rep) { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	140
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	141 public:
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	142 opengl_texture (opengl_functions& glfcns)
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	143 : rep (new texture_rep (glfcns)) { }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	144
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	145 opengl_texture (const opengl_texture& tx)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	146 : rep (tx.rep)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	147 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	148 rep->count++;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	149 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	150
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	151 ~opengl_texture (void)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	152 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	153 if (--rep->count == 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	154 delete rep;
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	155 }
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	156
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	157 opengl_texture& operator = (const opengl_texture& tx)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	158 {
26407 31b0761cd641 gl-render.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26376 diff changeset	159 if (&tx != this)
31b0761cd641 gl-render.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26376 diff changeset	160 {
31b0761cd641 gl-render.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26376 diff changeset	161 if (--rep->count == 0)
31b0761cd641 gl-render.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26376 diff changeset	162 delete rep;
31b0761cd641 gl-render.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26376 diff changeset	163
31b0761cd641 gl-render.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26376 diff changeset	164 rep = tx.rep;
31b0761cd641 gl-render.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26376 diff changeset	165 rep->count++;
31b0761cd641 gl-render.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26376 diff changeset	166 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	167
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	168 return *this;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	169 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	170
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	171 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	172 const octave_value& data);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	173
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	174 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	175 { rep->bind (mode); }
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	176
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	177 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	178 { rep->tex_coord (q, r); }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	179
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	180 bool is_valid (void) const
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	181 { return rep->valid; }
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	182 };
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	183
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	184 opengl_texture
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	185 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	186 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	187 opengl_texture retval (glfcns);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	188
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	189 dim_vector dv (data.dims ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	190
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	191 // Expect RGB data
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	192 if (dv.ndims () == 3 && dv(2) == 3)
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 // 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	195 // 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	196 int h, w, tw, th;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	197 h = dv(0), w = dv(1);
26862 ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	198
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	199 // Return early if the image data are larger than the texture
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	200 // can hold
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	201 int max_size;
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	202 glGetIntegerv (GL_MAX_TEXTURE_SIZE, &max_size);
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	203 static bool warned = false;
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	204 if (h > max_size \|\| w > max_size)
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	205 {
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	206 if (! warned)
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	207 {
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	208 warning ("opengl_texture::create: the opengl library in use "
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	209 "doesn't support images with either dimension larger "
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	210 "than %d. Not rendering.", max_size);
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	211 warned = true;
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	212 }
26995 ab5bfee22d18 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 26862 diff changeset	213
26862 ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	214 return opengl_texture (glfcns);
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	215 }
26995 ab5bfee22d18 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 26862 diff changeset	216
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	217 GLuint id;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	218 bool ok = true;
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 tw = next_power_of_2 (w);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	221 th = next_power_of_2 (h);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	222
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	223 glfcns.glGenTextures (1, &id);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	224 glfcns.glBindTexture (GL_TEXTURE_2D, id);
22331 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 if (data.is_double_type ())
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 const NDArray xdata = data.array_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	229
26728 f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	230 OCTAVE_LOCAL_BUFFER (GLfloat, a, (3twth));
22331 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 for (int i = 0; i < h; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	233 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	234 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	235 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	236 a[idx] = xdata(i,j,0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	237 a[idx+1] = xdata(i,j,1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	238 a[idx+2] = xdata(i,j,2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	239 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	240 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	241
26728 f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	242 glfcns.glTexImage2D (GL_TEXTURE_2D, 0, 3, tw, th, 0, GL_RGB,
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	243 GL_FLOAT, a);
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	244 }
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	245
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	246 else if (data.is_single_type ())
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	247 {
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	248 const FloatNDArray xdata = data.float_array_value ();
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	249
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	250 OCTAVE_LOCAL_BUFFER (GLfloat, a, (3twth));
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	251
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	252 for (int i = 0; i < h; i++)
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	253 {
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	254 for (int j = 0, idx = itw3; j < w; j++, idx += 3)
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	255 {
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	256 a[idx] = xdata(i,j,0);
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	257 a[idx+1] = xdata(i,j,1);
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	258 a[idx+2] = xdata(i,j,2);
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	259 }
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	260 }
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	261
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	262 glfcns.glTexImage2D (GL_TEXTURE_2D, 0, 3, tw, th, 0, GL_RGB,
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	263 GL_FLOAT, a);
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	264 }
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	265 else if (data.is_uint16_type ())
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	266 {
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	267 const uint16NDArray xdata = data.uint16_array_value ();
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	268
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	269 OCTAVE_LOCAL_BUFFER (GLushort, a, (3twth));
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	270
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	271 for (int i = 0; i < h; i++)
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	272 {
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	273 for (int j = 0, idx = itw3; j < w; j++, idx += 3)
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	274 {
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	275 a[idx] = xdata(i,j,0);
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	276 a[idx+1] = xdata(i,j,1);
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	277 a[idx+2] = xdata(i,j,2);
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	278 }
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	279 }
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	280
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	281 glfcns.glTexImage2D (GL_TEXTURE_2D, 0, 3, tw, th, 0,
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	282 GL_RGB, GL_UNSIGNED_SHORT, a);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	283 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	284 else if (data.is_uint8_type ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	285 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	286 const uint8NDArray xdata = data.uint8_array_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	287
26728 f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	288 OCTAVE_LOCAL_BUFFER (GLubyte, a, (3twth));
22331 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 for (int i = 0; i < h; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	291 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	292 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	293 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	294 a[idx] = xdata(i,j,0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	295 a[idx+1] = xdata(i,j,1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	296 a[idx+2] = xdata(i,j,2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	297 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	298 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	299
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	300 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	301 GL_RGB, GL_UNSIGNED_BYTE, a);
22331 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 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	304 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	305 ok = false;
26728 f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	306 warning ("opengl_texture::create: invalid image data type, expected double, single, uint8, or uint16");
22331 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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	309 if (ok)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	310 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	311 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	312 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	313
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	314 if (glfcns.glGetError () != GL_NO_ERROR)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	315 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	316 else
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	317 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	318 }
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 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	321 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	322
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	323 return retval;
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	324 }
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	325
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	326 class
27979 cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	327 opengl_tessellator
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	328 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	329 public:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	330 #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	331 typedef GLvoid (CALLBACK *fcn) (...);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	332 #else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	333 typedef void (CALLBACK *fcn) (void);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	334 #endif
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 public:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	337
27979 cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	338 opengl_tessellator (void) : glu_tess (nullptr), fill () { init (); }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	339
22869 f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	340 // No copying!
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	341
27979 cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	342 opengl_tessellator (const opengl_tessellator&) = delete;
cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	343
cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	344 opengl_tessellator operator = (const opengl_tessellator&) = delete;
cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	345
cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	346 virtual ~opengl_tessellator (void)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	347 { if (glu_tess) gluDeleteTess (glu_tess); }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	348
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	349 void begin_polygon (bool filled = true)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	350 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	351 gluTessProperty (glu_tess, GLU_TESS_BOUNDARY_ONLY,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	352 (filled ? GL_FALSE : GL_TRUE));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	353 fill = filled;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	354 gluTessBeginPolygon (glu_tess, this);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	355 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	356
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	357 void end_polygon (void) const
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	358 { gluTessEndPolygon (glu_tess); }
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 void begin_contour (void) const
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	361 { gluTessBeginContour (glu_tess); }
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 void end_contour (void) const
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	364 { gluTessEndContour (glu_tess); }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	365
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	366 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	367 { gluTessVertex (glu_tess, loc, data); }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	368
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	369 protected:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	370 virtual void begin (GLenum /type/) { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	371
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	372 virtual void end (void) { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	373
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	374 virtual void vertex (void * /data/) { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	375
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	376 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	377 GLfloat [4] /w/, void ** /out_data/) { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	378
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	379 virtual void edge_flag (GLboolean /flag/) { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	380
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	381 virtual void error (GLenum err)
27979 cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	382 { ::error ("OpenGL tessellation error (%d)", err); }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	383
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	384 virtual void init (void)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	385 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	386 glu_tess = gluNewTess ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	387
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	388 gluTessCallback (glu_tess, GLU_TESS_BEGIN_DATA,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	389 reinterpret_cast<fcn> (tess_begin));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	390 gluTessCallback (glu_tess, GLU_TESS_END_DATA,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	391 reinterpret_cast<fcn> (tess_end));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	392 gluTessCallback (glu_tess, GLU_TESS_VERTEX_DATA,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	393 reinterpret_cast<fcn> (tess_vertex));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	394 gluTessCallback (glu_tess, GLU_TESS_COMBINE_DATA,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	395 reinterpret_cast<fcn> (tess_combine));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	396 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	397 reinterpret_cast<fcn> (tess_edge_flag));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	398 gluTessCallback (glu_tess, GLU_TESS_ERROR_DATA,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	399 reinterpret_cast<fcn> (tess_error));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	400 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	401
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	402 bool is_filled (void) const { return fill; }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	403
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	404 private:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	405 static void CALLBACK tess_begin (GLenum type, void *t)
27979 cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	406 { reinterpret_cast<opengl_tessellator *> (t)->begin (type); }
22331 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 static void CALLBACK tess_end (void *t)
27979 cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	409 { reinterpret_cast<opengl_tessellator *> (t)->end (); }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	410
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	411 static void CALLBACK tess_vertex (void v, void t)
27979 cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	412 { reinterpret_cast<opengl_tessellator *> (t)->vertex (v); }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	413
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	414 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	415 void *out, void t)
27979 cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	416 { reinterpret_cast<opengl_tessellator *> (t)->combine (c, v, w, out); }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	417
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	418 static void CALLBACK tess_edge_flag (GLboolean flag, void *t)
27979 cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	419 { reinterpret_cast<opengl_tessellator *> (t)->edge_flag (flag); }
22331 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 static void CALLBACK tess_error (GLenum err, void *t)
27979 cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	422 { reinterpret_cast<opengl_tessellator *> (t)->error (err); }
22331 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 private:
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 GLUtesselator *glu_tess;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	427 bool fill;
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 class
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	431 vertex_data
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	432 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	433 public:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	434 class vertex_data_rep
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	435 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	436 public:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	437 Matrix coords;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	438 Matrix color;
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	439 Matrix vertex_normal;
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	440 Matrix face_normal;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	441 double alpha;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	442 float ambient;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	443 float diffuse;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	444 float specular;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	445 float specular_exp;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	446 float specular_color_refl;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	447
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	448 // reference counter
27446 c23aee2104de consistently use octave_idx_type for reference counts John W. Eaton <jwe@octave.org> parents: 27335 diff changeset	449 refcount<octave_idx_type> count;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	450
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	451 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	452 : 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	453 ambient (), diffuse (), specular (), specular_exp (),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	454 specular_color_refl (), count (1) { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	455
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	456 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	457 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	458 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	459 : 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	460 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	461 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	462 };
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	463
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	464 private:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	465 vertex_data_rep *rep;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	466
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23433 diff changeset	467 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	468 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	469 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	470
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	471 return nr;
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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	474 public:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	475 vertex_data (void) : rep (nil_rep ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	476 { rep->count++; }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	477
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	478 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	479 { rep->count++; }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	480
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	481 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	482 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	483 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	484 : 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	485 { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	486
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	487 vertex_data (vertex_data_rep *new_rep)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	488 : rep (new_rep) { }
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 ~vertex_data (void)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	491 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	492 if (--rep->count == 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	493 delete rep;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	494 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	495
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	496 vertex_data& operator = (const vertex_data& v)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	497 {
26407 31b0761cd641 gl-render.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26376 diff changeset	498 if (&v != this)
31b0761cd641 gl-render.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26376 diff changeset	499 {
31b0761cd641 gl-render.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26376 diff changeset	500 if (--rep->count == 0)
31b0761cd641 gl-render.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26376 diff changeset	501 delete rep;
31b0761cd641 gl-render.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26376 diff changeset	502
31b0761cd641 gl-render.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26376 diff changeset	503 rep = v.rep;
31b0761cd641 gl-render.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26376 diff changeset	504 rep->count++;
31b0761cd641 gl-render.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26376 diff changeset	505 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	506
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	507 return *this;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	508 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	509
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23433 diff changeset	510 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	511 };
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	512
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	513 class
27979 cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	514 opengl_renderer::patch_tessellator : public opengl_tessellator
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	515 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	516 public:
28006 91316b5dc5a2 Only use ambient light for edge lighting on patches (bug #57553). Markus Mützel <markus.muetzel@gmx.de> parents: 27992 diff changeset	517 patch_tessellator (opengl_renderer *r, int cmode, int lmode, bool fl,
91316b5dc5a2 Only use ambient light for edge lighting on patches (bug #57553). Markus Mützel <markus.muetzel@gmx.de> parents: 27992 diff changeset	518 float idx = 0.0)
27979 cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	519 : opengl_tessellator (), renderer (r),
28006 91316b5dc5a2 Only use ambient light for edge lighting on patches (bug #57553). Markus Mützel <markus.muetzel@gmx.de> parents: 27992 diff changeset	520 color_mode (cmode), light_mode (lmode), face_lighting (fl), index (idx),
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	521 first (true), tmp_vdata ()
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	522 { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	523
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	524 protected:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	525 void begin (GLenum type)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	526 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	527 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	528
27979 cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	529 //printf ("patch_tessellator::begin (%d)\n", type);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	530 first = true;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	531
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	532 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	533 glfcns.glShadeModel (GL_SMOOTH);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	534 else
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	535 glfcns.glShadeModel (GL_FLAT);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	536
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	537 if (is_filled ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	538 renderer->set_polygon_offset (true, index);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	539
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	540 glfcns.glBegin (type);
22331 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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	543 void end (void)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	544 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	545 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	546
27979 cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	547 //printf ("patch_tessellator::end\n");
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	548 glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	549 renderer->set_polygon_offset (false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	550 }
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 void vertex (void *data)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	553 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	554 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	555
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	556 vertex_data::vertex_data_rep *v
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	557 = reinterpret_cast<vertex_data::vertex_data_rep *> (data);
27979 cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	558 //printf ("patch_tessellator::vertex (%g, %g, %g)\n", v->coords(0), v->coords(1), v->coords(2));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	559
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	560 // 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	561 // 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	562
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	563 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	564 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	565 Matrix col = v->color;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	566
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	567 if (col.numel () == 3)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	568 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	569 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	570 if (light_mode > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	571 {
28006 91316b5dc5a2 Only use ambient light for edge lighting on patches (bug #57553). Markus Mützel <markus.muetzel@gmx.de> parents: 27992 diff changeset	572 // edge lighting only uses ambient light
91316b5dc5a2 Only use ambient light for edge lighting on patches (bug #57553). Markus Mützel <markus.muetzel@gmx.de> parents: 27992 diff changeset	573 float buf[4] = { 0.0f, 0.0f, 0.0f, 1.0f };;
91316b5dc5a2 Only use ambient light for edge lighting on patches (bug #57553). Markus Mützel <markus.muetzel@gmx.de> parents: 27992 diff changeset	574
91316b5dc5a2 Only use ambient light for edge lighting on patches (bug #57553). Markus Mützel <markus.muetzel@gmx.de> parents: 27992 diff changeset	575 if (face_lighting)
91316b5dc5a2 Only use ambient light for edge lighting on patches (bug #57553). Markus Mützel <markus.muetzel@gmx.de> parents: 27992 diff changeset	576 for (int k = 0; k < 3; k++)
91316b5dc5a2 Only use ambient light for edge lighting on patches (bug #57553). Markus Mützel <markus.muetzel@gmx.de> parents: 27992 diff changeset	577 buf[k] = v->specular * (v->specular_color_refl +
91316b5dc5a2 Only use ambient light for edge lighting on patches (bug #57553). Markus Mützel <markus.muetzel@gmx.de> parents: 27992 diff changeset	578 (1 - v->specular_color_refl) * col(k));
91316b5dc5a2 Only use ambient light for edge lighting on patches (bug #57553). Markus Mützel <markus.muetzel@gmx.de> parents: 27992 diff changeset	579 glfcns.glMaterialfv (LIGHT_MODE, GL_SPECULAR, buf);
91316b5dc5a2 Only use ambient light for edge lighting on patches (bug #57553). Markus Mützel <markus.muetzel@gmx.de> parents: 27992 diff changeset	580
91316b5dc5a2 Only use ambient light for edge lighting on patches (bug #57553). Markus Mützel <markus.muetzel@gmx.de> parents: 27992 diff changeset	581 if (face_lighting)
91316b5dc5a2 Only use ambient light for edge lighting on patches (bug #57553). Markus Mützel <markus.muetzel@gmx.de> parents: 27992 diff changeset	582 for (int k = 0; k < 3; k++)
91316b5dc5a2 Only use ambient light for edge lighting on patches (bug #57553). Markus Mützel <markus.muetzel@gmx.de> parents: 27992 diff changeset	583 buf[k] = (v->diffuse * col(k));
91316b5dc5a2 Only use ambient light for edge lighting on patches (bug #57553). Markus Mützel <markus.muetzel@gmx.de> parents: 27992 diff changeset	584 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	585
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	586 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	587 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	588 glfcns.glMaterialfv (LIGHT_MODE, GL_AMBIENT, buf);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	589 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	590 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	591 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	592
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	593 if (light_mode == FLAT && first)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	594 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	595 else if (light_mode == GOURAUD)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	596 glfcns.glNormal3dv (v->vertex_normal.data ());
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	597
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	598 glfcns.glVertex3dv (v->coords.data ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	599
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	600 first = false;
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	601 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	602
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	603 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	604 {
27979 cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	605 //printf ("patch_tessellator::combine\n");
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	606
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	607 vertex_data::vertex_data_rep *v[4];
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	608 int vmax = 4;
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 for (int i = 0; i < 4; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	611 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	612 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	613
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	614 if (vmax == 4 && ! v[i])
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	615 vmax = i;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	616 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	617
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	618 Matrix vv (1, 3, 0.0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	619 Matrix cc;
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	620 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	621 Matrix fnn (1, 3, 0.0);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	622 double aa = 0.0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	623
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	624 vv(0) = xyz[0];
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	625 vv(1) = xyz[1];
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	626 vv(2) = xyz[2];
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	627
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	628 if (v[0]->color.numel ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	629 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	630 cc.resize (1, 3, 0.0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	631 for (int ic = 0; ic < 3; ic++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	632 for (int iv = 0; iv < vmax; iv++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	633 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	634 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	635
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	636 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	637 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	638 for (int in = 0; in < 3; in++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	639 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	640 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	641 }
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	642
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	643 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	644 {
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	645 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	646 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	647 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	648 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	649
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	650 for (int iv = 0; iv < vmax; iv++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	651 aa += (w[iv] * v[iv]->alpha);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	652
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	653 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	654 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	655 v[0]->specular_color_refl);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	656 tmp_vdata.push_back (new_v);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	657
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	658 *out_data = new_v.get_rep ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	659 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	660
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	661 private:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	662
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	663 // No copying!
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	664
27979 cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	665 patch_tessellator (const patch_tessellator&) = delete;
cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	666
cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	667 patch_tessellator& operator = (const patch_tessellator&) = delete;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	668
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	669 opengl_renderer *renderer;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	670 int color_mode;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	671 int light_mode;
28006 91316b5dc5a2 Only use ambient light for edge lighting on patches (bug #57553). Markus Mützel <markus.muetzel@gmx.de> parents: 27992 diff changeset	672 bool face_lighting;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	673 int index;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	674 bool first;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	675 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	676 };
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	677
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	678 #else
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	679
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	680 class
27979 cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	681 opengl_renderer::patch_tessellator
22331 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 // Dummy class.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	684 };
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	685
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	686 #endif
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	687
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	688 opengl_renderer::opengl_renderer (opengl_functions& glfcns)
26728 f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	689 : m_glfcns (glfcns), xmin (), xmax (), ymin (), ymax (), zmin (), zmax (),
28189 5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	690 m_devpixratio (1.0), xform (), toolkit (), xZ1 (), xZ2 (), marker_id (),
25889 2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	691 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	692 interpreter ("none"), txt_renderer (), m_current_light (0),
28189 5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	693 m_max_lights (0), selecting (false), m_printing (false)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	694 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	695 // 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	696 // 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	697 // OpenGL types.
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	698
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	699 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	700
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	701 // 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	702 // FIXME: should we check signed vs. unsigned?
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	703
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	704 static bool ok = (sizeof (int) <= sizeof (GLsizei));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	705
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	706 if (! ok)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	707 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	708
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	709 #else
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	710
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	711 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	712
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	713 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	714 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	715
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	716 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	717 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	718 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	719 if (! go.valid_object ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	720 return;
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 const base_properties& props = go.get_properties ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	723
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	724 if (! toolkit)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	725 toolkit = props.get_toolkit ();
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 if (go.isa ("figure"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	728 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	729 else if (go.isa ("axes"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	730 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	731 else if (go.isa ("line"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	732 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	733 else if (go.isa ("surface"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	734 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	735 else if (go.isa ("patch"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	736 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	737 else if (go.isa ("light"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	738 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	739 else if (go.isa ("hggroup"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	740 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	741 else if (go.isa ("text"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	742 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	743 else if (go.isa ("image"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	744 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	745 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	746 \|\| go.isa ("uicontextmenu") \|\| go.isa ("uitoolbar")
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: 26025 diff changeset	747 \|\| go.isa ("uipushtool") \|\| go.isa ("uitoggletool")
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: 26025 diff changeset	748 \|\| go.isa ("uitable"))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	749 ; // SKIP
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	750 else if (go.isa ("uipanel"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	751 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	752 if (toplevel)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	753 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	754 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	755 else if (go.isa ("uibuttongroup"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	756 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	757 if (toplevel)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	758 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	759 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	760 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	761 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	762 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	763 props.graphics_object_name ().c_str ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	764 }
22494 3564b6b6b8d1 Query OpenGL errors on initialization of GL context (bug #45542). Markus Mützel <markus.muetzel@gmx.de> parents: 22407 diff changeset	765
22500 1d3b71530539 fix compilation of gl-render.cc if OpenGL is missing John W. Eaton <jwe@octave.org> parents: 22494 diff changeset	766 #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	767
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	768 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	769 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	770 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	771 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	772
1d3b71530539 fix compilation of gl-render.cc if OpenGL is missing John W. Eaton <jwe@octave.org> parents: 22494 diff changeset	773 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	774 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	775
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	776 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	777 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	778 {
28189 5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	779 m_printing = props.is___printing__ ();
5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	780
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	781 // Initialize OpenGL context
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	782 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	783
21689 9467549bd5ff * gl-render.cc: Allow compilation without OPENGL. John W. Eaton <jwe@octave.org> parents: 21684 diff changeset	784 #if defined (HAVE_OPENGL)
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	785
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	786 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	787 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	788 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	789 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	790
21689 9467549bd5ff * gl-render.cc: Allow compilation without OPENGL. John W. Eaton <jwe@octave.org> parents: 21684 diff changeset	791 #endif
21684 1449e3b98941 store OpenGL version info in figure properties John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	792
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	793 // Draw children
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	794
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	795 draw (props.get_all_children (), false);
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 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	799 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	800 const graphics_object& go)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	801 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	802 graphics_object fig = go.get_ancestor ("figure");
27277 db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 26995 diff changeset	803 const figure::properties& figProps
db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 26995 diff changeset	804 = dynamic_cast<const figure::properties&> (fig.get_properties ());
22331 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 // Initialize OpenGL context
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	807
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	808 init_gl_context (figProps.is_graphicssmoothing (),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	809 props.get_backgroundcolor_rgb ());
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 // Draw children
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	812
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	813 draw (props.get_all_children (), false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	814 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	815
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	816 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	817 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	818 const graphics_object& go)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	819 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	820 graphics_object fig = go.get_ancestor ("figure");
27277 db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 26995 diff changeset	821 const figure::properties& figProps
db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 26995 diff changeset	822 = dynamic_cast<const figure::properties&> (fig.get_properties ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	823
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	824 // Initialize OpenGL context
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	825
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	826 init_gl_context (figProps.is_graphicssmoothing (),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	827 props.get_backgroundcolor_rgb ());
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 // Draw children
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	830
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	831 draw (props.get_all_children (), false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	832 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	833
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	834 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	835 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	836 {
21689 9467549bd5ff * gl-render.cc: Allow compilation without OPENGL. John W. Eaton <jwe@octave.org> parents: 21684 diff changeset	837 #if defined (HAVE_OPENGL)
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	838
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	839 // Initialize OpenGL context
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	840
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	841 m_glfcns.glEnable (GL_DEPTH_TEST);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	842 m_glfcns.glDepthFunc (GL_LEQUAL);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	843 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	844 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	845 m_glfcns.glEnable (GL_NORMALIZE);
27767 3212c50369cb Make graphics antialiasing and blending independent (bug #57343) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27446 diff changeset	846 m_glfcns.glEnable (GL_BLEND);
22331 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 (enhanced)
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.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	851 bool has_multisample = false;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	852 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	853 {
3564b6b6b8d1 Query OpenGL errors on initialization of GL context (bug #45542). Markus Mützel <markus.muetzel@gmx.de> parents: 22407 diff changeset	854 GLint iMultiSample, iNumSamples;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	855 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	856 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	857 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	858 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	859 }
3564b6b6b8d1 Query OpenGL errors on initialization of GL context (bug #45542). Markus Mützel <markus.muetzel@gmx.de> parents: 22407 diff changeset	860
3564b6b6b8d1 Query OpenGL errors on initialization of GL context (bug #45542). Markus Mützel <markus.muetzel@gmx.de> parents: 22407 diff changeset	861 if (! has_multisample)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	862 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	863 // 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	864 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	865 // 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	866 // 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	867 m_glfcns.glGetError ();
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	868
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	869 m_glfcns.glEnable (GL_LINE_SMOOTH);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	870 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	871 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	872 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	873 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	874 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	875 m_glfcns.glDisable (GL_LINE_SMOOTH);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	876 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	877
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	878 // Clear background
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	879
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	880 if (c.numel () >= 3)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	881 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	882 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	883 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	884 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	885
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	886 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	887 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	888 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	889 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	890
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	891 #else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	892
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	893 octave_unused_parameter (enhanced);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	894 octave_unused_parameter (c);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	895
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	896 // 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	897 // 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	898
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	899 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	900
21689 9467549bd5ff * gl-render.cc: Allow compilation without OPENGL. John W. Eaton <jwe@octave.org> parents: 21684 diff changeset	901 #endif
22331 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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	904 void
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	905 opengl_renderer::render_grid (const double linewidth,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	906 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	907 const Matrix& gridcolor, const double gridalpha,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	908 const Matrix& ticks, 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, double p2, double p2N,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	910 int xyz, bool is_3D)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	911 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	912 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	913
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	914 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	915 set_linestyle (gridstyle, true, linewidth);
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 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	918 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	919 double val = ticks(i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	920 if (lim1 <= val && val <= lim2)
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 (xyz == X_AXIS)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	923 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	924 m_glfcns.glVertex3d (val, p1N, p2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	925 m_glfcns.glVertex3d (val, p1, p2);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	926 if (is_3D)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	927 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	928 m_glfcns.glVertex3d (val, p1, p2N);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	929 m_glfcns.glVertex3d (val, p1, p2);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	930 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	931 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	932 else if (xyz == Y_AXIS)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	933 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	934 m_glfcns.glVertex3d (p1N, val, p2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	935 m_glfcns.glVertex3d (p1, val, p2);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	936 if (is_3D)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	937 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	938 m_glfcns.glVertex3d (p1, val, p2N);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	939 m_glfcns.glVertex3d (p1, val, p2);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	940 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	941 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	942 else if (xyz == Z_AXIS)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	943 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	944 m_glfcns.glVertex3d (p1N, p2, val);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	945 m_glfcns.glVertex3d (p1, p2, val);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	946 m_glfcns.glVertex3d (p1, p2N, val);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	947 m_glfcns.glVertex3d (p1, p2, val);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	948 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	949 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	950 }
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	951 m_glfcns.glEnd ();
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	952 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	953 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	954 m_glfcns.glColor3dv (black);
22331 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 #else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	957
22500 1d3b71530539 fix compilation of gl-render.cc if OpenGL is missing John W. Eaton <jwe@octave.org> parents: 22494 diff changeset	958 octave_unused_parameter (linewidth);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	959 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	960 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	961 octave_unused_parameter (gridalpha);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	962 octave_unused_parameter (ticks);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	963 octave_unused_parameter (lim1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	964 octave_unused_parameter (lim2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	965 octave_unused_parameter (p1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	966 octave_unused_parameter (p1N);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	967 octave_unused_parameter (p2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	968 octave_unused_parameter (p2N);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	969 octave_unused_parameter (xyz);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	970 octave_unused_parameter (is_3D);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	971
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	972 // 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	973 // 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	974
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	975 panic_impossible ();
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 #endif
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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	980 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	981 opengl_renderer::render_tickmarks (const Matrix& ticks,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	982 double lim1, double lim2,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	983 double p1, double p1N,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	984 double p2, double p2N,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	985 double dx, double dy, double dz,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	986 int xyz, bool mirror)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	987 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	988 #if defined (HAVE_OPENGL)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	989
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	990 m_glfcns.glBegin (GL_LINES);
22331 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 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	993 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	994 double val = ticks(i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	995
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	996 if (lim1 <= val && val <= lim2)
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 if (xyz == X_AXIS)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	999 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1000 m_glfcns.glVertex3d (val, p1, p2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1001 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	1002 if (mirror)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1003 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1004 m_glfcns.glVertex3d (val, p1N, p2N);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1005 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	1006 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1007 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1008 else if (xyz == Y_AXIS)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1009 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1010 m_glfcns.glVertex3d (p1, val, p2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1011 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	1012 if (mirror)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1013 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1014 m_glfcns.glVertex3d (p1N, val, p2N);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1015 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	1016 }
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 else if (xyz == Z_AXIS)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1019 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1020 m_glfcns.glVertex3d (p1, p2, val);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1021 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	1022 if (mirror)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1023 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1024 m_glfcns.glVertex3d (p1N, p2N, val);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1025 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	1026 }
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
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1031 m_glfcns.glEnd ();
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1032
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1033 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	1034
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1035 octave_unused_parameter (ticks);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1036 octave_unused_parameter (lim1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1037 octave_unused_parameter (lim2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1038 octave_unused_parameter (p1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1039 octave_unused_parameter (p1N);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1040 octave_unused_parameter (p2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1041 octave_unused_parameter (p2N);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1042 octave_unused_parameter (dx);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1043 octave_unused_parameter (dy);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1044 octave_unused_parameter (dz);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1045 octave_unused_parameter (xyz);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1046 octave_unused_parameter (mirror);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1047
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1048 // 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	1049 // 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	1050
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1051 panic_impossible ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1052
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1053 #endif
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1054 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1055
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1056 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1057 opengl_renderer::render_ticktexts (const Matrix& ticks,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1058 const string_vector& ticklabels,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1059 double lim1, double lim2,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1060 double p1, double p2,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1061 int xyz, int ha, int va,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1062 int& wmax, int& hmax)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1063 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1064 #if defined (HAVE_OPENGL)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1065
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1066 int nticks = ticks.numel ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1067 int nlabels = ticklabels.numel ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1068
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1069 if (nlabels == 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1070 return;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1071
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1072 for (int i = 0; i < nticks; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1073 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1074 double val = ticks(i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1075
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1076 if (lim1 <= val && val <= lim2)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1077 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1078 Matrix b;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1079
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1080 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	1081 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	1082 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	1083
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1084 // 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	1085 // drawn after axes object, for correct rendering?
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1086 if (xyz == X_AXIS)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1087 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1088 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	1089 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1090 else if (xyz == Y_AXIS)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1091 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1092 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	1093 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1094 else if (xyz == Z_AXIS)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1095 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1096 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	1097 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1098
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1099 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	1100 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	1101 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1102 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1103
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1104 #else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1105
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1106 octave_unused_parameter (ticks);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1107 octave_unused_parameter (ticklabels);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1108 octave_unused_parameter (lim1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1109 octave_unused_parameter (lim2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1110 octave_unused_parameter (p1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1111 octave_unused_parameter (p2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1112 octave_unused_parameter (xyz);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1113 octave_unused_parameter (ha);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1114 octave_unused_parameter (va);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1115 octave_unused_parameter (wmax);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1116 octave_unused_parameter (hmax);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1117
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1118 // 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	1119 // 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	1120
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1121 panic_impossible ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1122
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1123 #endif
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1124 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1125
25863 8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1126 void
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1127 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	1128 {
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1129 #if defined (HAVE_OPENGL)
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1130
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1131 m_glfcns.glVertex2d (x1, y1);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1132 m_glfcns.glVertex2d (x2, y1);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1133 m_glfcns.glVertex2d (x2, y2);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1134 m_glfcns.glVertex2d (x1, y2);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1135 m_glfcns.glVertex2d (x1, y1);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1136
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1137 #else
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1138
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1139 octave_unused_parameter (x1);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1140 octave_unused_parameter (x2);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1141 octave_unused_parameter (y1);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1142 octave_unused_parameter (y2);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1143
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1144 // 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	1145 // 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	1146
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1147 panic_impossible ();
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1148
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1149 #endif
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1150 }
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1151
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1152 void
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1153 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	1154 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	1155 const Matrix& overlaycolor,
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1156 double overlayalpha,
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1157 const Matrix& bordercolor,
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1158 double borderalpha, double borderwidth)
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1159 {
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1160 #if defined (HAVE_OPENGL)
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1161
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1162 m_glfcns.glMatrixMode (GL_MODELVIEW);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1163 m_glfcns.glPushMatrix ();
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1164 m_glfcns.glLoadIdentity ();
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1165
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1166 m_glfcns.glMatrixMode (GL_PROJECTION);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1167 m_glfcns.glPushMatrix ();
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1168 m_glfcns.glLoadIdentity ();
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1169 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	1170
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1171 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	1172 m_glfcns.glDisable (GL_DEPTH_TEST);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1173
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1174 m_glfcns.glBegin (GL_POLYGON);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1175 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	1176 overlayalpha);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1177 draw_zoom_rect (x1, y1, x2, y2);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1178 m_glfcns.glEnd ();
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1179
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1180 m_glfcns.glLineWidth (borderwidth);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1181 m_glfcns.glBegin (GL_LINE_STRIP);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1182 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	1183 borderalpha);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1184 draw_zoom_rect (x1, y1, x2, y2);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1185 m_glfcns.glEnd ();
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1186
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1187 m_glfcns.glPopAttrib ();
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1188
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1189 m_glfcns.glMatrixMode (GL_MODELVIEW);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1190 m_glfcns.glPopMatrix ();
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1191
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1192 m_glfcns.glMatrixMode (GL_PROJECTION);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1193 m_glfcns.glPopMatrix ();
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1194
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1195 #else
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1196
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1197 octave_unused_parameter (width);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1198 octave_unused_parameter (height);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1199 octave_unused_parameter (x1);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1200 octave_unused_parameter (x2);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1201 octave_unused_parameter (y1);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1202 octave_unused_parameter (y2);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1203 octave_unused_parameter (overlaycolor);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1204 octave_unused_parameter (overlayalpha);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1205 octave_unused_parameter (bordercolor);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1206 octave_unused_parameter (borderalpha);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1207 octave_unused_parameter (borderwidth);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1208
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1209 // 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	1210 // 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	1211
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1212 panic_impossible ();
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1213
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1214 #endif
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1215 }
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	1216
23535 2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1217 uint8NDArray
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1218 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	1219 {
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1220 #if defined (HAVE_OPENGL)
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1221
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1222 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	1223 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	1224
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1225 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	1226 pix.fortran_vec ());
23535 2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1227
23562 35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	1228 // 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	1229 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	1230 perm(0) = 2;
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1231 perm(1) = 1;
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1232 perm(2) = 0;
23562 35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	1233
23535 2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1234 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	1235 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	1236 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	1237 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	1238
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1239 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	1240
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1241 #else
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1242
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25058 diff changeset	1243 // 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	1244 // 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	1245
23562 35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	1246 octave_unused_parameter (width);
35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	1247 octave_unused_parameter (height);
35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	1248
35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	1249 panic_impossible ();
23535 2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1250
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1251 #endif
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1252 }
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23479 diff changeset	1253
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1254 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1255 opengl_renderer::finish (void)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1256 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1257 #if defined (HAVE_OPENGL)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1258
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1259 m_glfcns.glFinish ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1260
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1261 #else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1262
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1263 // 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	1264 // 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	1265
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1266 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	1267
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1268 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1269 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1270
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1271 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1272 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	1273 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1274 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1275
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1276 // setup OpenGL transformation
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1277
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1278 Matrix x_zlim = props.get_transform_zlim ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1279
25826 2c42ed37cfc2 Increase OpenGL clipping limits in ortho view (bug #54551). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25820 diff changeset	1280 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	1281 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	1282
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1283 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	1284 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	1285
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1286 m_glfcns.glMatrixMode (GL_MODELVIEW);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1287 m_glfcns.glLoadIdentity ();
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1288 m_glfcns.glScaled (1, 1, -1);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1289 m_glfcns.glMultMatrixd (x_mat1.data ());
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1290 m_glfcns.glMatrixMode (GL_PROJECTION);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1291 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	1292
25889 2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	1293 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	1294 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	1295 m_glfcns.glMultMatrixd (x_mat2.data ());
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1296 m_glfcns.glMatrixMode (GL_MODELVIEW);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1297
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1298 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	1299
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1300 // store axes transformation data
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 xform = props.get_transform ();
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1303
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1304 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	1305
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1306 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1307
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1308 // 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	1309 // 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	1310
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1311 panic_impossible ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1312
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1313 #endif
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1314 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1315
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1316 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1317 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	1318 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1319 #if defined (HAVE_OPENGL)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1320
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1321 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	1322 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	1323 return;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1324
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1325 double xPlane = props.get_xPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1326 double yPlane = props.get_yPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1327 double zPlane = props.get_zPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1328 double xPlaneN = props.get_xPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1329 double yPlaneN = props.get_yPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1330 double zPlaneN = props.get_zPlaneN ();
26020 912e1daa03d2 maint: Use 2D, 3D in variable names in graphics code rather than 2d,3d. Rik <rik@octave.org> parents: 25999 diff changeset	1331 bool is2D = props.get_is2D ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1332
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1333 // Axes planes
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1334 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	1335 set_polygon_offset (true, 9.0);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1336
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1337 m_glfcns.glBegin (GL_QUADS);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1338
26020 912e1daa03d2 maint: Use 2D, 3D in variable names in graphics code rather than 2d,3d. Rik <rik@octave.org> parents: 25999 diff changeset	1339 if (! is2D)
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 // X plane
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1342 m_glfcns.glVertex3d (xPlane, yPlaneN, zPlaneN);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1343 m_glfcns.glVertex3d (xPlane, yPlane, zPlaneN);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1344 m_glfcns.glVertex3d (xPlane, yPlane, zPlane);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1345 m_glfcns.glVertex3d (xPlane, yPlaneN, zPlane);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1346
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1347 // Y plane
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1348 m_glfcns.glVertex3d (xPlaneN, yPlane, zPlaneN);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1349 m_glfcns.glVertex3d (xPlane, yPlane, zPlaneN);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1350 m_glfcns.glVertex3d (xPlane, yPlane, zPlane);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1351 m_glfcns.glVertex3d (xPlaneN, yPlane, zPlane);
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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1354 // Z plane
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1355 m_glfcns.glVertex3d (xPlaneN, yPlaneN, zPlane);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1356 m_glfcns.glVertex3d (xPlane, yPlaneN, zPlane);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1357 m_glfcns.glVertex3d (xPlane, yPlane, zPlane);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1358 m_glfcns.glVertex3d (xPlaneN, yPlane, zPlane);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1359
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1360 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1361
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1362 set_polygon_offset (false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1363
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1364 #else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1365
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1366 octave_unused_parameter (props);
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 // 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	1369 // 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	1370
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1371 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	1372
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1373 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1374 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1375
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1376 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1377 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	1378 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1379 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1380
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1381 if (! props.is_visible ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1382 return;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1383
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1384 bool xySym = props.get_xySym ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1385 bool layer2Dtop = props.get_layer2Dtop ();
26020 912e1daa03d2 maint: Use 2D, 3D in variable names in graphics code rather than 2d,3d. Rik <rik@octave.org> parents: 25999 diff changeset	1386 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	1387 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	1388 && ! 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	1389 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	1390 && ! props.xscale_is ("log");
22363 0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1391 bool boxFull = (props.get_boxstyle () == "full");
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1392 double linewidth = props.get_linewidth ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1393 double xPlane = props.get_xPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1394 double yPlane = props.get_yPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1395 double zPlane = props.get_zPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1396 double xPlaneN = props.get_xPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1397 double yPlaneN = props.get_yPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1398 double zPlaneN = props.get_zPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1399 double xpTick = props.get_xpTick ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1400 double ypTick = props.get_ypTick ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1401 double zpTick = props.get_zpTick ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1402 double xpTickN = props.get_xpTickN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1403 double ypTickN = props.get_ypTickN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1404 double zpTickN = props.get_zpTickN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1405
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1406 bool plotyy = (props.has_property ("__plotyy_axes__"));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1407
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1408 // Axes box
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1409
24807 8585b3f9c28c Use "butt" linecap to workaround split lines in printout (bug #53229). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24725 diff changeset	1410 set_linecap ("square");
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1411 set_linestyle ("-", true, linewidth);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1412
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1413 m_glfcns.glBegin (GL_LINES);
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 (layer2Dtop)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1416 std::swap (zpTick, zpTickN);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1417
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1418 // X box
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1419 Matrix color = props.get_xcolor_rgb ();
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1420
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1421 if (! color.isempty ())
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1422 {
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1423 set_color (color);
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1424
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1425 if (! isXOrigin \|\| props.is_box() \|\| ! is2D)
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1426 {
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1427 m_glfcns.glVertex3d (xPlaneN, ypTick, zpTick);
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1428 m_glfcns.glVertex3d (xPlane, ypTick, zpTick);
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1429 }
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1430
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1431 if (props.is_box ())
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1432 {
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1433 m_glfcns.glVertex3d (xPlaneN, ypTickN, zpTick);
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1434 m_glfcns.glVertex3d (xPlane, ypTickN, zpTick);
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1435 if (! is2D)
22363 0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1436 {
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1437 m_glfcns.glVertex3d (xPlaneN, ypTickN, zpTickN);
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1438 m_glfcns.glVertex3d (xPlane, ypTickN, zpTickN);
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1439 if (boxFull)
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1440 {
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1441 m_glfcns.glVertex3d (xPlaneN, ypTick, zpTickN);
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1442 m_glfcns.glVertex3d (xPlane, ypTick, zpTickN);
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1443 }
22363 0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1444 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1445 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1446 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1447
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1448 // Y box
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1449 color = props.get_ycolor_rgb ();
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1450
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1451 if (! color.isempty ())
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1452 {
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1453 set_color (color);
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1454 if (! isYOrigin \|\| props.is_box() \|\| ! is2D)
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1455 {
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1456 m_glfcns.glVertex3d (xpTick, yPlaneN, zpTick);
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1457 m_glfcns.glVertex3d (xpTick, yPlane, zpTick);
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1458 }
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1459
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1460 if (props.is_box () && ! plotyy)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1461 {
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1462 m_glfcns.glVertex3d (xpTickN, yPlaneN, zpTick);
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1463 m_glfcns.glVertex3d (xpTickN, yPlane, zpTick);
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1464
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1465 if (! is2D)
22363 0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1466 {
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1467 m_glfcns.glVertex3d (xpTickN, yPlaneN, zpTickN);
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1468 m_glfcns.glVertex3d (xpTickN, yPlane, zpTickN);
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1469 if (boxFull)
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1470 {
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1471 m_glfcns.glVertex3d (xpTick, yPlaneN, zpTickN);
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1472 m_glfcns.glVertex3d (xpTick, yPlane, zpTickN);
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1473 }
22363 0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1474 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1475 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1476 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1477
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1478 // Z box
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1479 color = props.get_zcolor_rgb ();
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1480
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1481 if (! color.isempty () && ! is2D)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1482 {
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1483 set_color (color);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1484
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1485 if (xySym)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1486 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1487 m_glfcns.glVertex3d (xPlaneN, yPlane, zPlaneN);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1488 m_glfcns.glVertex3d (xPlaneN, yPlane, zPlane);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1489 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1490 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1491 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1492 m_glfcns.glVertex3d (xPlane, yPlaneN, zPlaneN);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1493 m_glfcns.glVertex3d (xPlane, yPlaneN, zPlane);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1494 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1495
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1496 if (props.is_box ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1497 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1498 m_glfcns.glVertex3d (xPlane, yPlane, zPlaneN);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1499 m_glfcns.glVertex3d (xPlane, yPlane, zPlane);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1500
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1501 if (xySym)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1502 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1503 m_glfcns.glVertex3d (xPlane, yPlaneN, zPlaneN);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1504 m_glfcns.glVertex3d (xPlane, yPlaneN, zPlane);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1505 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1506 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1507 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1508 m_glfcns.glVertex3d (xPlaneN, yPlane, zPlaneN);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1509 m_glfcns.glVertex3d (xPlaneN, yPlane, zPlane);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1510 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1511
22363 0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1512 if (boxFull)
0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1513 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1514 m_glfcns.glVertex3d (xPlaneN, yPlaneN, zPlaneN);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1515 m_glfcns.glVertex3d (xPlaneN, yPlaneN, zPlane);
22363 0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1516 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1517 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1518 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1519
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1520 m_glfcns.glEnd ();
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1521
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	1522 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	1523
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1524 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	1525
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1526 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1527
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1528 // 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	1529 // 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	1530
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1531 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	1532
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1533 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1534 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1535
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1536 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1537 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	1538 {
22740 3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1539 #if defined (HAVE_OPENGL)
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1540
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1541 gh_manager& gh_mgr
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1542 = __get_gh_manager__ ("opengl_renderer::draw_axes_x_grid");
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1543
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1544 int xstate = props.get_xstate ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1545
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	1546 if (xstate != AXE_DEPTH_DIR
24634 ab2321d4ba03 maint: strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1547 && (props.is_visible ()
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	1548 \|\| (selecting && props.pickableparts_is ("all"))))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1549 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1550 int zstate = props.get_zstate ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1551 bool x2Dtop = props.get_x2Dtop ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1552 bool layer2Dtop = props.get_layer2Dtop ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1553 bool xyzSym = props.get_xyzSym ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1554 bool nearhoriz = props.get_nearhoriz ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1555 double xticklen = props.get_xticklen ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1556 double xtickoffset = props.get_xtickoffset ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1557 double fy = props.get_fy ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1558 double fz = props.get_fz ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1559 double x_min = props.get_x_min ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1560 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	1561 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	1562 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	1563 double yPlane = props.get_yPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1564 double yPlaneN = props.get_yPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1565 double ypTick = props.get_ypTick ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1566 double ypTickN = props.get_ypTickN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1567 double zPlane = props.get_zPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1568 double zPlaneN = props.get_zPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1569 double zpTick = props.get_zpTick ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1570 double zpTickN = props.get_zpTickN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1571
26669 879f22ca59c8 gl-render.cc: Omit minor grid and minor ticks if ticks are empty (bug #55633). Markus Mützel <markus.muetzel@gmx.de> parents: 26564 diff changeset	1572 // X ticks and grid properties
879f22ca59c8 gl-render.cc: Omit minor grid and minor ticks if ticks are empty (bug #55633). Markus Mützel <markus.muetzel@gmx.de> parents: 26564 diff changeset	1573 Matrix xticks = xform.xscale (props.get_xtick ().matrix_value ());
879f22ca59c8 gl-render.cc: Omit minor grid and minor ticks if ticks are empty (bug #55633). Markus Mützel <markus.muetzel@gmx.de> parents: 26564 diff changeset	1574 Matrix xmticks = xform.xscale (props.get_xminortickvalues ().matrix_value ());
879f22ca59c8 gl-render.cc: Omit minor grid and minor ticks if ticks are empty (bug #55633). Markus Mützel <markus.muetzel@gmx.de> parents: 26564 diff changeset	1575 bool do_xminortick = props.is_xminortick () && ! xticks.isempty ();
879f22ca59c8 gl-render.cc: Omit minor grid and minor ticks if ticks are empty (bug #55633). Markus Mützel <markus.muetzel@gmx.de> parents: 26564 diff changeset	1576 string_vector xticklabels = props.get_xticklabel ().string_vector_value ();
879f22ca59c8 gl-render.cc: Omit minor grid and minor ticks if ticks are empty (bug #55633). Markus Mützel <markus.muetzel@gmx.de> parents: 26564 diff changeset	1577 int wmax = 0;
879f22ca59c8 gl-render.cc: Omit minor grid and minor ticks if ticks are empty (bug #55633). Markus Mützel <markus.muetzel@gmx.de> parents: 26564 diff changeset	1578 int hmax = 0;
879f22ca59c8 gl-render.cc: Omit minor grid and minor ticks if ticks are empty (bug #55633). Markus Mützel <markus.muetzel@gmx.de> parents: 26564 diff changeset	1579 bool tick_along_z = nearhoriz \|\| math::isinf (fy);
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1580 double linewidth = props.get_linewidth ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1581 std::string gridstyle = props.get_gridlinestyle ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1582 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	1583 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	1584 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	1585 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	1586 double minorgridalpha = props.get_minorgridalpha ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1587 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	1588 bool do_xminorgrid = (props.is_xminorgrid ()
26669 879f22ca59c8 gl-render.cc: Omit minor grid and minor ticks if ticks are empty (bug #55633). Markus Mützel <markus.muetzel@gmx.de> parents: 26564 diff changeset	1589 && (minorgridstyle != "none")
879f22ca59c8 gl-render.cc: Omit minor grid and minor ticks if ticks are empty (bug #55633). Markus Mützel <markus.muetzel@gmx.de> parents: 26564 diff changeset	1590 && ! xticks.isempty ());
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1591 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	1592 && ! props.yscale_is ("log");
868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1593 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	1594 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	1595
26669 879f22ca59c8 gl-render.cc: Omit minor grid and minor ticks if ticks are empty (bug #55633). Markus Mützel <markus.muetzel@gmx.de> parents: 26564 diff changeset	1596 // X grid
879f22ca59c8 gl-render.cc: Omit minor grid and minor ticks if ticks are empty (bug #55633). Markus Mützel <markus.muetzel@gmx.de> parents: 26564 diff changeset	1597
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1598 // possibly use axis color for gridcolor & minorgridcolor
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1599 if (props.gridcolormode_is ("auto"))
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1600 if (props.xcolormode_is ("manual") && ! props.xcolor_is ("none"))
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1601 gridcolor = props.get_xcolor_rgb ();
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1602
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1603 if (props.minorgridcolormode_is ("auto"))
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1604 if (props.xcolormode_is ("manual") && ! props.xcolor_is ("none"))
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1605 minorgridcolor = props.get_xcolor_rgb ();
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1606
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1607 if (gridcolor.isempty ())
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1608 do_xgrid = false;
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1609
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1610 if (minorgridcolor.isempty ())
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1611 do_xminorgrid = false;
22528 5a1167e15c0e Fix color of (minor) grid (bug #48429). Markus Mützel <markus.muetzel@gmx.de> parents: 22500 diff changeset	1612
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	1613 // 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	1614 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	1615 {
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	1616 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	1617 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	1618 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	1619 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	1620 }
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	1621
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1622 // minor grid lines
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1623 if (do_xminorgrid)
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1624 render_grid (linewidth,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1625 minorgridstyle, minorgridcolor, minorgridalpha,
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1626 xmticks, x_min, x_max,
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1627 yPlane, yPlaneN, layer2Dtop ? zPlaneN : zPlane, zPlaneN,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1628 0, (zstate != AXE_DEPTH_DIR));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1629
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1630 // grid lines
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1631 if (do_xgrid)
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1632 render_grid (linewidth,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1633 gridstyle, gridcolor, gridalpha,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1634 xticks, x_min, x_max,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1635 yPlane, yPlaneN, layer2Dtop ? zPlaneN : zPlane, zPlaneN,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1636 0, (zstate != AXE_DEPTH_DIR));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1637
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1638 // Skip drawing axis, ticks, and ticklabels when color is "none"
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1639 if (props.xcolor_is ("none"))
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1640 return;
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1641
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1642 set_color (props.get_xcolor_rgb ());
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1643
22711 074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1644 // axis line
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1645 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	1646 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	1647 {
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25058 diff changeset	1648 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	1649 m_glfcns.glBegin (GL_LINES);
26430 a665b4823da9 gl-render.cc (draw_axes_x_grid): Fix copy & paste error (bug #55390). Markus Mützel <markus.muetzel@gmx.de> parents: 26417 diff changeset	1650 set_color (props.get_xcolor_rgb ());
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1651 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	1652 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	1653 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	1654 }
074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1655
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1656 // minor tick marks
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1657 if (do_xminortick)
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1658 {
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1659 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	1660 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	1661 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	1662 zpTick, zpTickN, 0., 0.,
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	1663 (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	1664 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	1665 0, ! is_origin && mirror);
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1666 else
22711 074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1667 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	1668 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	1669 zpTick, zpTick, 0.,
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	1670 (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	1671 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	1672 0., 0, ! is_origin && mirror);
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1673 }
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1674
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1675 // tick marks
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1676 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	1677 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	1678 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	1679 zpTick, zpTickN, 0., 0.,
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	1680 (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	1681 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	1682 0, ! is_origin && mirror);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1683 else
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1684 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	1685 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	1686 zpTick, zpTick, 0.,
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	1687 (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	1688 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	1689 0., 0, ! is_origin && mirror);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1690
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1691 // tick texts
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1692 if (xticklabels.numel () > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1693 {
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	1694 int halign = (xstate == AXE_HORZ_DIR
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	1695 ? 1
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	1696 : (xyzSym \|\| is_origin_low ? 0 : 2));
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	1697 int valign = (xstate == AXE_VERT_DIR
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	1698 ? 1
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	1699 : (x2Dtop \|\| is_origin_low ? 0 : 2));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1700
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1701 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	1702 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	1703 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	1704 zpTick +
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	1705 (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	1706 math::signum (zpTick-zpTickN)fzxtickoffset,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1707 0, halign, valign, wmax, hmax);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1708 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1709 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	1710 (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	1711 (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	1712 math::signum (ypTick-ypTickN)fyxtickoffset,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1713 zpTick, 0, halign, valign, wmax, hmax);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1714 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1715
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1716 gh_mgr.get_object (props.get_xlabel ()).set ("visible", "on");
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1717 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1718 else
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1719 gh_mgr.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	1720
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1721 #else
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1722
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1723 octave_unused_parameter (props);
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1724
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1725 // 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	1726 // 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	1727
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1728 panic_impossible ();
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1729
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1730 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1731 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1732
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1733 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1734 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	1735 {
22740 3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1736 #if defined (HAVE_OPENGL)
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1737
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1738 gh_manager& gh_mgr
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1739 = __get_gh_manager__ ("opengl_renderer::draw_axes_y_grid");
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1740
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1741 int ystate = props.get_ystate ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1742
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	1743 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	1744 && (props.is_visible ()
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	1745 \|\| (selecting && props.pickableparts_is ("all"))))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1746 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1747 int zstate = props.get_zstate ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1748 bool y2Dright = props.get_y2Dright ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1749 bool layer2Dtop = props.get_layer2Dtop ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1750 bool xyzSym = props.get_xyzSym ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1751 bool nearhoriz = props.get_nearhoriz ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1752 double yticklen = props.get_yticklen ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1753 double ytickoffset = props.get_ytickoffset ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1754 double fx = props.get_fx ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1755 double fz = props.get_fz ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1756 double xPlane = props.get_xPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1757 double xPlaneN = props.get_xPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1758 double xpTick = props.get_xpTick ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1759 double xpTickN = props.get_xpTickN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1760 double y_min = props.get_y_min ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1761 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	1762 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	1763 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	1764 double zPlane = props.get_zPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1765 double zPlaneN = props.get_zPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1766 double zpTick = props.get_zpTick ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1767 double zpTickN = props.get_zpTickN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1768
26669 879f22ca59c8 gl-render.cc: Omit minor grid and minor ticks if ticks are empty (bug #55633). Markus Mützel <markus.muetzel@gmx.de> parents: 26564 diff changeset	1769 // Y ticks and grid properties
879f22ca59c8 gl-render.cc: Omit minor grid and minor ticks if ticks are empty (bug #55633). Markus Mützel <markus.muetzel@gmx.de> parents: 26564 diff changeset	1770 Matrix yticks = xform.yscale (props.get_ytick ().matrix_value ());
879f22ca59c8 gl-render.cc: Omit minor grid and minor ticks if ticks are empty (bug #55633). Markus Mützel <markus.muetzel@gmx.de> parents: 26564 diff changeset	1771 Matrix ymticks = xform.yscale (props.get_yminortickvalues ().matrix_value ());
879f22ca59c8 gl-render.cc: Omit minor grid and minor ticks if ticks are empty (bug #55633). Markus Mützel <markus.muetzel@gmx.de> parents: 26564 diff changeset	1772 bool do_yminortick = props.is_yminortick () && ! yticks.isempty ();
879f22ca59c8 gl-render.cc: Omit minor grid and minor ticks if ticks are empty (bug #55633). Markus Mützel <markus.muetzel@gmx.de> parents: 26564 diff changeset	1773 string_vector yticklabels = props.get_yticklabel ().string_vector_value ();
879f22ca59c8 gl-render.cc: Omit minor grid and minor ticks if ticks are empty (bug #55633). Markus Mützel <markus.muetzel@gmx.de> parents: 26564 diff changeset	1774 int wmax = 0;
879f22ca59c8 gl-render.cc: Omit minor grid and minor ticks if ticks are empty (bug #55633). Markus Mützel <markus.muetzel@gmx.de> parents: 26564 diff changeset	1775 int hmax = 0;
879f22ca59c8 gl-render.cc: Omit minor grid and minor ticks if ticks are empty (bug #55633). Markus Mützel <markus.muetzel@gmx.de> parents: 26564 diff changeset	1776 bool tick_along_z = nearhoriz \|\| math::isinf (fx);
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1777 double linewidth = props.get_linewidth ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1778 std::string gridstyle = props.get_gridlinestyle ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1779 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	1780 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	1781 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	1782 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	1783 double minorgridalpha = props.get_minorgridalpha ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1784 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	1785 bool do_yminorgrid = (props.is_yminorgrid ()
26669 879f22ca59c8 gl-render.cc: Omit minor grid and minor ticks if ticks are empty (bug #55633). Markus Mützel <markus.muetzel@gmx.de> parents: 26564 diff changeset	1786 && (minorgridstyle != "none")
879f22ca59c8 gl-render.cc: Omit minor grid and minor ticks if ticks are empty (bug #55633). Markus Mützel <markus.muetzel@gmx.de> parents: 26564 diff changeset	1787 && ! yticks.isempty ());
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1788 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	1789 && ! props.xscale_is ("log");
868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1790 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	1791 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	1792 && (! props.has_property ("__plotyy_axes__"));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1793
26669 879f22ca59c8 gl-render.cc: Omit minor grid and minor ticks if ticks are empty (bug #55633). Markus Mützel <markus.muetzel@gmx.de> parents: 26564 diff changeset	1794 // Y grid
879f22ca59c8 gl-render.cc: Omit minor grid and minor ticks if ticks are empty (bug #55633). Markus Mützel <markus.muetzel@gmx.de> parents: 26564 diff changeset	1795
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1796 // possibly use axis color for gridcolor & minorgridcolor
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1797 if (props.gridcolormode_is ("auto"))
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1798 if (props.ycolormode_is ("manual") && ! props.ycolor_is ("none"))
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1799 gridcolor = props.get_ycolor_rgb ();
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1800
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1801 if (props.minorgridcolormode_is ("auto"))
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1802 if (props.ycolormode_is ("manual") && ! props.ycolor_is ("none"))
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1803 minorgridcolor = props.get_ycolor_rgb ();
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1804
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1805 if (gridcolor.isempty ())
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1806 do_ygrid = false;
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1807
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1808 if (minorgridcolor.isempty ())
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1809 do_yminorgrid = false;
22528 5a1167e15c0e Fix color of (minor) grid (bug #48429). Markus Mützel <markus.muetzel@gmx.de> parents: 22500 diff changeset	1810
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	1811 // 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	1812 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	1813 {
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	1814 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	1815 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	1816 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	1817 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	1818 }
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	1819
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1820 // minor grid lines
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1821 if (do_yminorgrid)
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1822 render_grid (linewidth,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1823 minorgridstyle, minorgridcolor, minorgridalpha,
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1824 ymticks, y_min, y_max,
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1825 xPlane, xPlaneN, layer2Dtop ? zPlaneN : zPlane, zPlaneN,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1826 1, (zstate != AXE_DEPTH_DIR));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1827
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1828 // grid lines
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1829 if (do_ygrid)
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1830 render_grid (linewidth,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1831 gridstyle, gridcolor, gridalpha,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1832 yticks, y_min, y_max,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1833 xPlane, xPlaneN, layer2Dtop ? zPlaneN : zPlane, zPlaneN,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1834 1, (zstate != AXE_DEPTH_DIR));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1835
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1836 // Skip drawing axis, ticks, and ticklabels when color is "none"
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1837 if (props.ycolor_is ("none"))
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1838 return;
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1839
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1840 set_color (props.get_ycolor_rgb ());
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1841
22711 074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1842 // axis line
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1843 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	1844 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	1845 {
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25058 diff changeset	1846 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	1847 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	1848 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	1849 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	1850 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	1851 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	1852 }
074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1853
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1854 // minor tick marks
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1855 if (do_yminortick)
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1856 {
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1857 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	1858 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	1859 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	1860 zpTick, zpTickN, 0., 0.,
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	1861 (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	1862 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	1863 1, ! is_origin && mirror);
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1864 else
22711 074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1865 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	1866 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	1867 zpTick, zpTick,
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	1868 (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	1869 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	1870 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	1871 }
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1872
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1873 // tick marks
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1874 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	1875 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	1876 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	1877 zpTick, zpTickN, 0., 0.,
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	1878 (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	1879 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	1880 1, ! is_origin && mirror);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1881 else
22711 074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1882 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	1883 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	1884 zpTick, zpTick,
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	1885 (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	1886 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	1887 0., 0., 1, ! is_origin && mirror);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1888
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1889 // tick texts
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1890 if (yticklabels.numel () > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1891 {
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	1892 int halign = (ystate == AXE_HORZ_DIR
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	1893 ? 1
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	1894 : (! 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	1895 int valign = (ystate == AXE_VERT_DIR
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	1896 ? 1
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	1897 : (is_origin_low ? 0 : 2));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1898
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1899 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	1900 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	1901 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	1902 zpTick +
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	1903 (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	1904 math::signum (zpTick-zpTickN)fzytickoffset,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1905 1, halign, valign, wmax, hmax);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1906 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1907 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	1908 (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	1909 (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	1910 math::signum (xpTick-xpTickN)fxytickoffset,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1911 zpTick, 1, halign, valign, wmax, hmax);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1912 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1913
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1914 gh_mgr.get_object (props.get_ylabel ()).set ("visible", "on");
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1915 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1916 else
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1917 gh_mgr.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	1918
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1919 #else
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1920
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1921 octave_unused_parameter (props);
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1922
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1923 // 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	1924 // 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	1925
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1926 panic_impossible ();
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1927
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1928 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1929 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1930
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1931 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1932 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	1933 {
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1934 gh_manager& gh_mgr
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1935 = __get_gh_manager__ ("opengl_renderer::draw_axes_z_grid");
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1936
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1937 int zstate = props.get_zstate ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1938
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	1939 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	1940 && (props.is_visible ()
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	1941 \|\| (selecting && props.pickableparts_is ("all"))))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1942 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1943 bool xySym = props.get_xySym ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1944 bool zSign = props.get_zSign ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1945 double zticklen = props.get_zticklen ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1946 double ztickoffset = props.get_ztickoffset ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1947 double fx = props.get_fx ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1948 double fy = props.get_fy ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1949 double xPlane = props.get_xPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1950 double xPlaneN = props.get_xPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1951 double yPlane = props.get_yPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1952 double yPlaneN = props.get_yPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1953 double z_min = props.get_z_min ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1954 double z_max = props.get_z_max ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1955
26669 879f22ca59c8 gl-render.cc: Omit minor grid and minor ticks if ticks are empty (bug #55633). Markus Mützel <markus.muetzel@gmx.de> parents: 26564 diff changeset	1956 // Z ticks and grid properties
879f22ca59c8 gl-render.cc: Omit minor grid and minor ticks if ticks are empty (bug #55633). Markus Mützel <markus.muetzel@gmx.de> parents: 26564 diff changeset	1957 Matrix zticks = xform.zscale (props.get_ztick ().matrix_value ());
879f22ca59c8 gl-render.cc: Omit minor grid and minor ticks if ticks are empty (bug #55633). Markus Mützel <markus.muetzel@gmx.de> parents: 26564 diff changeset	1958 Matrix zmticks = xform.zscale (props.get_zminortickvalues ().matrix_value ());
879f22ca59c8 gl-render.cc: Omit minor grid and minor ticks if ticks are empty (bug #55633). Markus Mützel <markus.muetzel@gmx.de> parents: 26564 diff changeset	1959 bool do_zminortick = props.is_zminortick () && ! zticks.isempty ();
879f22ca59c8 gl-render.cc: Omit minor grid and minor ticks if ticks are empty (bug #55633). Markus Mützel <markus.muetzel@gmx.de> parents: 26564 diff changeset	1960 string_vector zticklabels = props.get_zticklabel ().string_vector_value ();
879f22ca59c8 gl-render.cc: Omit minor grid and minor ticks if ticks are empty (bug #55633). Markus Mützel <markus.muetzel@gmx.de> parents: 26564 diff changeset	1961 int wmax = 0;
879f22ca59c8 gl-render.cc: Omit minor grid and minor ticks if ticks are empty (bug #55633). Markus Mützel <markus.muetzel@gmx.de> parents: 26564 diff changeset	1962 int hmax = 0;
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1963 double linewidth = props.get_linewidth ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1964 std::string gridstyle = props.get_gridlinestyle ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1965 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	1966 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	1967 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	1968 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	1969 double minorgridalpha = props.get_minorgridalpha ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1970 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	1971 bool do_zminorgrid = (props.is_zminorgrid ()
26669 879f22ca59c8 gl-render.cc: Omit minor grid and minor ticks if ticks are empty (bug #55633). Markus Mützel <markus.muetzel@gmx.de> parents: 26564 diff changeset	1972 && (minorgridstyle != "none")
879f22ca59c8 gl-render.cc: Omit minor grid and minor ticks if ticks are empty (bug #55633). Markus Mützel <markus.muetzel@gmx.de> parents: 26564 diff changeset	1973 && ! zticks.isempty ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1974 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	1975
26669 879f22ca59c8 gl-render.cc: Omit minor grid and minor ticks if ticks are empty (bug #55633). Markus Mützel <markus.muetzel@gmx.de> parents: 26564 diff changeset	1976 // Z grid
879f22ca59c8 gl-render.cc: Omit minor grid and minor ticks if ticks are empty (bug #55633). Markus Mützel <markus.muetzel@gmx.de> parents: 26564 diff changeset	1977
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1978 // possibly use axis color for gridcolor & minorgridcolor
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1979 if (props.gridcolormode_is ("auto"))
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1980 if (props.zcolormode_is ("manual") && ! props.zcolor_is ("none"))
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1981 gridcolor = props.get_zcolor_rgb ();
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1982
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1983 if (props.minorgridcolormode_is ("auto"))
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1984 if (props.zcolormode_is ("manual") && ! props.zcolor_is ("none"))
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1985 minorgridcolor = props.get_zcolor_rgb ();
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1986
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1987 if (gridcolor.isempty ())
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1988 do_zgrid = false;
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1989
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1990 if (minorgridcolor.isempty ())
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1991 do_zminorgrid = false;
22528 5a1167e15c0e Fix color of (minor) grid (bug #48429). Markus Mützel <markus.muetzel@gmx.de> parents: 22500 diff changeset	1992
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	1993 // 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	1994 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	1995 {
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	1996 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	1997 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	1998 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	1999 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	2000 }
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	2001
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2002 // minor grid lines
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2003 if (do_zminorgrid)
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	2004 render_grid (linewidth,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	2005 minorgridstyle, minorgridcolor, minorgridalpha,
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2006 zmticks, z_min, z_max,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2007 xPlane, xPlaneN, yPlane, yPlaneN, 2, true);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2008
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2009 // grid lines
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2010 if (do_zgrid)
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	2011 render_grid (linewidth,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	2012 gridstyle, gridcolor, gridalpha,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	2013 zticks, z_min, z_max,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2014 xPlane, xPlaneN, yPlane, yPlaneN, 2, true);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2015
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	2016 // Skip drawing axis, ticks, and ticklabels when color is "none"
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	2017 if (props.zcolor_is ("none"))
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	2018 return;
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	2019
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2020 set_color (props.get_zcolor_rgb ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2021
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2022 // minor tick marks
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2023 if (do_zminortick)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2024 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2025 if (xySym)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2026 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	2027 if (math::isinf (fy))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2028 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	2029 yPlane, yPlane,
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	2030 math::signum (xPlaneN-xPlane)fxzticklen/2,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2031 0., 0., 2, mirror);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2032 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2033 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	2034 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	2035 math::signum (yPlane-yPlaneN)fyzticklen/2,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2036 0., 2, false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2037 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2038 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2039 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	2040 if (math::isinf (fx))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2041 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	2042 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	2043 math::signum (yPlaneN-yPlane)fyzticklen/2,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2044 0., 2, mirror);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2045 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2046 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	2047 yPlaneN, yPlaneN,
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	2048 math::signum (xPlane-xPlaneN)fxzticklen/2,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2049 0., 0., 2, false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2050 }
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
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2053 // tick marks
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2054 if (xySym)
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2055 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	2056 if (math::isinf (fy))
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2057 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	2058 yPlane, yPlane,
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	2059 math::signum (xPlaneN-xPlane)fxzticklen,
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2060 0., 0., 2, mirror);
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2061 else
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2062 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	2063 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	2064 math::signum (yPlane-yPlaneN)fyzticklen,
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2065 0., 2, false);
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2066 }
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2067 else
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2068 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	2069 if (math::isinf (fx))
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2070 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	2071 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	2072 math::signum (yPlaneN-yPlane)fyzticklen,
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2073 0., 2, mirror);
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2074 else
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2075 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	2076 yPlaneN, yPlane,
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	2077 math::signum (xPlane-xPlaneN)fxzticklen,
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2078 0., 0., 2, false);
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2079 }
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2080
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2081 // tick texts
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2082 if (zticklabels.numel () > 0)
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2083 {
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2084 int halign = 2;
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2085 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	2086
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2087 if (xySym)
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2088 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	2089 if (math::isinf (fy))
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2090 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	2091 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	2092 yPlane, 2, halign, valign, wmax, hmax);
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2093 else
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2094 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	2095 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	2096 2, halign, valign, wmax, hmax);
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2097 }
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2098 else
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2099 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	2100 if (math::isinf (fx))
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2101 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	2102 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	2103 2, halign, valign, wmax, hmax);
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2104 else
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2105 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	2106 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	2107 yPlaneN, 2, halign, valign, wmax, hmax);
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2108 }
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2109 }
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2110
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	2111 gh_mgr.get_object (props.get_zlabel ()).set ("visible", "on");
22331 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 else
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	2114 gh_mgr.get_object (props.get_zlabel ()).set ("visible", "off");
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2115 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2116
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2117 void
23546 06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	2118 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	2119 {
23562 35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	2120 #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	2121 // 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	2122 GLboolean antialias;
23562 35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	2123
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2124 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	2125
23546 06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	2126 if (antialias == GL_TRUE)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2127 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	2128
24807 8585b3f9c28c Use "butt" linecap to workaround split lines in printout (bug #53229). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24725 diff changeset	2129 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	2130 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	2131 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	2132 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	2133
06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	2134 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	2135 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	2136 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	2137
06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	2138 if (antialias == GL_TRUE)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2139 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	2140 #else
35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	2141
35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	2142 octave_unused_parameter (props);
35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	2143
35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	2144 // 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	2145 // 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	2146
35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	2147 panic_impossible ();
35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	2148
35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	2149 #endif
23546 06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	2150 }
06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	2151
06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	2152 void
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	2153 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	2154 std::list<graphics_object>& obj_list)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2155 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2156 #if defined (HAVE_OPENGL)
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	2157 gh_manager& gh_mgr
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	2158 = __get_gh_manager__ ("opengl_renderer::draw_axes_all_lights");
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	2159
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2160 Matrix children = props.get_all_children ();
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 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	2163 {
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	2164 graphics_object go = gh_mgr.get_object (children(i));
22331 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 base_properties p = go.get_properties ();
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2167
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2168 if (p.is_visible ()
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2169 \|\| (selecting && p.pickableparts_is ("all")))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2170 {
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2171 if (go.isa ("light") && ! selecting)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2172 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2173 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	2174 {
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2175 set_clipping (p.is_clipping ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2176 draw (go);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2177 m_current_light++;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2178 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2179 }
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2180 else if (go.isa ("hggroup")
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2181 && ! (selecting && p.pickableparts_is ("none")))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2182 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	2183 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	2184 obj_list.push_back (go);
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 }
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2187 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	2188
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2189 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2190 octave_unused_parameter (obj_list);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2191
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2192 // 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	2193 // 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	2194
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2195 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	2196
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2197 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2198 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2199
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2200 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2201 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	2202 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2203 #if defined (HAVE_OPENGL)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2204 // list for non-light child objects
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2205 std::list<graphics_object> obj_list;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2206 std::list<graphics_object>::iterator it;
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 // 1st pass: draw light objects
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2209
22349 2aac9ec7df29 Do not call GL functions before window is open. (bug #48669) Markus Mützel <markus.muetzel@gmx.de> parents: 22348 diff changeset	2210 // 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	2211 // 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	2212 // 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	2213 // 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	2214 // 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	2215 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	2216
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2217 // 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	2218 // 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	2219
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2220 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	2221 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	2222 "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	2223 "exceeded.", m_max_lights);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2224
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2225 m_current_light = GL_LIGHT0;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2226 draw_all_lights (props, obj_list);
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 // disable other OpenGL lights
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2229 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	2230 m_glfcns.glDisable (GL_LIGHT0 + i);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2231
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2232 // 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	2233 // other objects
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2234 view_vector = props.get_cameraposition ().matrix_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2235
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2236 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	2237 ColumnVector ambient_color = props.get_ambientlightcolor_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2238 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2239 cb[i] = ambient_color(i);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2240 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	2241
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2242 // 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	2243
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2244 it = obj_list.begin ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2245 while (it != obj_list.end ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2246 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2247 graphics_object go = (*it);
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 // 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	2250 // to "data"
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2251 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	2252 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2253 set_clipping (go.get_properties ().is_clipping ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2254 draw (go);
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 it = obj_list.erase (it);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2257 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2258 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2259 it++;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2260 }
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 // 3rd pass: draw remaining objects
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2263
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2264 m_glfcns.glDisable (GL_DEPTH_TEST);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2265
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2266 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	2267 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2268 graphics_object go = (*it);
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 set_clipping (go.get_properties ().is_clipping ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2271 draw (go);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2272 }
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 set_clipping (false);
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 // FIXME: finalize rendering (transparency processing)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2277 // 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	2278
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2279 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	2280
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2281 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2282
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2283 // 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	2284 // 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	2285
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2286 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	2287
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2288 #endif
22331 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 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2292 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	2293 {
22258 553490ffc203 Fix compile error and warning with '--without-opengl' (bug #48724) Markus Mützel <markus.muetzel@gmx.de> parents: 22192 diff changeset	2294 #if defined (HAVE_OPENGL)
22331 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 // 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	2297 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	2298 return;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2299
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2300 // 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	2301 // pickable parts is "none".
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2302 if (selecting && props.pickableparts_is ("none"))
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2303 return;
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2304
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2305 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	2306
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2307 double x_min = props.get_x_min ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2308 double x_max = props.get_x_max ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2309 double y_min = props.get_y_min ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2310 double y_max = props.get_y_max ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2311 double z_min = props.get_z_min ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2312 double z_max = props.get_z_max ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2313
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2314 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	2315 \|\| 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	2316 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2317 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	2318 return;
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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2321 setup_opengl_transformation (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2322
23863 56b7352fa456 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23859 diff changeset	2323 // 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	2324 // depth sorting
7148b237f94f Fix regression introduced by cset 06805aabbdd1 (bug #50750). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23807 diff changeset	2325 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	2326 if (is2D)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2327 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	2328 else
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2329 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	2330
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2331 draw_axes_planes (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2332
23546 06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	2333 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	2334 {
857b553177a5 Fix regression with axes lines layer (see bug #39692 comment #24) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24173 diff changeset	2335 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	2336 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	2337 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	2338 }
22357 8f23b5b23235 Avoid grid overlaying axes box (bug #48842) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22349 diff changeset	2339
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2340 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	2341
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2342 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	2343
23546 06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	2344 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	2345 {
857b553177a5 Fix regression with axes lines layer (see bug #39692 comment #24) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24173 diff changeset	2346 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	2347 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	2348 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	2349 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2350
22258 553490ffc203 Fix compile error and warning with '--without-opengl' (bug #48724) Markus Mützel <markus.muetzel@gmx.de> parents: 22192 diff changeset	2351 #else
553490ffc203 Fix compile error and warning with '--without-opengl' (bug #48724) Markus Mützel <markus.muetzel@gmx.de> parents: 22192 diff changeset	2352
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2353 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2354
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2355 // 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	2356 // 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	2357
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2358 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	2359
553490ffc203 Fix compile error and warning with '--without-opengl' (bug #48724) Markus Mützel <markus.muetzel@gmx.de> parents: 22192 diff changeset	2360 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2361 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2362
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2363 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2364 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	2365 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2366 #if defined (HAVE_OPENGL)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2367
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2368 bool draw_all = selecting && props.pickableparts_is ("all");
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2369
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2370 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	2371 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	2372 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	2373
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2374 bool has_z = (z.numel () > 0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2375 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	2376 (has_z ? z.numel ()
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2377 : 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	2378 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	2379 uint8_t clip_ok = 0x40;
c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	2380
c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	2381 std::vector<uint8_t> clip (n);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2382
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2383 if (has_z)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2384 for (int i = 0; i < n; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2385 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	2386 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2387 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2388 double z_mid = (zmin+zmax)/2;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2389
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2390 for (int i = 0; i < n; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2391 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	2392 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2393
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2394 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	2395 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2396 set_color (props.get_color_rgb ());
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	2397 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	2398 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	2399 set_linecap ("butt");
22759 39f39eb4e476 Implement "linejoin" property (bug #48387) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22755 diff changeset	2400 set_linejoin (props.get_linejoin ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2401
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2402 if (has_z)
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 bool flag = false;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2405
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2406 for (int i = 1; i < n; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2407 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2408 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	2409 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2410 if (! flag)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2411 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2412 flag = true;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2413 m_glfcns.glBegin (GL_LINE_STRIP);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2414 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	2415 }
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2416 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	2417 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2418 else if (flag)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2419 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2420 flag = false;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2421 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2422 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2423 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2424
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2425 if (flag)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2426 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2427 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2428 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2429 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2430 bool flag = false;
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 for (int i = 1; i < n; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2433 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2434 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	2435 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2436 if (! flag)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2437 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2438 flag = true;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2439 m_glfcns.glBegin (GL_LINE_STRIP);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2440 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	2441 }
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2442 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	2443 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2444 else if (flag)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2445 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2446 flag = false;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2447 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2448 }
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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2451 if (flag)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2452 m_glfcns.glEnd ();
22331 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
22358 dc73bbd66363 Make sure all lines associated with axes respect axes linewidth property. Rik <rik@octave.org> parents: 22357 diff changeset	2455 set_linewidth (0.5f);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2456 set_linestyle ("-");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2457 }
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 set_clipping (false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2460
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2461 if (! props.marker_is ("none")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2462 && ! (props.markeredgecolor_is ("none")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2463 && props.markerfacecolor_is ("none")))
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 Matrix lc, fc;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2466
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2467 if (draw_all)
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2468 lc = Matrix (1, 3, 0.0);
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2469 else if (props.markeredgecolor_is ("auto"))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2470 lc = props.get_color_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2471 else if (! props.markeredgecolor_is ("none"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2472 lc = props.get_markeredgecolor_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2473
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2474 if (draw_all)
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2475 fc = Matrix (1, 3, 0.0);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2476 if (props.markerfacecolor_is ("auto"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2477 fc = props.get_color_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2478 else if (! props.markerfacecolor_is ("none"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2479 fc = props.get_markerfacecolor_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2480
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2481 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	2482 props.get_linewidth ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2483
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2484 for (int i = 0; i < n; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2485 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2486 if (clip[i] == clip_ok)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2487 draw_marker (x(i), y(i),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2488 has_z ? z(i) : 0.0,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2489 lc, fc);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2490 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2491
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2492 end_marker ();
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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2495 set_clipping (props.is_clipping ());
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2496
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2497 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	2498
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2499 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2500
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2501 // 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	2502 // 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	2503
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2504 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	2505
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2506 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2507 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2508
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2509 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2510 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	2511 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2512 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2513
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2514 bool draw_all = selecting && props.pickableparts_is ("all");
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2515
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2516 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	2517 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	2518 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	2519
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2520 int zr = z.rows ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2521 int zc = z.columns ();
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 NDArray c;
25867 49ffa78f9243 Use "facenormals" for flat lighting on surfaces (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25864 diff changeset	2524 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	2525 dim_vector vn_dims = vn.dims ();
27277 db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 26995 diff changeset	2526 bool has_vertex_normals = (vn_dims(0) == zr && vn_dims(1) == zc
db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 26995 diff changeset	2527 && 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	2528 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	2529 dim_vector fn_dims = fn.dims ();
27277 db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 26995 diff changeset	2530 bool has_face_normals = (fn_dims(0) == zr - 1 && fn_dims(1) == zc - 1
db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 26995 diff changeset	2531 && fn_dims(2) == 3);
22331 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 // FIXME: handle transparency
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2534 Matrix a;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2535
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2536 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	2537 (props.facecolor_is ("flat") ? 1 :
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2538 (props.facecolor_is ("interp") ? 2 :
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2539 (props.facecolor_is ("texturemap") ? 3 : -1))));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2540 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	2541 (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	2542 (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	2543 (has_vertex_normals ? 2 : 0)));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2544 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	2545 (props.facealpha_is ("flat") ? 1 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2546 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	2547 (props.edgecolor_is ("flat") ? 1 :
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2548 (props.edgecolor_is ("interp") ? 2 : -1)));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2549 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	2550 (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	2551 (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	2552 (has_vertex_normals ? 2 : 0)));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2553 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	2554 (props.edgealpha_is ("flat") ? 1 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2555 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	2556 (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	2557 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	2558
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2559 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	2560 : props.get_facecolor_rgb ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2561 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	2562 double fa = 1.0;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2563
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2564 float as = props.get_ambientstrength ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2565 float ds = props.get_diffusestrength ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2566 float ss = props.get_specularstrength ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2567 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	2568 float scr = props.get_specularcolorreflectance ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2569 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	2570
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2571 opengl_texture tex (m_glfcns);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2572
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2573 int i1, i2, j1, j2;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2574 bool x_mat = (x.rows () == z.rows ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2575 bool y_mat = (y.columns () == z.columns ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2576
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2577 i1 = i2 = j1 = j2 = 0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2578
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2579 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	2580 c = props.get_color_data ().array_value ();
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 boolMatrix clip (z.dims (), false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2583
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2584 for (int i = 0; i < zr; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2585 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2586 if (x_mat)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2587 i1 = i;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2588
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2589 for (int j = 0; j < zc; j++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2590 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2591 if (y_mat)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2592 j1 = j;
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 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	2595 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2596 }
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 if (fa_mode > 0 \|\| ea_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2599 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2600 // FIXME: implement alphadata conversion
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2601 //a = props.get_alpha_data ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2602 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2603
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2604 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	2605 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	2606
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2607 // FIXME: good candidate for caching,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2608 // 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	2609 if (fc_mode == TEXTURE)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2610 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	2611
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2612 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	2613 {
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	2614 if (fa_mode == 0)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2615 {
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	2616 fa = props.get_facealpha_double ();
26468 bdf03ab385c2 Use facealpha for surface objects with uniform facecolor and lighting (bug #55384). Markus Mützel <markus.muetzel@gmx.de> parents: 26465 diff changeset	2617 cb[3] = fa;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2618 if (fc_mode == UNIFORM \|\| fc_mode == TEXTURE)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2619 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2620 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	2621 if (fl_mode > 0)
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 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2624 cb[i] = as * fcolor(i);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2625 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	2626
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2627 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2628 cb[i] = ds * fcolor(i);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2629 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	2630
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2631 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2632 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	2633 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	2634 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2635 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2636
25423 13b1b9a0d9c5 Move management of lights in axes from GL to graphics backend. Markus Mützel <markus.muetzel@gmx.de> parents: 25419 diff changeset	2637 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	2638 m_glfcns.glEnable (GL_LIGHTING);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2639 m_glfcns.glShadeModel ((fc_mode == INTERP \|\| fl_mode == GOURAUD)
27932 b018f553fd85 maint: Use Octave coding conventions in libinterp/ Rik <rik@octave.org> parents: 27923 diff changeset	2640 ? 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	2641 set_polygon_offset (true, 1.0);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2642 if (fc_mode == TEXTURE)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2643 m_glfcns.glEnable (GL_TEXTURE_2D);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2644
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2645 for (int i = 1; i < zc; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2646 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2647 if (y_mat)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2648 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2649 i1 = i-1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2650 i2 = i;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2651 }
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 for (int j = 1; j < zr; j++)
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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2656 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	2657 \|\| clip(j-1, i) \|\| clip(j, i))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2658 continue;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2659
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2660 if (fc_mode == FLAT)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2661 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2662 // "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	2663 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	2664 continue;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2665 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2666 else if (fc_mode == INTERP)
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 // "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	2669 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	2670 && 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	2671 continue;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2672 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2673
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2674 if (x_mat)
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 j1 = j-1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2677 j2 = j;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2678 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2679
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2680 m_glfcns.glBegin (GL_QUADS);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2681
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2682 // Vertex 1
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2683 if (fc_mode == TEXTURE)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2684 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	2685 double (j-1) / (zr-1));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2686 else if (fc_mode > 0)
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 // 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	2689 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2690 cb[k] = 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	2691 m_glfcns.glColor4fv (cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2692
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2693 if (fl_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2694 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2695 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2696 cb[k] *= as;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2697 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	2698
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2699 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2700 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	2701 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	2702
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2703 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2704 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	2705 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	2706 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2707 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2708 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	2709 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	2710 j-1, i-1);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2711
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2712 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	2713
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2714 // Vertex 2
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2715 if (fc_mode == TEXTURE)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2716 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	2717 else if (fc_mode == INTERP)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2718 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2719 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2720 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	2721 m_glfcns.glColor4fv (cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2722
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2723 if (fl_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2724 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2725 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2726 cb[k] *= as;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2727 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	2728
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2729 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2730 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	2731 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	2732
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2733 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2734 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	2735 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	2736 }
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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2739 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	2740 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	2741
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2742 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	2743
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2744 // Vertex 3
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2745 if (fc_mode == TEXTURE)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2746 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	2747 else if (fc_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 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2750 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	2751 m_glfcns.glColor4fv (cb);
22331 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 if (fl_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2754 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2755 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2756 cb[k] *= as;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2757 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	2758
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2759 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2760 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	2761 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	2762
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2763 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2764 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	2765 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	2766 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2767 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2768 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	2769 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	2770
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2771 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	2772
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2773 // Vertex 4
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2774 if (fc_mode == TEXTURE)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2775 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	2776 else if (fc_mode == INTERP)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2777 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2778 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2779 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	2780 m_glfcns.glColor4fv (cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2781
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2782 if (fl_mode > 0)
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 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2785 cb[k] *= as;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2786 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	2787
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2788 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2789 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	2790 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	2791
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2792 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2793 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	2794 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	2795 }
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 (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	2798 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	2799
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2800 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	2801
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2802 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2803 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2804 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2805
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2806 set_polygon_offset (false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2807 if (fc_mode == TEXTURE)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2808 m_glfcns.glDisable (GL_TEXTURE_2D);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2809
25423 13b1b9a0d9c5 Move management of lights in axes from GL to graphics backend. Markus Mützel <markus.muetzel@gmx.de> parents: 25419 diff changeset	2810 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	2811 m_glfcns.glDisable (GL_LIGHTING);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2812 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2813 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2814 {
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	2815 // 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	2816 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2817 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2818
22391 c5da5e5e9846 Fix inconsistent on-screen/printout patch and surface edges (bug #48873). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22369 diff changeset	2819 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	2820 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2821 if (props.get_edgealpha_double () == 1)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2822 {
26468 bdf03ab385c2 Use facealpha for surface objects with uniform facecolor and lighting (bug #55384). Markus Mützel <markus.muetzel@gmx.de> parents: 26465 diff changeset	2823 cb[3] = 1.0; // edgealpha isn't implemented yet
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2824 if (ec_mode == UNIFORM)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2825 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2826 m_glfcns.glColor3dv (ecolor.data ());
28006 91316b5dc5a2 Only use ambient light for edge lighting on patches (bug #57553). Markus Mützel <markus.muetzel@gmx.de> parents: 27992 diff changeset	2827 if (el_mode > 0)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2828 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2829 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2830 cb[i] = as * ecolor(i);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2831 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	2832
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2833 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2834 cb[i] = ds * ecolor(i);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2835 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	2836
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2837 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2838 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	2839 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	2840 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2841 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2842
25423 13b1b9a0d9c5 Move management of lights in axes from GL to graphics backend. Markus Mützel <markus.muetzel@gmx.de> parents: 25419 diff changeset	2843 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	2844 m_glfcns.glEnable (GL_LIGHTING);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2845 m_glfcns.glShadeModel ((ec_mode == INTERP \|\| el_mode == GOURAUD)
27932 b018f553fd85 maint: Use Octave coding conventions in libinterp/ Rik <rik@octave.org> parents: 27923 diff changeset	2846 ? GL_SMOOTH : GL_FLAT);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2847
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	2848 set_linestyle (props.get_linestyle (), false,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	2849 props.get_linewidth ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2850 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	2851 set_linecap ("butt");
22759 39f39eb4e476 Implement "linejoin" property (bug #48387) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22755 diff changeset	2852 set_linejoin ("miter");
22331 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 // Mesh along Y-axis
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2855
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2856 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	2857 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2858 for (int i = 0; i < zc; i++)
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 if (y_mat)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2861 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2862 i1 = i-1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2863 i2 = i;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2864 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2865
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2866 for (int j = 1; j < zr; j++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2867 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2868 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	2869 continue;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2870
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2871 if (ec_mode == FLAT)
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 // "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	2874 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	2875 continue;
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 else if (ec_mode == INTERP)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2878 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2879 // "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	2880 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	2881 continue;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2882 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2883
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2884 if (x_mat)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2885 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2886 j1 = j-1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2887 j2 = j;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2888 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2889
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2890 m_glfcns.glBegin (GL_LINES);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2891
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2892 // Vertex 1
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2893 if (ec_mode > 0)
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 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2896 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	2897 m_glfcns.glColor3fv (cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2898
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2899 if (el_mode > 0)
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] *= as;
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_AMBIENT, 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] = 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	2907 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	2908
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2909 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2910 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	2911 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	2912 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2913 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2914 if (el_mode > 0)
26465 dd40f9650821 Avoid heap-buffer-overflow with facenormals on surface edges (bug #48519). Markus Mützel <markus.muetzel@gmx.de> parents: 26430 diff changeset	2915 {
dd40f9650821 Avoid heap-buffer-overflow with facenormals on surface edges (bug #48519). Markus Mützel <markus.muetzel@gmx.de> parents: 26430 diff changeset	2916 if (el_mode == GOURAUD)
dd40f9650821 Avoid heap-buffer-overflow with facenormals on surface edges (bug #48519). Markus Mützel <markus.muetzel@gmx.de> parents: 26430 diff changeset	2917 set_normal (bfl_mode, vn, j-1, i);
dd40f9650821 Avoid heap-buffer-overflow with facenormals on surface edges (bug #48519). Markus Mützel <markus.muetzel@gmx.de> parents: 26430 diff changeset	2918 else
dd40f9650821 Avoid heap-buffer-overflow with facenormals on surface edges (bug #48519). Markus Mützel <markus.muetzel@gmx.de> parents: 26430 diff changeset	2919 set_normal (bfl_mode, fn, j-1, std::min (i, zc-2));
dd40f9650821 Avoid heap-buffer-overflow with facenormals on surface edges (bug #48519). Markus Mützel <markus.muetzel@gmx.de> parents: 26430 diff changeset	2920 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2921
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2922 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	2923
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2924 // Vertex 2
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2925 if (ec_mode == INTERP)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2926 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2927 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2928 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	2929 m_glfcns.glColor3fv (cb);
22331 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 if (el_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2932 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2933 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2934 cb[k] *= as;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2935 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	2936
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2937 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2938 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	2939 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	2940
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2941 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2942 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	2943 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	2944 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2945 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2946 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	2947 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	2948
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2949 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	2950
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2951 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2952 }
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 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2955
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2956 // Mesh along X-axis
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2957
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2958 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	2959 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2960 for (int j = 0; j < zr; j++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2961 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2962 if (x_mat)
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 j1 = j-1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2965 j2 = j;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2966 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2967
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2968 for (int i = 1; i < zc; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2969 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2970 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	2971 continue;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2972
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2973 if (ec_mode == FLAT)
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 // "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	2976 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	2977 continue;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2978 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2979 else if (ec_mode == INTERP)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2980 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2981 // "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	2982 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	2983 continue;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2984 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2985
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2986 if (y_mat)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2987 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2988 i1 = i-1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2989 i2 = i;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2990 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2991
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2992 m_glfcns.glBegin (GL_LINES);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2993
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2994 // Vertex 1
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2995 if (ec_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2996 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2997 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2998 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	2999 m_glfcns.glColor3fv (cb);
22331 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 if (el_mode > 0)
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 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3004 cb[k] *= as;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3005 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	3006
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3007 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3008 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	3009 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	3010
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3011 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3012 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	3013 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	3014 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3015 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3016 if (el_mode > 0)
26465 dd40f9650821 Avoid heap-buffer-overflow with facenormals on surface edges (bug #48519). Markus Mützel <markus.muetzel@gmx.de> parents: 26430 diff changeset	3017 {
dd40f9650821 Avoid heap-buffer-overflow with facenormals on surface edges (bug #48519). Markus Mützel <markus.muetzel@gmx.de> parents: 26430 diff changeset	3018 if (el_mode == GOURAUD)
dd40f9650821 Avoid heap-buffer-overflow with facenormals on surface edges (bug #48519). Markus Mützel <markus.muetzel@gmx.de> parents: 26430 diff changeset	3019 set_normal (bfl_mode, vn, j, i-1);
dd40f9650821 Avoid heap-buffer-overflow with facenormals on surface edges (bug #48519). Markus Mützel <markus.muetzel@gmx.de> parents: 26430 diff changeset	3020 else
dd40f9650821 Avoid heap-buffer-overflow with facenormals on surface edges (bug #48519). Markus Mützel <markus.muetzel@gmx.de> parents: 26430 diff changeset	3021 set_normal (bfl_mode, fn, std::min (j, zr-2), i-1);
dd40f9650821 Avoid heap-buffer-overflow with facenormals on surface edges (bug #48519). Markus Mützel <markus.muetzel@gmx.de> parents: 26430 diff changeset	3022 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3023
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3024 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	3025
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3026 // Vertex 2
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3027 if (ec_mode == INTERP)
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 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3030 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	3031 m_glfcns.glColor3fv (cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3032
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3033 if (el_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3034 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3035 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3036 cb[k] *= as;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3037 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	3038
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3039 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3040 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	3041 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	3042
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3043 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3044 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	3045 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	3046 }
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 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	3049 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	3050
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3051 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	3052
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3053 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3054 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3055 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3056 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3057
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	3058 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	3059 set_linewidth (0.5f);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3060
25423 13b1b9a0d9c5 Move management of lights in axes from GL to graphics backend. Markus Mützel <markus.muetzel@gmx.de> parents: 25419 diff changeset	3061 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	3062 m_glfcns.glDisable (GL_LIGHTING);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3063 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3064 else
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 // FIXME: implement transparency
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3067 }
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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3070 if (! props.marker_is ("none")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3071 && ! (props.markeredgecolor_is ("none")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3072 && props.markerfacecolor_is ("none")))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3073 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3074 // 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	3075 // 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	3076 // and facecolor set to none.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3077
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3078 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	3079 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	3080
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3081 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	3082 props.get_markeredgecolor_rgb ());
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3083 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	3084 props.get_markerfacecolor_rgb ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3085 Matrix cc (1, 3, 0.0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3086
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	3087 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	3088 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3089 mecolor = props.get_edgecolor_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3090 do_edge = ! props.edgecolor_is ("none");
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
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	3093 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	3094 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3095 mfcolor = props.get_facecolor_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3096 do_face = ! props.facecolor_is ("none");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3097 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3098
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	3099 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	3100 c = props.get_color_data ().array_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3101
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3102 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	3103 props.get_linewidth ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3104
25896 c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	3105 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	3106 uint8_t clip_ok = 0x40;
c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	3107
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3108 for (int i = 0; i < zc; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3109 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3110 if (y_mat)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3111 i1 = i;
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 for (int j = 0; j < zr; j++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3114 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3115 if (x_mat)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3116 j1 = j;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3117
25896 c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	3118 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	3119 != clip_ok)
c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	3120 continue;
c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	3121
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	3122 if ((do_edge && mecolor.isempty ())
80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	3123 \|\| (do_face && mfcolor.isempty ()))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3124 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3125 if (! math::isfinite (c(j,i)))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3126 continue; // Skip NaNs in color data
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3127
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3128 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3129 cc(k) = c(j,i,k);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3130 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3131
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	3132 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	3133 : Matrix ());
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	3134 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	3135 : Matrix ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3136
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3137 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	3138 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3139 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3140
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3141 end_marker ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3142 }
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3143
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3144 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3145
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3146 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3147
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3148 // 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	3149 // 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	3150
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3151 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3152
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3153 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3154 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3155
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3156 // FIXME: global optimization (rendering, data structures...),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3157 // 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	3158 void
23433 c9fab0bc983e maint: Use convention 'int& x' for naming references. Rik <rik@octave.org> parents: 23396 diff changeset	3159 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	3160 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3161 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3162
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3163 // 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	3164 std::string msg;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3165 if (props.has_bad_data (msg))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3166 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3167 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	3168 return;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3169 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3170
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3171 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	3172 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	3173 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	3174 Matrix c;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3175 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	3176 double fa = 1.0;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3177
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3178 int nv = v.rows ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3179 int nf = f.rows ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3180 int fcmax = f.columns ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3181
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3182 bool has_z = (v.columns () > 2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3183 bool has_facecolor = false;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3184 bool has_facealpha = false;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3185
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3186 int fc_mode = ((props.facecolor_is ("none")
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3187 \|\| 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	3188 (props.facecolor_is ("flat") ? 1 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3189 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	3190 (props.facelighting_is ("flat") ? 1 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3191 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	3192 (props.facealpha_is ("flat") ? 1 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3193 int ec_mode = ((props.edgecolor_is ("none")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3194 \|\| props.edgecolor_is_rgb ()) ? 0 :
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3195 (props.edgecolor_is ("flat") ? 1 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3196 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	3197 (props.edgelighting_is ("flat") ? 1 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3198 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	3199 (props.edgealpha_is ("flat") ? 1 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3200 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	3201 (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	3202 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	3203
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3204 Matrix fcolor = props.get_facecolor_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3205 Matrix ecolor = props.get_edgecolor_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3206
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3207 float as = props.get_ambientstrength ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3208 float ds = props.get_diffusestrength ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3209 float ss = props.get_specularstrength ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3210 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	3211 float scr = props.get_specularcolorreflectance ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3212
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3213 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	3214 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	3215 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	3216 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	3217
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3218 boolMatrix clip (1, nv, false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3219
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3220 if (has_z)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3221 for (int i = 0; i < nv; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3222 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	3223 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3224 for (int i = 0; i < nv; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3225 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	3226
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3227 boolMatrix clip_f (1, nf, false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3228 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	3229
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3230 for (int i = 0; i < nf; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3231 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3232 bool fclip = false;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3233 int count = 0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3234
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3235 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	3236 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	3237
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3238 clip_f(i) = fclip;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3239 count_f(i) = count;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3240 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3241
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3242 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	3243 {
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3244 if (draw_all)
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3245 c = Matrix (1, 3, 0.0);
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3246 else
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3247 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	3248
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3249 if (c.rows () == 1)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3250 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3251 // 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	3252
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3253 if (draw_all \|\| fc_mode > 0)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3254 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3255 fcolor = c;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3256 fc_mode = UNIFORM;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3257 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3258
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3259 if (draw_all \|\| ec_mode > 0)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3260 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3261 ecolor = c;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3262 ec_mode = UNIFORM;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3263 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3264
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3265 c = Matrix ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3266 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3267 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3268 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	3269 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3270
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3271 if (fa_mode > 0 \|\| ea_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3272 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3273 // FIXME: retrieve alpha data from patch object
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3274 //a = props.get_alpha_data ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3275 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	3276 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3277
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	3278 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	3279 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	3280
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3281 octave_idx_type fr = f.rows ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3282 std::vector<vertex_data> vdata (f.numel ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3283
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3284 for (int i = 0; i < nf; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3285 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	3286 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3287 int idx = int (f(i,j) - 1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3288
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3289 Matrix vv (1, 3, 0.0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3290 Matrix cc;
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3291 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	3292 Matrix fnn (1, 3, 0.0);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3293 double aa = 1.0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3294
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3295 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	3296 if (has_z)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3297 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	3298 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	3299 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3300 double dir = 1.0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3301 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	3302 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	3303 + 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	3304 + 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	3305 ? ((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	3306 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	3307 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	3308 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	3309 }
27277 db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 26995 diff changeset	3310 if ((fl_mode == GOURAUD \|\| el_mode == GOURAUD) && has_vertex_normals)
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3311 {
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3312 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	3313 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	3314 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	3315 + 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	3316 + 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	3317 ? ((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	3318 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	3319 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	3320 vnn(2) = dir * vn(idx,2);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3321 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3322 if (c.numel () > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3323 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3324 cc.resize (1, 3);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3325 if (has_facecolor)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3326 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	3327 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3328 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	3329 }
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	3330 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	3331 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	3332 else if (a.numel () > 0)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3333 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3334 if (has_facealpha)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3335 aa = a(i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3336 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3337 aa = a(idx);
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 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	3341 }
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 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	3344 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	3345
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3346 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	3347 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3348 // 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	3349 if (fa_mode == 0)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3350 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3351 if (fc_mode == UNIFORM)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3352 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3353 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	3354 if (fl_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3355 {
28006 91316b5dc5a2 Only use ambient light for edge lighting on patches (bug #57553). Markus Mützel <markus.muetzel@gmx.de> parents: 27992 diff changeset	3356 float cb[4] = { 0.0f, 0.0f, 0.0f, 1.0f };;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3357
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3358 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3359 cb[i] = as * fcolor(i);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3360 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	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] = ds * fcolor(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_DIFFUSE, 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] = 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	3368 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	3369 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3370 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3371
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3372 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	3373 m_glfcns.glEnable (GL_LIGHTING);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3374
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3375 // NOTE: Push filled part of patch backwards to avoid Z-fighting
27979 cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	3376 // with tessellator outline. A value of 1.0 seems to work fine.
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3377 // 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	3378 // axes planes at +2.5.
28006 91316b5dc5a2 Only use ambient light for edge lighting on patches (bug #57553). Markus Mützel <markus.muetzel@gmx.de> parents: 27992 diff changeset	3379 patch_tessellator tess (this, fc_mode, fl_mode, true, 1.0);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3380
27798 8c1cb06468db Change class of coplanar_last_idx for patch objects (bug #55895). Markus Mützel <markus.muetzel@gmx.de> parents: 27767 diff changeset	3381 std::vector<octave_idx_type>::const_iterator it;
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3382 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	3383
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3384 for (int i = 0; i < nf; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3385 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3386 if (clip_f(i))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3387 continue;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3388
25419 7361fd8aed86 Fix segmentation fault with last change (bug #47677). Markus Mützel <markus.muetzel@gmx.de> parents: 25418 diff changeset	3389 bool is_non_planar = false;
27798 8c1cb06468db Change class of coplanar_last_idx for patch objects (bug #55895). Markus Mützel <markus.muetzel@gmx.de> parents: 27767 diff changeset	3390 if (props.coplanar_last_idx.size () > 0
8c1cb06468db Change class of coplanar_last_idx for patch objects (bug #55895). Markus Mützel <markus.muetzel@gmx.de> parents: 27767 diff changeset	3391 && props.coplanar_last_idx[i].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	3392 {
25419 7361fd8aed86 Fix segmentation fault with last change (bug #47677). Markus Mützel <markus.muetzel@gmx.de> parents: 25418 diff changeset	3393 is_non_planar = true;
27798 8c1cb06468db Change class of coplanar_last_idx for patch objects (bug #55895). Markus Mützel <markus.muetzel@gmx.de> parents: 27767 diff changeset	3394 it = props.coplanar_last_idx[i].end ();
8c1cb06468db Change class of coplanar_last_idx for patch objects (bug #55895). Markus Mützel <markus.muetzel@gmx.de> parents: 27767 diff changeset	3395 it--;
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 }
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3397
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3398 // 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	3399 do
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3400 {
25419 7361fd8aed86 Fix segmentation fault with last change (bug #47677). Markus Mützel <markus.muetzel@gmx.de> parents: 25418 diff changeset	3401 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	3402 {
27798 8c1cb06468db Change class of coplanar_last_idx for patch objects (bug #55895). Markus Mützel <markus.muetzel@gmx.de> parents: 27767 diff changeset	3403 i_end = *it;
8c1cb06468db Change class of coplanar_last_idx for patch objects (bug #55895). Markus Mützel <markus.muetzel@gmx.de> parents: 27767 diff changeset	3404 if (it == props.coplanar_last_idx[i].begin ())
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3405 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	3406 else
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3407 {
27798 8c1cb06468db Change class of coplanar_last_idx for patch objects (bug #55895). Markus Mützel <markus.muetzel@gmx.de> parents: 27767 diff changeset	3408 it--;
8c1cb06468db Change class of coplanar_last_idx for patch objects (bug #55895). Markus Mützel <markus.muetzel@gmx.de> parents: 27767 diff changeset	3409 i_start = *it - 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	3410 }
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3411 }
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3412 else
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3413 {
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3414 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	3415 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	3416 }
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3417
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3418 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	3419 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	3420
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3421 // 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	3422 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	3423 {
27277 db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 26995 diff changeset	3424 vertex_data::vertex_data_rep *vv
db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 26995 diff changeset	3425 = vdata[i+j*fr].get_rep ();
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3426
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3427 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	3428 }
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3429
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3430 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	3431 {
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3432 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	3433
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3434 if (fc_mode == FLAT)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3435 {
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3436 // 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	3437 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	3438
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3439 if (col.numel () == 3)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3440 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3441 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	3442 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	3443 {
28006 91316b5dc5a2 Only use ambient light for edge lighting on patches (bug #57553). Markus Mützel <markus.muetzel@gmx.de> parents: 27992 diff changeset	3444 float cb[4] = { 0.0f, 0.0f, 0.0f, 1.0f };
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3445
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3446 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	3447 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	3448 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	3449
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3450 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	3451 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	3452 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	3453
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3454 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	3455 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	3456 (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	3457 + (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	3458 col(k));
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3459 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	3460 }
22331 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 }
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3463
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3464 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	3465 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3466
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3467 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	3468 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	3469 } while (i_start > 0);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3470 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3471
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3472 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	3473 m_glfcns.glDisable (GL_LIGHTING);
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 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3476 {
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	3477 // FIXME: implement flat and interp transparency
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3478 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3479 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3480
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3481 if (draw_all
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3482 \|\| (! 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	3483 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3484 // FIXME: adapt to double-radio property
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3485 if (props.get_edgealpha_double () == 1)
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 if (ec_mode == UNIFORM)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3488 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3489 m_glfcns.glColor3dv (ecolor.data ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3490 if (el_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3491 {
28006 91316b5dc5a2 Only use ambient light for edge lighting on patches (bug #57553). Markus Mützel <markus.muetzel@gmx.de> parents: 27992 diff changeset	3492 // edge lighting only uses ambient light
91316b5dc5a2 Only use ambient light for edge lighting on patches (bug #57553). Markus Mützel <markus.muetzel@gmx.de> parents: 27992 diff changeset	3493 float cb[4] = { 0.0f, 0.0f, 0.0f, 1.0f };
91316b5dc5a2 Only use ambient light for edge lighting on patches (bug #57553). Markus Mützel <markus.muetzel@gmx.de> parents: 27992 diff changeset	3494 m_glfcns.glMaterialfv (LIGHT_MODE, GL_SPECULAR, cb);
91316b5dc5a2 Only use ambient light for edge lighting on patches (bug #57553). Markus Mützel <markus.muetzel@gmx.de> parents: 27992 diff changeset	3495 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	3496
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3497 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3498 cb[i] = (as * ecolor(i));
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3499 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	3500 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3501 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3502
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3503 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	3504 m_glfcns.glEnable (GL_LIGHTING);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3505
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	3506 double linewidth = props.get_linewidth ();
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	3507 set_linestyle (props.get_linestyle (), false, linewidth);
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	3508 set_linewidth (linewidth);
22838 1444a65085ca Make axes corners join in printout (bug #39643) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22759 diff changeset	3509 set_linecap ("butt");
22759 39f39eb4e476 Implement "linejoin" property (bug #48387) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22755 diff changeset	3510 set_linejoin ("miter");
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3511
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3512 // NOTE: patch contour cannot be offset. Offset must occur with the
27979 cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	3513 // filled portion of the patch above. The tessellator uses
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3514 // 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	3515 // 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	3516 // not supported by glPolygonOffset which is used to do Z offsets.
28006 91316b5dc5a2 Only use ambient light for edge lighting on patches (bug #57553). Markus Mützel <markus.muetzel@gmx.de> parents: 27992 diff changeset	3517 patch_tessellator tess (this, ec_mode, el_mode, false);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3518
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3519 for (int i = 0; i < nf; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3520 {
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3521 bool is_non_planar = false;
27798 8c1cb06468db Change class of coplanar_last_idx for patch objects (bug #55895). Markus Mützel <markus.muetzel@gmx.de> parents: 27767 diff changeset	3522 if (props.coplanar_last_idx.size () > 0
8c1cb06468db Change class of coplanar_last_idx for patch objects (bug #55895). Markus Mützel <markus.muetzel@gmx.de> parents: 27767 diff changeset	3523 && props.coplanar_last_idx[i].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	3524 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	3525 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	3526 {
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3527 // 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	3528 // Draw it as a line.
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3529 bool flag = false;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3530
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3531 m_glfcns.glShadeModel ((ec_mode == INTERP \|\| el_mode == GOURAUD)
27932 b018f553fd85 maint: Use Octave coding conventions in libinterp/ Rik <rik@octave.org> parents: 27923 diff changeset	3532 ? GL_SMOOTH : GL_FLAT);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3533
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3534 // 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	3535 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	3536 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3537 if (! clip(int (f(i,j) - 1)))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3538 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3539 vertex_data::vertex_data_rep *vv
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3540 = vdata[i+j*fr].get_rep ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3541 const Matrix m = vv->coords;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3542 if (! flag)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3543 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3544 flag = true;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3545 m_glfcns.glBegin (GL_LINE_STRIP);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3546 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3547 if (ec_mode != UNIFORM)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3548 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3549 Matrix col = vv->color;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3550
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3551 if (col.numel () == 3)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3552 m_glfcns.glColor3dv (col.data ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3553 }
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3554 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	3555 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3556 else if (flag)
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 flag = false;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3559 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3560 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3561 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3562 // 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	3563 // from vertex 0 to vertex N.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3564 int j = count_f(i)-1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3565 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	3566 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3567 vertex_data::vertex_data_rep *vv
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3568 = vdata[i+j*fr].get_rep ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3569 const Matrix m = vv->coords;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3570 if (ec_mode != UNIFORM)
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 Matrix col = vv->color;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3573
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3574 if (col.numel () == 3)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3575 m_glfcns.glColor3dv (col.data ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3576 }
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3577 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	3578 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3579
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3580 if (flag)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3581 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3582 }
27979 cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	3583 else // Normal edge contour drawn with tessellator
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3584 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3585 tess.begin_polygon (false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3586 tess.begin_contour ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3587
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3588 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	3589 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3590 vertex_data::vertex_data_rep *vv
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3591 = vdata[i+j*fr].get_rep ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3592 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	3593 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3594
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3595 tess.end_contour ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3596 tess.end_polygon ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3597 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3598 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3599
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	3600 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	3601 set_linewidth (0.5f);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3602
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3603 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	3604 m_glfcns.glDisable (GL_LIGHTING);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3605 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3606 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3607 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3608 // FIXME: implement transparency
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 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3611
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3612 if (! props.marker_is ("none")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3613 && ! (props.markeredgecolor_is ("none")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3614 && props.markerfacecolor_is ("none")))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3615 {
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3616 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	3617 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	3618
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3619 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	3620 props.get_markeredgecolor_rgb ());
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3621 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	3622 props.get_markerfacecolor_rgb ());
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3623
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3624 bool has_markerfacecolor = draw_all \|\| false;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3625
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	3626 if ((mecolor.isempty () && ! props.markeredgecolor_is ("none"))
80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	3627 \|\| (mfcolor.isempty () && ! props.markerfacecolor_is ("none")))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3628 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3629 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	3630
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3631 if (mc.rows () == 1)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3632 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3633 // 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	3634 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	3635 mfcolor = mc;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3636
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	3637 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	3638 mecolor = mc;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3639 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3640 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3641 {
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	3642 if (c.isempty ())
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3643 c = props.get_color_data ().matrix_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3644 has_markerfacecolor = ((c.numel () > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3645 && (c.rows () == f.rows ()));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3646 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3647 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3648
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3649 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	3650 props.get_linewidth ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3651
25896 c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	3652 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	3653 uint8_t clip_ok = 0x40;
c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	3654
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3655 for (int i = 0; i < nf; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3656 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	3657 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3658 int idx = int (f(i,j) - 1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3659
25896 c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	3660 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	3661 & clip_mask) != clip_ok)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3662 continue;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3663
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3664 Matrix cc;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3665 if (c.numel () > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3666 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3667 cc.resize (1, 3);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3668 if (has_markerfacecolor)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3669 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	3670 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3671 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	3672 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3673
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	3674 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	3675 : Matrix ());
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	3676 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	3677 : Matrix ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3678
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3679 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	3680 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3681
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3682 end_marker ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3683 }
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3684
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3685 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3686
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3687 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3688
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3689 // 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	3690 // 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	3691
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3692 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3693
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3694 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3695 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3696
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3697 void
23433 c9fab0bc983e maint: Use convention 'int& x' for naming references. Rik <rik@octave.org> parents: 23396 diff changeset	3698 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	3699 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3700 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3701
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3702 // enable light source
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3703 m_glfcns.glEnable (m_current_light);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3704
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3705 // light position
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3706 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	3707 Matrix lpos = props.get_position ().matrix_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3708 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3709 pos[i] = lpos(i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3710 if (props.style_is ("local"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3711 pos[3] = 1;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3712 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	3713
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3714 // light color
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3715 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	3716 Matrix lcolor = props.get_color ().matrix_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3717 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3718 col[i] = lcolor(i);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3719 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	3720 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	3721
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3722 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3723
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3724 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3725
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3726 // 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	3727 // 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	3728
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3729 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3730
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3731 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3732 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3733
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3734 void
23433 c9fab0bc983e maint: Use convention 'int& x' for naming references. Rik <rik@octave.org> parents: 23396 diff changeset	3735 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	3736 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3737 draw (props.get_children ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3738 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3739
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3740 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3741 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	3742 {
21789 6afdf40be534 Implement graphics object "light" (patch #8943). mmuetzel <markus.muetzel@gmx.de> parents: 21782 diff changeset	3743 #if defined (HAVE_OPENGL)
6afdf40be534 Implement graphics object "light" (patch #8943). mmuetzel <markus.muetzel@gmx.de> parents: 21782 diff changeset	3744
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	3745 if (props.get_string ().isempty () \|\| props.color_is ("none"))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3746 return;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3747
24173 730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3748 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	3749
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3750 // Handle clipping manually when drawing text background
25951 7a507e71d922 style fixes John W. Eaton <jwe@octave.org> parents: 25260 diff changeset	3751 if (! props.is_clipping ()
25952 12d4271aed87 maint: Merge stable to default. John W. Eaton <jwe@octave.org> parents: 25896 25951 diff changeset	3752 \|\| (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	3753 {
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3754 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	3755 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	3756 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	3757 }
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3758
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3759 set_font (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3760
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3761 const Matrix bbox = props.get_extent_matrix ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3762
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3763 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	3764
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3765 m_glfcns.glEnable (GL_BLEND);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3766 m_glfcns.glEnable (GL_ALPHA_TEST);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3767 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	3768 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	3769 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	3770 props.get_pixels ().data ());
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3771 m_glfcns.glDisable (GL_ALPHA_TEST);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3772 if (! blend)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3773 m_glfcns.glDisable (GL_BLEND);
21789 6afdf40be534 Implement graphics object "light" (patch #8943). mmuetzel <markus.muetzel@gmx.de> parents: 21782 diff changeset	3774
6afdf40be534 Implement graphics object "light" (patch #8943). mmuetzel <markus.muetzel@gmx.de> parents: 21782 diff changeset	3775 #else
6afdf40be534 Implement graphics object "light" (patch #8943). mmuetzel <markus.muetzel@gmx.de> parents: 21782 diff changeset	3776
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3777 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3778
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3779 // 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	3780 // 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	3781
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3782 panic_impossible ();
21789 6afdf40be534 Implement graphics object "light" (patch #8943). mmuetzel <markus.muetzel@gmx.de> parents: 21782 diff changeset	3783
6afdf40be534 Implement graphics object "light" (patch #8943). mmuetzel <markus.muetzel@gmx.de> parents: 21782 diff changeset	3784 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3785 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3786
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3787 void
24173 730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3788 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	3789 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	3790 {
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3791 #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	3792
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3793 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	3794 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	3795
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3796 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	3797 return;
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3798
25889 2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	3799 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	3800 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	3801 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	3802
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3803 // 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	3804 m_glfcns.glMatrixMode (GL_PROJECTION);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3805 m_glfcns.glPushMatrix ();
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3806 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	3807
25889 2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	3808 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	3809 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	3810 m_glfcns.glMatrixMode (GL_MODELVIEW);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3811 m_glfcns.glPushMatrix ();
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3812 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	3813
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3814 // 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	3815 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	3816
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3817 // 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	3818 // 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	3819 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	3820
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3821 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	3822 && 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	3823 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	3824
28399 2a0e566a03e1 Don't scale text margin in printout (bug #58486) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28189 diff changeset	3825 double m = points_to_pixels (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	3826 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	3827 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	3828 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	3829 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	3830 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	3831
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3832 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	3833 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3834 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	3835
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3836 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	3837 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	3838 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	3839
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3840 m_glfcns.glBegin (GL_QUADS);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3841 m_glfcns.glVertex2d (x0, y0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3842 m_glfcns.glVertex2d (x1, y0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3843 m_glfcns.glVertex2d (x1, y1);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3844 m_glfcns.glVertex2d (x0, y1);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3845 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	3846
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3847 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	3848 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	3849 }
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3850
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3851 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	3852 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3853 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	3854
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3855 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	3856 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	3857
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3858 m_glfcns.glBegin (GL_LINE_STRIP);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3859 m_glfcns.glVertex2d (x0, y0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3860 m_glfcns.glVertex2d (x1, y0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3861 m_glfcns.glVertex2d (x1, y1);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3862 m_glfcns.glVertex2d (x0, y1);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3863 m_glfcns.glVertex2d (x0, y0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3864 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	3865
601cc3a063f5 Fix OpenGL line-stipple bug manifested as Nouveau driver crash (bug #53644) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25103 diff changeset	3866 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	3867 }
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3868
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3869 // Restore previous coordinate system
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3870 m_glfcns.glPopMatrix();
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3871 m_glfcns.glMatrixMode (GL_PROJECTION);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3872 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	3873
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3874 #else
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3875
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3876 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	3877 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	3878
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3879 // 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	3880 // 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	3881
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3882 panic_impossible ();
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3883
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3884 #endif
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3885 }
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3886
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3887 void
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3888 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	3889 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3890 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3891
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3892 octave_value cdata = props.get_color_data ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3893 dim_vector dv (cdata.dims ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3894 int h = dv(0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3895 int w = dv(1);
26728 f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	3896 double x0, x1, y0, y1;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3897
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3898 Matrix x = props.get_xdata ().matrix_value ();
26728 f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	3899 double dx = 1.0;
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	3900 if (w > 1)
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	3901 dx = (x(1) - x(0)) / (w - 1);
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	3902
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	3903 x0 = x(0)-dx/2;
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	3904 x1 = x(1)+dx/2;
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	3905
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3906 Matrix y = props.get_ydata ().matrix_value ();
26728 f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	3907 double dy = 1.0;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3908 if (h > 1)
26728 f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	3909 dy = (y(1) - y(0)) / (h - 1);
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	3910
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	3911 y0 = y(0)-dy/2;
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	3912 y1 = y(1)+dy/2;
22331 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 // Expect RGB data
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3915 if (dv.ndims () == 3 && dv(2) == 3)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3916 {
26862 ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	3917 opengl_texture tex = opengl_texture::create (m_glfcns, cdata);
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	3918 if (tex.is_valid ())
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	3919 {
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	3920 m_glfcns.glColor4d (1.0, 1.0, 1.0, 1.0);
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	3921
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	3922 m_glfcns.glEnable (GL_TEXTURE_2D);
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	3923
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	3924 m_glfcns.glBegin (GL_QUADS);
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	3925
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	3926 tex.tex_coord (0.0, 0.0);
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	3927 m_glfcns.glVertex3d (x0, y0, 0.0);
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	3928
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	3929 tex.tex_coord (1.0, 0.0);
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	3930 m_glfcns.glVertex3d (x1, y0, 0.0);
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	3931
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	3932 tex.tex_coord (1.0, 1.0);
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	3933 m_glfcns.glVertex3d (x1, y1, 0.0);
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	3934
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	3935 tex.tex_coord (0.0, 1.0);
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	3936 m_glfcns.glVertex3d (x0, y1, 0.0);
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	3937
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	3938 m_glfcns.glEnd ();
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	3939 m_glfcns.glDisable (GL_TEXTURE_2D);
ea4a36fd48b6 Warn when image can't be rendered due to OpenGL library limitation (bug #54680) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26858 diff changeset	3940 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3941 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3942 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3943 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	3944
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3945 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3946
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3947 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3948
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3949 // 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	3950 // 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	3951
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3952 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3953
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3954 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3955 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3956
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	3957 void opengl_renderer::draw (const Matrix& hlist, bool toplevel)
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	3958 {
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	3959 int len = hlist.numel ();
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	3960
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	3961 gh_manager& gh_mgr = __get_gh_manager__ ("opengl_renderer::draw");
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	3962
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	3963 for (int i = len-1; i >= 0; i--)
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	3964 {
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	3965 graphics_object obj = gh_mgr.get_object (hlist(i));
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	3966
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	3967 if (obj)
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	3968 draw (obj, toplevel);
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	3969 }
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	3970 }
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	3971
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3972 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3973 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	3974 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3975 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3976
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3977 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	3978
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3979 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3980
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3981 octave_unused_parameter (w);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3982 octave_unused_parameter (h);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3983
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3984 // 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	3985 // 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	3986
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3987 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3988
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3989 #endif
22331 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
25889 2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	3992 Matrix
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	3993 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	3994 {
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	3995 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	3996
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	3997 #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	3998 #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	3999 GLint vp[4];
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4000 #else
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4001 int vp[4];
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4002 #endif
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4003
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4004 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	4005
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4006 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	4007 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	4008
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4009 #else
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4010
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4011 // 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	4012 // 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	4013
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4014 panic_impossible ();
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4015
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4016 #endif
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4017
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4018 return retval;
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4019 }
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4020
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4021 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4022 opengl_renderer::set_color (const Matrix& c)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4023 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4024 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4025
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4026 m_glfcns.glColor3dv (c.data ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4027
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	4028 if (! c.isempty ())
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	4029 txt_renderer.set_color (c);
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4030
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4031 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4032
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4033 octave_unused_parameter (c);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4034
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4035 // 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	4036 // 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	4037
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4038 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4039
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4040 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4041 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4042
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4043 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4044 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	4045 {
26858 0adb232f93b9 Implement axes and text "fontsmoothing" property (bug #55833). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26728 diff changeset	4046 bool do_anti_alias = props.get ("fontsmoothing").string_value () == "on";
0adb232f93b9 Implement axes and text "fontsmoothing" property (bug #55833). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26728 diff changeset	4047 txt_renderer.set_anti_aliasing (do_anti_alias);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4048 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	4049 props.get ("fontweight").string_value (),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4050 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	4051 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	4052 * m_devpixratio);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4053 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4054
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4055 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4056 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	4057 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4058 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4059
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4060 if (on)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4061 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4062 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	4063 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	4064 m_glfcns.glPolygonOffset (offset, offset);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4065 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4066 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4067 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4068 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	4069 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	4070 }
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4071
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4072 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4073
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4074 octave_unused_parameter (on);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4075 octave_unused_parameter (offset);
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::set_linewidth (float w)
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)
28189 5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	4089 // Measure LineWidth in points. See bug #53056.
5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	4090 m_glfcns.glLineWidth (points_to_pixels (w) * m_devpixratio);
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 (w);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4095
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4096 // 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	4097 // 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	4098
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4099 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4100
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4101 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4102 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4103
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4104 void
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	4105 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	4106 double linewidth)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4107 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4108 #if defined (HAVE_OPENGL)
28189 5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	4109 // Measure LineWidth in points. See bug #53056.
5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	4110 int factor = math::round (points_to_pixels (linewidth) * m_devpixratio);
26564 c40b3b671513 Fixed dash pattern when figure "__device_pixel_ratio__" is not 1 (bug #55484) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26468 diff changeset	4111 if (factor < 1)
c40b3b671513 Fixed dash pattern when figure "__device_pixel_ratio__" is not 1 (bug #55484) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26468 diff changeset	4112 factor = 1;
c40b3b671513 Fixed dash pattern when figure "__device_pixel_ratio__" is not 1 (bug #55484) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26468 diff changeset	4113
c40b3b671513 Fixed dash pattern when figure "__device_pixel_ratio__" is not 1 (bug #55484) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26468 diff changeset	4114 uint16_t pattern = 0xFFFF;
c40b3b671513 Fixed dash pattern when figure "__device_pixel_ratio__" is not 1 (bug #55484) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26468 diff changeset	4115
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4116 bool solid = false;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4117
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4118 if (s == "-")
26564 c40b3b671513 Fixed dash pattern when figure "__device_pixel_ratio__" is not 1 (bug #55484) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26468 diff changeset	4119 solid = true;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4120 else if (s == ":")
26688 4b4881ff0dc9 Improve appearance of patterned lines at small LineWidths. Rik <rik@octave.org> parents: 26682 diff changeset	4121 {
4b4881ff0dc9 Improve appearance of patterned lines at small LineWidths. Rik <rik@octave.org> parents: 26682 diff changeset	4122 if (factor > 1)
4b4881ff0dc9 Improve appearance of patterned lines at small LineWidths. Rik <rik@octave.org> parents: 26682 diff changeset	4123 pattern = 0x5555;
4b4881ff0dc9 Improve appearance of patterned lines at small LineWidths. Rik <rik@octave.org> parents: 26682 diff changeset	4124 else
4b4881ff0dc9 Improve appearance of patterned lines at small LineWidths. Rik <rik@octave.org> parents: 26682 diff changeset	4125 pattern = 0x1111;
4b4881ff0dc9 Improve appearance of patterned lines at small LineWidths. Rik <rik@octave.org> parents: 26682 diff changeset	4126 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4127 else if (s == "--")
27932 b018f553fd85 maint: Use Octave coding conventions in libinterp/ Rik <rik@octave.org> parents: 27923 diff changeset	4128 {
26688 4b4881ff0dc9 Improve appearance of patterned lines at small LineWidths. Rik <rik@octave.org> parents: 26682 diff changeset	4129 if (factor > 1)
4b4881ff0dc9 Improve appearance of patterned lines at small LineWidths. Rik <rik@octave.org> parents: 26682 diff changeset	4130 pattern = 0x0F0F;
4b4881ff0dc9 Improve appearance of patterned lines at small LineWidths. Rik <rik@octave.org> parents: 26682 diff changeset	4131 else
4b4881ff0dc9 Improve appearance of patterned lines at small LineWidths. Rik <rik@octave.org> parents: 26682 diff changeset	4132 pattern = 0x01FF;
27932 b018f553fd85 maint: Use Octave coding conventions in libinterp/ Rik <rik@octave.org> parents: 27923 diff changeset	4133 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4134 else if (s == "-.")
26688 4b4881ff0dc9 Improve appearance of patterned lines at small LineWidths. Rik <rik@octave.org> parents: 26682 diff changeset	4135 {
4b4881ff0dc9 Improve appearance of patterned lines at small LineWidths. Rik <rik@octave.org> parents: 26682 diff changeset	4136 if (factor > 1)
4b4881ff0dc9 Improve appearance of patterned lines at small LineWidths. Rik <rik@octave.org> parents: 26682 diff changeset	4137 pattern = 0x6F6F;
4b4881ff0dc9 Improve appearance of patterned lines at small LineWidths. Rik <rik@octave.org> parents: 26682 diff changeset	4138 else
4b4881ff0dc9 Improve appearance of patterned lines at small LineWidths. Rik <rik@octave.org> parents: 26682 diff changeset	4139 pattern = 0x18FF;
4b4881ff0dc9 Improve appearance of patterned lines at small LineWidths. Rik <rik@octave.org> parents: 26682 diff changeset	4140 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4141 else
26564 c40b3b671513 Fixed dash pattern when figure "__device_pixel_ratio__" is not 1 (bug #55484) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26468 diff changeset	4142 pattern = 0x0000;
c40b3b671513 Fixed dash pattern when figure "__device_pixel_ratio__" is not 1 (bug #55484) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26468 diff changeset	4143
c40b3b671513 Fixed dash pattern when figure "__device_pixel_ratio__" is not 1 (bug #55484) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26468 diff changeset	4144 m_glfcns.glLineStipple (factor, pattern);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4145
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4146 if (solid && ! use_stipple)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4147 m_glfcns.glDisable (GL_LINE_STIPPLE);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4148 else
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4149 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	4150
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4151 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4152
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4153 octave_unused_parameter (s);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4154 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	4155 octave_unused_parameter (linewidth);
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 // 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	4158 // 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	4159
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4160 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4161
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4162 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4163 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4164
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4165 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4166 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	4167 double z1, double z2)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4168 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4169 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4170
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4171 double dx = (x2-x1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4172 double dy = (y2-y1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4173 double dz = (z2-z1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4174
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4175 x1 -= 0.001dx; x2 += 0.001dx;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4176 y1 -= 0.001dy; y2 += 0.001dy;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4177 z1 -= 0.001dz; z2 += 0.001dz;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4178
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4179 ColumnVector p (4, 0.0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4180
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4181 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	4182 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	4183 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	4184 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	4185 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	4186 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	4187 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	4188 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	4189 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	4190 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	4191 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	4192 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	4193
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4194 xmin = x1; xmax = x2;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4195 ymin = y1; ymax = y2;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4196 zmin = z1; zmax = z2;
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4197
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4198 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4199
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4200 octave_unused_parameter (x1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4201 octave_unused_parameter (x2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4202 octave_unused_parameter (y1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4203 octave_unused_parameter (y2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4204 octave_unused_parameter (z1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4205 octave_unused_parameter (z2);
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 // 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	4208 // 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	4209
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4210 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4211
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4212 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4213 }
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 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4216 opengl_renderer::set_clipping (bool enable)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4217 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4218 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4219
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4220 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	4221
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4222 if (enable != has_clipping)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4223 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4224 if (enable)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4225 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	4226 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	4227 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4228 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	4229 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	4230 }
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4231
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4232 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4233
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4234 octave_unused_parameter (enable);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4235
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4236 // 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	4237 // 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	4238
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4239 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4240
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4241 #endif
22331 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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4244 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4245 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	4246 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4247 #if defined (HAVE_OPENGL)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4248 m_glfcns.glMatrixMode (GL_PROJECTION);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4249 m_glfcns.glPushMatrix ();
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4250 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	4251
25889 2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4252 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	4253 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	4254 m_glfcns.glMatrixMode (GL_MODELVIEW);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4255 m_glfcns.glPushMatrix ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4256
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4257 set_clipping (false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4258 set_linewidth (width);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4259
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4260 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	4261 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	4262
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4263 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4264
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4265 octave_unused_parameter (m);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4266 octave_unused_parameter (size);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4267 octave_unused_parameter (width);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4268
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4269 // 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	4270 // 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	4271
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4272 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4273
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4274 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4275 }
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 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4278 opengl_renderer::end_marker (void)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4279 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4280 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4281
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4282 m_glfcns.glDeleteLists (marker_id, 1);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4283 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	4284
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4285 m_glfcns.glMatrixMode (GL_MODELVIEW);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4286 m_glfcns.glPopMatrix ();
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4287 m_glfcns.glMatrixMode (GL_PROJECTION);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4288 m_glfcns.glPopMatrix ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4289 set_linewidth (0.5f);
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4290
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4291 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4292
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4293 // 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	4294 // 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	4295
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4296 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4297
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4298 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4299 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4300
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4301 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4302 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	4303 const Matrix& lc, const Matrix& fc)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4304 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4305 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4306
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4307 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	4308
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4309 m_glfcns.glLoadIdentity ();
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4310 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	4311
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4312 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	4313 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4314 m_glfcns.glColor3dv (fc.data ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4315 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	4316 m_glfcns.glCallList (filled_marker_id);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4317 if (lc.numel () > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4318 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4319 m_glfcns.glColor3dv (lc.data ());
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4320 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	4321 m_glfcns.glEdgeFlag (GL_TRUE);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4322 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	4323 m_glfcns.glCallList (filled_marker_id);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4324 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	4325 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4326 set_polygon_offset (false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4327 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4328 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	4329 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4330 m_glfcns.glColor3dv (lc.data ());
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4331 m_glfcns.glCallList (marker_id);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4332 }
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4333
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4334 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4335
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4336 octave_unused_parameter (x);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4337 octave_unused_parameter (y);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4338 octave_unused_parameter (z);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4339 octave_unused_parameter (lc);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4340 octave_unused_parameter (fc);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4341
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4342 // 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	4343 // 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	4344
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4345 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4346
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4347 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4348 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4349
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4350 void
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4351 opengl_renderer::init_maxlights (void)
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4352 {
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4353 #if defined (HAVE_OPENGL)
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4354
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4355 // 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	4356 if (m_max_lights == 0)
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4357 {
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4358 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	4359 {
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4360 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	4361 if (m_glfcns.glGetError ())
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4362 break;
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4363 }
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4364 }
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4365
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4366 #else
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 // 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	4369 // 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	4370
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4371 panic_impossible ();
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4372
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4373 #endif
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4374 }
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4375
26417 4166610a41bc do not include private file oct-opengl.h in public headers (bug #55277) Mike Miller <mtmiller@octave.org> parents: 26407 diff changeset	4376 std::string
4166610a41bc do not include private file oct-opengl.h in public headers (bug #55277) Mike Miller <mtmiller@octave.org> parents: 26407 diff changeset	4377 opengl_renderer::get_string (unsigned int id) const
4166610a41bc do not include private file oct-opengl.h in public headers (bug #55277) Mike Miller <mtmiller@octave.org> parents: 26407 diff changeset	4378 {
25864 baeb93e9febc allow building without OpenGL to work again John W. Eaton <jwe@octave.org> parents: 25863 diff changeset	4379 #if defined (HAVE_OPENGL)
baeb93e9febc allow building without OpenGL to work again John W. Eaton <jwe@octave.org> parents: 25863 diff changeset	4380
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4381 // 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	4382 // 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	4383 // better way?
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4384
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4385 std::ostringstream buf;
25864 baeb93e9febc allow building without OpenGL to work again John W. Eaton <jwe@octave.org> parents: 25863 diff changeset	4386
26417 4166610a41bc do not include private file oct-opengl.h in public headers (bug #55277) Mike Miller <mtmiller@octave.org> parents: 26407 diff changeset	4387 buf << m_glfcns.glGetString (static_cast<GLenum> (id));
25864 baeb93e9febc allow building without OpenGL to work again John W. Eaton <jwe@octave.org> parents: 25863 diff changeset	4388
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4389 return std::string (buf.str ());
26417 4166610a41bc do not include private file oct-opengl.h in public headers (bug #55277) Mike Miller <mtmiller@octave.org> parents: 26407 diff changeset	4390
4166610a41bc do not include private file oct-opengl.h in public headers (bug #55277) Mike Miller <mtmiller@octave.org> parents: 26407 diff changeset	4391 #else
4166610a41bc do not include private file oct-opengl.h in public headers (bug #55277) Mike Miller <mtmiller@octave.org> parents: 26407 diff changeset	4392
4166610a41bc do not include private file oct-opengl.h in public headers (bug #55277) Mike Miller <mtmiller@octave.org> parents: 26407 diff changeset	4393 octave_unused_parameter (id);
4166610a41bc do not include private file oct-opengl.h in public headers (bug #55277) Mike Miller <mtmiller@octave.org> parents: 26407 diff changeset	4394
4166610a41bc do not include private file oct-opengl.h in public headers (bug #55277) Mike Miller <mtmiller@octave.org> parents: 26407 diff changeset	4395 // This shouldn't happen because construction of opengl_renderer
4166610a41bc do not include private file oct-opengl.h in public headers (bug #55277) Mike Miller <mtmiller@octave.org> parents: 26407 diff changeset	4396 // objects is supposed to be impossible if OpenGL is not available.
4166610a41bc do not include private file oct-opengl.h in public headers (bug #55277) Mike Miller <mtmiller@octave.org> parents: 26407 diff changeset	4397
4166610a41bc do not include private file oct-opengl.h in public headers (bug #55277) Mike Miller <mtmiller@octave.org> parents: 26407 diff changeset	4398 panic_impossible ();
4166610a41bc do not include private file oct-opengl.h in public headers (bug #55277) Mike Miller <mtmiller@octave.org> parents: 26407 diff changeset	4399 return std::string ();
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4400
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4401 #endif
26417 4166610a41bc do not include private file oct-opengl.h in public headers (bug #55277) Mike Miller <mtmiller@octave.org> parents: 26407 diff changeset	4402 }
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4403
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4404 void
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4405 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	4406 {
21797 e5f083f9704e eliminate some duplicate code in gl-render.cc John W. Eaton <jwe@octave.org> parents: 21790 diff changeset	4407 #if defined (HAVE_OPENGL)
e5f083f9704e eliminate some duplicate code in gl-render.cc John W. Eaton <jwe@octave.org> parents: 21790 diff changeset	4408
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4409 double x = n(j,i,0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4410 double y = n(j,i,1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4411 double z = n(j,i,2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4412
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4413 double d = sqrt (xx + yy + z*z);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4414
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4415 double dir = 1.0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4416
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4417 if (bfl_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4418 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	4419 ? ((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	4420
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4421 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	4422
e5f083f9704e eliminate some duplicate code in gl-render.cc John W. Eaton <jwe@octave.org> parents: 21790 diff changeset	4423 #else
e5f083f9704e eliminate some duplicate code in gl-render.cc John W. Eaton <jwe@octave.org> parents: 21790 diff changeset	4424
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4425 octave_unused_parameter (bfl_mode);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4426 octave_unused_parameter (n);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4427 octave_unused_parameter (j);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4428 octave_unused_parameter (i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4429
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4430 // 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	4431 // 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	4432
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4433 panic_impossible ();
21797 e5f083f9704e eliminate some duplicate code in gl-render.cc John W. Eaton <jwe@octave.org> parents: 21790 diff changeset	4434
e5f083f9704e eliminate some duplicate code in gl-render.cc John W. Eaton <jwe@octave.org> parents: 21790 diff changeset	4435 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4436 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4437
28189 5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	4438 double
5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	4439 opengl_renderer::points_to_pixels (const double val) const
5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	4440 {
5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	4441 gh_manager& gh_mgr = __get_gh_manager__ ("opengl_renderer::points_to_pixels");
5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	4442
5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	4443 // FIXME: Does making this static cause problems if figure is moved to a
5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	4444 // 2nd monitor with a different value for "screenpixelsperinch"?
5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	4445 static const double pix_per_pts =
5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	4446 gh_mgr.get_object (0).get ("screenpixelsperinch").double_value () / 72.0;
5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	4447
5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	4448 double retval = val;
5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	4449
5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	4450 if (! m_printing)
5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	4451 retval *= pix_per_pts;
5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	4452
5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	4453 return retval;
5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	4454 }
5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	4455
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4456 unsigned int
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4457 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	4458 bool filled) const
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4459 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4460 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4461
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4462 char c = marker[0];
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4463
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4464 if (filled && (c == '+' \|\| c == 'x' \|\| c == '*' \|\| c == '.'))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4465 return 0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4466
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4467 unsigned int ID = m_glfcns.glGenLists (1);
26720 9a678e0de658 Measure LineWidth in points, not pixels, for Matlab compatibility (bug #53056). Rik <rik@octave.org> parents: 26688 diff changeset	4468
9a678e0de658 Measure LineWidth in points, not pixels, for Matlab compatibility (bug #53056). Rik <rik@octave.org> parents: 26688 diff changeset	4469 // FIXME: See bug #53056 (measure LineWidth in points).
28189 5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	4470 double sz = points_to_pixels (size);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4471
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4472 // constants for the * marker
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4473 const double sqrt2d4 = 0.35355339059327;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4474 double tt = sz*sqrt2d4;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4475
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4476 m_glfcns.glNewList (ID, GL_COMPILE);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4477
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4478 switch (marker[0])
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	4479 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4480 case '+':
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4481 m_glfcns.glBegin (GL_LINES);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4482 m_glfcns.glVertex2d (-sz/2, 0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4483 m_glfcns.glVertex2d (sz/2, 0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4484 m_glfcns.glVertex2d (0, -sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4485 m_glfcns.glVertex2d (0, sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4486 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4487 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4488 case 'x':
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4489 m_glfcns.glBegin (GL_LINES);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4490 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	4491 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	4492 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	4493 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	4494 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4495 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4496 case '*':
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4497 m_glfcns.glBegin (GL_LINES);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4498 m_glfcns.glVertex2d (-sz/2, 0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4499 m_glfcns.glVertex2d (sz/2, 0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4500 m_glfcns.glVertex2d (0, -sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4501 m_glfcns.glVertex2d (0, sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4502 m_glfcns.glVertex2d (-tt, -tt);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4503 m_glfcns.glVertex2d (+tt, +tt);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4504 m_glfcns.glVertex2d (-tt, +tt);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4505 m_glfcns.glVertex2d (+tt, -tt);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4506 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4507 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4508 case '.':
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 // 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	4511
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4512 // 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	4513 if (sz > 0 && sz < 3)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4514 sz = 3;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4515
25688 b2917b7858ba maint: Use Octave convention for spacing of C++ cast statements. Rik <rik@octave.org> parents: 25438 diff changeset	4516 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	4517 if (! (div % 2))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4518 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	4519 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	4520 double ang_step = M_PI / div;
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 m_glfcns.glBegin (GL_POLYGON);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4523 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	4524 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	4525 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4526 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4527 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4528 case 's':
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4529 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	4530 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	4531 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	4532 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	4533 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	4534 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4535 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4536 case 'o':
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4537 {
25688 b2917b7858ba maint: Use Octave convention for spacing of C++ cast statements. Rik <rik@octave.org> parents: 25438 diff changeset	4538 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	4539 if (! (div % 2))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4540 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	4541 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	4542 double ang_step = M_PI / div;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4543
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4544 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	4545 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	4546 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	4547 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4548 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4549 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4550 case 'd':
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4551 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	4552 m_glfcns.glVertex2d (0, -sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4553 m_glfcns.glVertex2d (sz/2, 0);
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 (-sz/2, 0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4556 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4557 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4558 case 'v':
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4559 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	4560 m_glfcns.glVertex2d (0, sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4561 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	4562 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	4563 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4564 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4565 case '^':
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4566 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	4567 m_glfcns.glVertex2d (0, -sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4568 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	4569 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	4570 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4571 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4572 case '>':
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4573 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	4574 m_glfcns.glVertex2d (sz/2, 0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4575 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	4576 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	4577 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4578 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4579 case '<':
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4580 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	4581 m_glfcns.glVertex2d (-sz/2, 0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4582 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	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.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4585 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4586 case 'p':
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4587 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4588 double ang, r, dr;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4589 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	4590
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4591 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	4592 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	4593 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4594 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	4595 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	4596 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	4597 }
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4598 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4599 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4600 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4601 case 'h':
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4602 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4603 double ang, r, dr;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4604 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	4605
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4606 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	4607 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	4608 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4609 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	4610 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	4611 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	4612 }
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4613 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4614 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4615 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4616 default:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4617 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	4618 break;
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	4619 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4620
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4621 m_glfcns.glEndList ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4622
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4623 return ID;
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4624
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4625 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4626
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4627 octave_unused_parameter (marker);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4628 octave_unused_parameter (size);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4629 octave_unused_parameter (filled);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4630
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4631 // 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	4632 // 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	4633
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4634 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4635
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4636 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4637 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4638
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4639 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4640 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	4641 uint8NDArray& pixels,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4642 Matrix& bbox,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4643 int halign, int valign, double rotation)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4644 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4645 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	4646 rotation, interpreter);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4647 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4648
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4649 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4650 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	4651 std::list<text_renderer::string>& lst,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4652 Matrix& bbox,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4653 int halign, int valign, double rotation)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4654 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4655 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	4656 rotation, interpreter);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4657 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4658
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4659 Matrix
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4660 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	4661 double x, double y, double z,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4662 int halign, int valign, double rotation)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4663 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4664 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4665
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4666 Matrix bbox (1, 4, 0.0);
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 if (txt.empty ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4669 return bbox;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4670
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4671 if (txt_renderer.ok ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4672 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4673 uint8NDArray pixels;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4674 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	4675
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4676 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	4677
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4678 m_glfcns.glEnable (GL_BLEND);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4679 m_glfcns.glEnable (GL_ALPHA_TEST);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4680 m_glfcns.glRasterPos3d (x, y, z);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4681 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	4682 m_glfcns.glDrawPixels (bbox(2), bbox(3),
27932 b018f553fd85 maint: Use Octave coding conventions in libinterp/ Rik <rik@octave.org> parents: 27923 diff changeset	4683 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	4684 m_glfcns.glDisable (GL_ALPHA_TEST);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4685
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4686 if (! blend)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4687 m_glfcns.glDisable (GL_BLEND);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4688 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4689
21209 67d2965af0b5 revamp text rendering classes John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	4690 return bbox;
67d2965af0b5 revamp text rendering classes John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	4691
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4692 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4693
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4694 octave_unused_parameter (txt);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4695 octave_unused_parameter (x);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4696 octave_unused_parameter (y);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4697 octave_unused_parameter (z);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4698 octave_unused_parameter (halign);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4699 octave_unused_parameter (valign);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4700 octave_unused_parameter (rotation);
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 // 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	4703 // 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	4704
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4705 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4706
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4707 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4708 }
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	4709 }

Mercurial > octave

annotate libinterp/corefcn/gl-render.cc @ 28399:2a0e566a03e1 stable