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

annotate libinterp/corefcn/gl-render.cc @ 30121:5c9f5353eef3

maint: use "m_" prefix for member variables in file gl-render.cc * gl-render.h: Order class sections according to Octave convention. * gl-render.cc: Use "m_" prefix for member variables in classes opengl_tesselator, patch_tesselator. Wrap long lines to < 80 characters where feasible.

author	Rik <rik@octave.org>
date	Mon, 06 Sep 2021 10:17:24 -0700
parents	805357e6b058
children	20fd3c03fd74

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 //
29358 0a5b15007766 update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 28558 diff changeset	3 // Copyright (C) 2008-2021 The Octave Project Developers
27923 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
28763 b8e9e012bb21 Improve rendering issues due to small distance between clipping plains (bug #58956). Markus Mützel <markus.muetzel@gmx.de> parents: 28559 diff changeset	30 #include <limits>
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	31 #include <memory>
25438 cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25423 diff changeset	32 #include <sstream>
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	33
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21691 diff changeset	34 #if defined (HAVE_WINDOWS_H)
21200 fcac5dbbf9ed maint: Indent #ifdef blocks in libinterp. Rik <rik@octave.org> parents: 21198 diff changeset	35 # define WIN32_LEAN_AND_MEAN
fcac5dbbf9ed maint: Indent #ifdef blocks in libinterp. Rik <rik@octave.org> parents: 21198 diff changeset	36 # 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	37 #endif
bd96c2efd4fe move include statements for OpenGL headers to a single file John W. Eaton <jwe@octave.org> parents: 21115 diff changeset	38
23479 06bf3a0b08bf maint: Use "" instead of <> for our own include files. John W. Eaton <jwe@octave.org> parents: 23450 diff changeset	39 #include "lo-mappers.h"
8377 25bc2d31e1bf improve OCTAVE_LOCAL_BUFFER Jaroslav Hajek <highegg@gmail.com> parents: 8263 diff changeset	40 #include "oct-locbuf.h"
21115 629643522cc0 include errwarn.h in all files that use gripe_disabled_feature John W. Eaton <jwe@octave.org> parents: 21109 diff changeset	41
629643522cc0 include errwarn.h in all files that use gripe_disabled_feature John W. Eaton <jwe@octave.org> parents: 21109 diff changeset	42 #include "errwarn.h"
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	43 #include "gl-render.h"
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	44 #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	45 #include "oct-opengl.h"
21209 67d2965af0b5 revamp text rendering classes John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	46 #include "text-renderer.h"
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	47
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	48 namespace octave
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	49 {
24725 edef866fba7b * gl-render.cc: Fix compilation error when HAVE_OPENGL is not defined. John W. Eaton <jwe@octave.org> parents: 24722 diff changeset	50 #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	51
24722 af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	52 static int
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	53 next_power_of_2 (int n)
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	54 {
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	55 int m = 1;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	56
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	57 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	58 m <<= 1;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	59
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	60 return m;
af6c1ed60581 avoid splitting namespace blocks unnecessarily John W. Eaton <jwe@octave.org> parents: 24634 diff changeset	61 }
22393 026067ffcf66 fix build with minimal dependencies John W. Eaton <jwe@octave.org> parents: 22391 diff changeset	62
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	63 #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	64
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	65 // Use symbolic names for axes
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	66 enum
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	67 {
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	68 X_AXIS,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	69 Y_AXIS,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	70 Z_AXIS
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	71 };
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	72
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	73 // Use symbolic names for color mode
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	74 enum
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	75 {
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	76 UNIFORM,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	77 FLAT,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	78 INTERP,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	79 TEXTURE
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	80 };
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	81
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	82 // Use symbolic names for lighting
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	83 enum
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	84 {
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	85 NONE,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	86 //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	87 GOURAUD = 2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	88 };
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	89
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	90 // Win32 API requires the CALLBACK attributes for
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	91 // 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	92 // other platforms.
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21691 diff changeset	93 #if ! defined (CALLBACK)
21200 fcac5dbbf9ed maint: Indent #ifdef blocks in libinterp. Rik <rik@octave.org> parents: 21198 diff changeset	94 # 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	95 #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	96
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	97 class opengl_texture
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	98 {
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	99 private:
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	100
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	101 class texture_rep
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	102 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	103 public:
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	104
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	105 texture_rep (opengl_functions& glfcns)
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	106 : m_glfcns (glfcns), m_id (), m_w (), m_h (), m_tw (), m_th (),
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	107 m_tx (), m_ty (), m_valid (false)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	108 { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	109
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	110 texture_rep (opengl_functions& glfcns, GLuint id, int w, int h,
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	111 int tw, int th)
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	112 : m_glfcns (glfcns), m_id (id), m_w (w), m_h (h), m_tw (tw), m_th (th),
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	113 m_tx (double(m_w)/m_tw), m_ty (double(m_h)/m_th), m_valid (true)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	114 { }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	115
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	116 ~texture_rep (void)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	117 {
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	118 if (m_valid)
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	119 m_glfcns.glDeleteTextures (1, &m_id);
22331 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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	122 void bind (int mode) const
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	123 {
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	124 if (m_valid)
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	125 m_glfcns.glBindTexture (mode, m_id);
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	126 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	127
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	128 void tex_coord (double q, double r) const
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	129 {
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	130 if (m_valid)
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	131 m_glfcns.glTexCoord2d (qm_tx, rm_ty);
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	132 }
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	133
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	134 opengl_functions& m_glfcns;
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	135 GLuint m_id;
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	136 int m_w, m_h;
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	137 int m_tw, m_th;
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	138 double m_tx, m_ty;
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	139 bool m_valid;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	140 };
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	141
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	142 public:
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	143
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	144 opengl_texture (opengl_functions& glfcns)
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	145 : m_rep (new texture_rep (glfcns))
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	146 { }
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	147
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	148 opengl_texture (opengl_functions& glfcns, GLuint id, int w, int h,
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	149 int tw, int th)
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	150 : m_rep (new texture_rep (glfcns, id, w, h, tw, th))
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	151 { }
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	152
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	153 opengl_texture (const opengl_texture&) = default;
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	154
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	155 ~opengl_texture (void) = default;
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	156
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	157 opengl_texture& operator = (const opengl_texture&) = default;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	158
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	159 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	160 const octave_value& data);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	161
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	162 void bind (int mode = GL_TEXTURE_2D) const { m_rep->bind (mode); }
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	163
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	164 void tex_coord (double q, double r) const { m_rep->tex_coord (q, r); }
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	165
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	166 bool is_valid (void) const { return m_rep->m_valid; }
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	167
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	168 private:
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	169
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	170 opengl_texture (const std::shared_ptr<texture_rep>& new_rep)
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	171 : m_rep (new_rep)
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	172 { }
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	173
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	174 std::shared_ptr<texture_rep> m_rep;
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	175 };
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	176
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	177 opengl_texture
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	178 opengl_texture::create (opengl_functions& glfcns, const octave_value& data)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	179 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	180 opengl_texture retval (glfcns);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	181
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	182 dim_vector dv (data.dims ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	183
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	184 // Expect RGB data
29433 8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	185 if (dv.ndims () == 3 && (dv(2) == 3 \|\| dv(2) == 4))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	186 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	187 // FIXME: dim_vectors hold octave_idx_type values.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	188 // Should we check for dimensions larger than intmax?
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	189 int h, w, tw, th;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	190 h = dv(0), w = dv(1);
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	191
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	192 // 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	193 // 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	194 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	195 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	196 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	197 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	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 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	200 {
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 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	202 "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	203 "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	204 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	205 }
26995 ab5bfee22d18 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 26862 diff changeset	206
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	207 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	208 }
26995 ab5bfee22d18 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 26862 diff changeset	209
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	210 GLuint id;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	211 bool ok = true;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	212
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	213 tw = next_power_of_2 (w);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	214 th = next_power_of_2 (h);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	215
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	216 glfcns.glGenTextures (1, &id);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	217 glfcns.glBindTexture (GL_TEXTURE_2D, id);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	218
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	219 if (data.is_double_type ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	220 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	221 const NDArray xdata = data.array_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	222
26728 f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	223 OCTAVE_LOCAL_BUFFER (GLfloat, a, (3twth));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	224
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	225 for (int i = 0; i < h; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	226 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	227 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	228 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	229 a[idx] = xdata(i,j,0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	230 a[idx+1] = xdata(i,j,1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	231 a[idx+2] = xdata(i,j,2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	232 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	233 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	234
26728 f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	235 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	236 GL_FLOAT, a);
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	237 }
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	238
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	239 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	240 {
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	241 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	242
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	243 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	244
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	245 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	246 {
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	247 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	248 {
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	249 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	250 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	251 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	252 }
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
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	255 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	256 GL_FLOAT, a);
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	257 }
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	258 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	259 {
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	260 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	261
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	262 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	263
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	264 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	265 {
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	266 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	267 {
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	268 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	269 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	270 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	271 }
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
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	274 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	275 GL_RGB, GL_UNSIGNED_SHORT, a);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	276 }
29433 8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	277 else if (data.is_uint8_type () && dv(2) == 3)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	278 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	279 const uint8NDArray xdata = data.uint8_array_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	280
26728 f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	281 OCTAVE_LOCAL_BUFFER (GLubyte, a, (3twth));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	282
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	283 for (int i = 0; i < h; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	284 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	285 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	286 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	287 a[idx] = xdata(i,j,0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	288 a[idx+1] = xdata(i,j,1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	289 a[idx+2] = xdata(i,j,2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	290 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	291 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	292
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	293 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	294 GL_RGB, GL_UNSIGNED_BYTE, a);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	295 }
29433 8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	296 else if (data.is_uint8_type () && dv(2) == 4)
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	297 {
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	298 const uint8NDArray xdata = data.uint8_array_value ();
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	299
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	300 OCTAVE_LOCAL_BUFFER (GLubyte, a, (4twth));
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	301
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	302 for (int i = 0; i < h; i++)
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	303 {
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	304 for (int j = 0, idx = itw4; j < w; j++, idx += 4)
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	305 {
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	306 a[idx] = xdata(i,j,0);
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	307 a[idx+1] = xdata(i,j,1);
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	308 a[idx+2] = xdata(i,j,2);
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	309 a[idx+3] = xdata(i,j,3);
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	310 }
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	311 }
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	312
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	313 glfcns.glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA, tw, th, 0,
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	314 GL_RGBA, GL_UNSIGNED_BYTE, a);
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	315 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	316 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	317 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	318 ok = false;
26728 f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	319 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	320 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	321
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	322 if (ok)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	323 {
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	324 glfcns.glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	325 GL_NEAREST);
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	326 glfcns.glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	327 GL_NEAREST);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	328
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	329 if (glfcns.glGetError () != GL_NO_ERROR)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	330 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	331 else
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	332 retval = opengl_texture (glfcns, id, w, h, tw, th);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	333 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	334 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	335 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	336 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	337
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	338 return retval;
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	339 }
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	340
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	341 class
27979 cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	342 opengl_tessellator
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	343 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	344 public:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	345 #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	346 typedef GLvoid (CALLBACK *fcn) (...);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	347 #else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	348 typedef void (CALLBACK *fcn) (void);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	349 #endif
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 public:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	352
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	353 opengl_tessellator (void) : m_glu_tess (nullptr), m_fill () { init (); }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	354
22869 f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	355 // No copying!
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	356
27979 cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	357 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	358
cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	359 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	360
cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	361 virtual ~opengl_tessellator (void)
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	362 { if (m_glu_tess) gluDeleteTess (m_glu_tess); }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	363
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	364 void begin_polygon (bool filled = true)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	365 {
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	366 gluTessProperty (m_glu_tess, GLU_TESS_BOUNDARY_ONLY,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	367 (filled ? GL_FALSE : GL_TRUE));
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	368 m_fill = filled;
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	369 gluTessBeginPolygon (m_glu_tess, this);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	370 }
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 void end_polygon (void) const
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	373 { gluTessEndPolygon (m_glu_tess); }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	374
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	375 void begin_contour (void) const
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	376 { gluTessBeginContour (m_glu_tess); }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	377
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	378 void end_contour (void) const
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	379 { gluTessEndContour (m_glu_tess); }
22331 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 void add_vertex (double loc, void data) const
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	382 { gluTessVertex (m_glu_tess, loc, data); }
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 protected:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	385 virtual void begin (GLenum /type/) { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	386
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	387 virtual void end (void) { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	388
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	389 virtual void vertex (void * /data/) { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	390
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	391 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	392 GLfloat [4] /w/, void ** /out_data/) { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	393
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	394 virtual void edge_flag (GLboolean /flag/) { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	395
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	396 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	397 { ::error ("OpenGL tessellation error (%d)", err); }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	398
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	399 virtual void init (void)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	400 {
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	401 m_glu_tess = gluNewTess ();
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	402
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	403 gluTessCallback (m_glu_tess, GLU_TESS_BEGIN_DATA,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	404 reinterpret_cast<fcn> (tess_begin));
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	405 gluTessCallback (m_glu_tess, GLU_TESS_END_DATA,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	406 reinterpret_cast<fcn> (tess_end));
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	407 gluTessCallback (m_glu_tess, GLU_TESS_VERTEX_DATA,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	408 reinterpret_cast<fcn> (tess_vertex));
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	409 gluTessCallback (m_glu_tess, GLU_TESS_COMBINE_DATA,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	410 reinterpret_cast<fcn> (tess_combine));
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	411 gluTessCallback (m_glu_tess, GLU_TESS_EDGE_FLAG_DATA,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	412 reinterpret_cast<fcn> (tess_edge_flag));
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	413 gluTessCallback (m_glu_tess, GLU_TESS_ERROR_DATA,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	414 reinterpret_cast<fcn> (tess_error));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	415 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	416
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	417 bool is_filled (void) const { return m_fill; }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	418
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	419 private:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	420 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	421 { 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	422
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	423 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	424 { reinterpret_cast<opengl_tessellator *> (t)->end (); }
22331 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 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	427 { 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	428
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	429 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	430 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	431 { 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	432
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	433 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	434 { 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	435
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	436 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	437 { 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	438
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	439 //--------
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	440
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	441 GLUtesselator *m_glu_tess;
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	442 bool m_fill;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	443 };
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	444
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	445 class vertex_data
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	446 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	447 public:
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	448
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	449 class vertex_data_rep
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	450 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	451 public:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	452
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	453 vertex_data_rep (void)
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	454 : m_coords (), m_color (), m_vertex_normal (), m_face_normal (),
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	455 m_alpha (), m_ambient (), m_diffuse (), m_specular (),
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	456 m_specular_exp (), m_specular_color_refl ()
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	457 { }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	458
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	459 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	460 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	461 float se, float scr)
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	462 : m_coords (c), m_color (col), m_vertex_normal (vn),
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	463 m_face_normal (fn), m_alpha (a), m_ambient (as), m_diffuse (ds),
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	464 m_specular (ss), m_specular_exp (se), m_specular_color_refl (scr)
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	465 { }
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	466
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	467 Matrix m_coords;
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	468 Matrix m_color;
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	469 Matrix m_vertex_normal;
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	470 Matrix m_face_normal;
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	471 double m_alpha;
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	472 float m_ambient;
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	473 float m_diffuse;
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	474 float m_specular;
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	475 float m_specular_exp;
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	476 float m_specular_color_refl;
22331 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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	479 public:
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	480
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	481 // Required to instantiate std::list<vertex_data> objects.
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	482 vertex_data (void) : m_rep (nil_rep ()) { }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	483
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	484 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	485 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	486 float se, float scr)
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	487 : m_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	488 { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	489
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	490 vertex_data (const vertex_data&) = default;
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	491
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	492 ~vertex_data (void) = default;
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	493
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	494 vertex_data& operator = (const vertex_data&) = default;
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	495
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	496 vertex_data_rep * get_rep (void) const { return m_rep.get (); }
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	497
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	498 private:
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	499
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	500 static std::shared_ptr<vertex_data_rep> nil_rep (void)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	501 {
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	502 static std::shared_ptr<vertex_data_rep> nr (new vertex_data_rep ());
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	503
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	504 return nr;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	505 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	506
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	507 std::shared_ptr<vertex_data_rep> m_rep;
22331 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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	510 class
27979 cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	511 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	512 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	513 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	514 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	515 float idx = 0.0)
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	516 : opengl_tessellator (), m_renderer (r),
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	517 m_color_mode (cmode), m_light_mode (lmode), m_face_lighting (fl),
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	518 m_index (idx), m_first (true), m_tmp_vdata ()
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	519 { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	520
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	521 protected:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	522 void begin (GLenum type)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	523 {
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	524 opengl_functions& glfcns = m_renderer->get_opengl_functions ();
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	525
27979 cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	526 //printf ("patch_tessellator::begin (%d)\n", type);
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	527 m_first = true;
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	528
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	529 if (m_color_mode == INTERP \|\| m_light_mode == GOURAUD)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	530 glfcns.glShadeModel (GL_SMOOTH);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	531 else
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	532 glfcns.glShadeModel (GL_FLAT);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	533
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	534 if (is_filled ())
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	535 m_renderer->set_polygon_offset (true, m_index);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	536
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	537 glfcns.glBegin (type);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	538 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	539
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	540 void end (void)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	541 {
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	542 opengl_functions& glfcns = m_renderer->get_opengl_functions ();
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	543
27979 cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	544 //printf ("patch_tessellator::end\n");
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	545 glfcns.glEnd ();
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	546 m_renderer->set_polygon_offset (false);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	547 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	548
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	549 void vertex (void *data)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	550 {
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	551 opengl_functions& glfcns = m_renderer->get_opengl_functions ();
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	552
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	553 vertex_data::vertex_data_rep *v
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	554 = reinterpret_cast<vertex_data::vertex_data_rep *> (data);
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	555 //printf ("patch_tessellator::vertex (%g, %g, %g)\n", v->m_coords(0), v->m_coords(1), v->m_coords(2));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	556
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	557 // 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	558 // 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	559
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	560 if (m_color_mode == INTERP \|\| (m_color_mode == FLAT && ! is_filled ()))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	561 {
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	562 Matrix col = v->m_color;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	563
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	564 if (col.numel () == 3)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	565 {
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	566 glfcns.glColor4d (col(0), col(1), col(2), v->m_alpha);
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	567 if (m_light_mode > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	568 {
28006 91316b5dc5a2 Only use ambient light for edge lighting on patches (bug #57553). Markus Mützel <markus.muetzel@gmx.de> parents: 27992 diff changeset	569 // 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	570 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	571
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	572 if (m_face_lighting)
28006 91316b5dc5a2 Only use ambient light for edge lighting on patches (bug #57553). Markus Mützel <markus.muetzel@gmx.de> parents: 27992 diff changeset	573 for (int k = 0; k < 3; k++)
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	574 buf[k] = (v->m_specular
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	575 * (v->m_specular_color_refl +
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	576 (1 - v->m_specular_color_refl) * col(k)));
28006 91316b5dc5a2 Only use ambient light for edge lighting on patches (bug #57553). Markus Mützel <markus.muetzel@gmx.de> parents: 27992 diff changeset	577 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	578
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	579 if (m_face_lighting)
28006 91316b5dc5a2 Only use ambient light for edge lighting on patches (bug #57553). Markus Mützel <markus.muetzel@gmx.de> parents: 27992 diff changeset	580 for (int k = 0; k < 3; k++)
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	581 buf[k] = (v->m_diffuse * col(k));
28006 91316b5dc5a2 Only use ambient light for edge lighting on patches (bug #57553). Markus Mützel <markus.muetzel@gmx.de> parents: 27992 diff changeset	582 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	583
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	584 for (int k = 0; k < 3; k++)
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	585 buf[k] = (v->m_ambient * col(k));
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	586 glfcns.glMaterialfv (LIGHT_MODE, GL_AMBIENT, buf);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	587 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	588 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	589 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	590
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	591 if (m_light_mode == FLAT && m_first)
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	592 glfcns.glNormal3dv (v->m_face_normal.data ());
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	593 else if (m_light_mode == GOURAUD)
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	594 glfcns.glNormal3dv (v->m_vertex_normal.data ());
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	595
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	596 glfcns.glVertex3dv (v->m_coords.data ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	597
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	598 m_first = false;
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	599 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	600
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	601 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	602 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	603 vertex_data::vertex_data_rep *v[4];
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	604 int vmax = 4;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	605
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	606 for (int i = 0; i < 4; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	607 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	608 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	609
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	610 if (vmax == 4 && ! v[i])
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	611 vmax = i;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	612 }
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 Matrix vv (1, 3, 0.0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	615 Matrix cc;
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	616 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	617 Matrix fnn (1, 3, 0.0);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	618 double aa = 0.0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	619
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	620 vv(0) = xyz[0];
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	621 vv(1) = xyz[1];
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	622 vv(2) = xyz[2];
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	623
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	624 if (v[0]->m_color.numel ())
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	625 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	626 cc.resize (1, 3, 0.0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	627 for (int ic = 0; ic < 3; ic++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	628 for (int iv = 0; iv < vmax; iv++)
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	629 cc(ic) += (w[iv] * v[iv]->m_color (ic));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	630 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	631
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	632 if (v[0]->m_vertex_normal.numel () > 0)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	633 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	634 for (int in = 0; in < 3; in++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	635 for (int iv = 0; iv < vmax; iv++)
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	636 vnn(in) += (w[iv] * v[iv]->m_vertex_normal (in));
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	637 }
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	638
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	639 if (v[0]->m_face_normal.numel () > 0)
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	640 {
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	641 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	642 for (int iv = 0; iv < vmax; iv++)
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	643 fnn(in) += (w[iv] * v[iv]->m_face_normal (in));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	644 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	645
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	646 for (int iv = 0; iv < vmax; iv++)
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	647 aa += (w[iv] * v[iv]->m_alpha);
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	648
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	649 vertex_data new_v (vv, cc, vnn, fnn, aa, v[0]->m_ambient, v[0]->m_diffuse,
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	650 v[0]->m_specular, v[0]->m_specular_exp,
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	651 v[0]->m_specular_color_refl);
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	652 m_tmp_vdata.push_back (new_v);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	653
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	654 *out_data = new_v.get_rep ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	655 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	656
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	657 private:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	658
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	659 // No copying!
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	660
27979 cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	661 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	662
cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	663 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	664
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	665 opengl_renderer *m_renderer;
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	666 int m_color_mode;
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	667 int m_light_mode;
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	668 bool m_face_lighting;
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	669 int m_index;
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	670 bool m_first;
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	671 std::list<vertex_data> m_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	672 };
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	673
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	674 #else
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	675
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	676 class
27979 cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	677 opengl_renderer::patch_tessellator
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	678 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	679 // Dummy class.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	680 };
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	681
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	682 #endif
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	683
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	684 opengl_renderer::opengl_renderer (opengl_functions& glfcns)
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	685 : m_glfcns (glfcns), m_xmin (), m_xmax (), m_ymin (), m_ymax (),
ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	686 m_zmin (), m_zmax (), m_devpixratio (1.0), m_xform (), m_toolkit (),
ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	687 m_xZ1 (), m_xZ2 (), m_marker_id (), m_filled_marker_id (),
ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	688 m_camera_pos (), m_camera_dir (), m_view_vector (),
ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	689 m_interpreter ("none"), m_txt_renderer (), m_current_light (0),
ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	690 m_max_lights (0), m_selecting (false), m_printing (false)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	691 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	692 // 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	693 // 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	694 // OpenGL types.
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	695
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	696 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	697
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	698 // 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	699 // FIXME: should we check signed vs. unsigned?
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	700
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	701 static bool ok = (sizeof (int) <= sizeof (GLsizei));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	702
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	703 if (! ok)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	704 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	705
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	706 #else
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	707
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	708 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	709
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	710 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	711 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	712
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	713 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	714 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	715 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	716 if (! go.valid_object ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	717 return;
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 const base_properties& props = go.get_properties ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	720
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	721 if (! m_toolkit)
ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	722 m_toolkit = props.get_toolkit ();
22331 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 (go.isa ("figure"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	725 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	726 else if (go.isa ("axes"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	727 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	728 else if (go.isa ("line"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	729 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	730 else if (go.isa ("surface"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	731 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	732 else if (go.isa ("patch"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	733 draw_patch (dynamic_cast<const patch::properties&> (props));
28286 496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	734 else if (go.isa ("scatter"))
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	735 draw_scatter (dynamic_cast<const scatter::properties&> (props));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	736 else if (go.isa ("light"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	737 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	738 else if (go.isa ("hggroup"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	739 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	740 else if (go.isa ("text"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	741 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	742 else if (go.isa ("image"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	743 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	744 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	745 \|\| go.isa ("uicontextmenu") \|\| go.isa ("uitoolbar")
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: 26025 diff changeset	746 \|\| go.isa ("uipushtool") \|\| go.isa ("uitoggletool")
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: 26025 diff changeset	747 \|\| go.isa ("uitable"))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	748 ; // SKIP
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	749 else if (go.isa ("uipanel"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	750 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	751 if (toplevel)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	752 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	753 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	754 else if (go.isa ("uibuttongroup"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	755 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	756 if (toplevel)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	757 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	758 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	759 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	760 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	761 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	762 props.graphics_object_name ().c_str ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	763 }
22494 3564b6b6b8d1 Query OpenGL errors on initialization of GL context (bug #45542). Markus Mützel <markus.muetzel@gmx.de> parents: 22407 diff changeset	764
22500 1d3b71530539 fix compilation of gl-render.cc if OpenGL is missing John W. Eaton <jwe@octave.org> parents: 22494 diff changeset	765 #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	766
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	767 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	768 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	769 warning ("opengl_renderer: Error '%s' (%d) occurred drawing '%s' object",
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	770 gluErrorString (gl_error), gl_error,
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	771 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
28763 b8e9e012bb21 Improve rendering issues due to small distance between clipping plains (bug #58956). Markus Mützel <markus.muetzel@gmx.de> parents: 28559 diff changeset	1280 // Expand the distance between the clipping planes symmetrically by
b8e9e012bb21 Improve rendering issues due to small distance between clipping plains (bug #58956). Markus Mützel <markus.muetzel@gmx.de> parents: 28559 diff changeset	1281 // an arbitrary factor (see bug #54551).
b8e9e012bb21 Improve rendering issues due to small distance between clipping plains (bug #58956). Markus Mützel <markus.muetzel@gmx.de> parents: 28559 diff changeset	1282 const double expansion_fac = 100.0;
b8e9e012bb21 Improve rendering issues due to small distance between clipping plains (bug #58956). Markus Mützel <markus.muetzel@gmx.de> parents: 28559 diff changeset	1283 // Also make sure that the distance between the clipping planes
b8e9e012bb21 Improve rendering issues due to small distance between clipping plains (bug #58956). Markus Mützel <markus.muetzel@gmx.de> parents: 28559 diff changeset	1284 // differs in single precision (see bug #58956). This factor is also
b8e9e012bb21 Improve rendering issues due to small distance between clipping plains (bug #58956). Markus Mützel <markus.muetzel@gmx.de> parents: 28559 diff changeset	1285 // arbitrary. Different values (>2) might also work.
b8e9e012bb21 Improve rendering issues due to small distance between clipping plains (bug #58956). Markus Mützel <markus.muetzel@gmx.de> parents: 28559 diff changeset	1286 const double single_prec_fac = 10.0;
b8e9e012bb21 Improve rendering issues due to small distance between clipping plains (bug #58956). Markus Mützel <markus.muetzel@gmx.de> parents: 28559 diff changeset	1287
b8e9e012bb21 Improve rendering issues due to small distance between clipping plains (bug #58956). Markus Mützel <markus.muetzel@gmx.de> parents: 28559 diff changeset	1288 double avgZ = x_zlim(0) / 2.0 + x_zlim(1) / 2.0;
29127 a948253f9976 maint: strip trailing spaces from code base. Rik <rik@octave.org> parents: 28857 diff changeset	1289 double span
28763 b8e9e012bb21 Improve rendering issues due to small distance between clipping plains (bug #58956). Markus Mützel <markus.muetzel@gmx.de> parents: 28559 diff changeset	1290 = std::max (expansion_fac * (x_zlim(1)-x_zlim(0)),
b8e9e012bb21 Improve rendering issues due to small distance between clipping plains (bug #58956). Markus Mützel <markus.muetzel@gmx.de> parents: 28559 diff changeset	1291 single_prec_fac * std::abs (avgZ)
b8e9e012bb21 Improve rendering issues due to small distance between clipping plains (bug #58956). Markus Mützel <markus.muetzel@gmx.de> parents: 28559 diff changeset	1292 * std::numeric_limits<float>::epsilon ());
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	1293 m_xZ1 = avgZ - span;
ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	1294 m_xZ2 = avgZ + span;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1295
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1296 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	1297 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	1298
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1299 m_glfcns.glMatrixMode (GL_MODELVIEW);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1300 m_glfcns.glLoadIdentity ();
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1301 m_glfcns.glScaled (1, 1, -1);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1302 m_glfcns.glMultMatrixd (x_mat1.data ());
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1303 m_glfcns.glMatrixMode (GL_PROJECTION);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1304 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	1305
25889 2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	1306 Matrix vp = get_viewport_scaled ();
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	1307 m_glfcns.glOrtho (0, vp(2), vp(3), 0, m_xZ1, m_xZ2);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1308 m_glfcns.glMultMatrixd (x_mat2.data ());
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1309 m_glfcns.glMatrixMode (GL_MODELVIEW);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1310
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1311 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	1312
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1313 // store axes transformation data
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1314
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	1315 m_xform = props.get_transform ();
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1316
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1317 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	1318
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1319 octave_unused_parameter (props);
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 // 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	1322 // 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	1323
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1324 panic_impossible ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1325
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1326 #endif
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1327 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1328
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1329 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1330 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	1331 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1332 #if defined (HAVE_OPENGL)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1333
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1334 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	1335 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	1336 return;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1337
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1338 double xPlane = props.get_xPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1339 double yPlane = props.get_yPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1340 double zPlane = props.get_zPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1341 double xPlaneN = props.get_xPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1342 double yPlaneN = props.get_yPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1343 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	1344 bool is2D = props.get_is2D ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1345
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1346 // Axes planes
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1347 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	1348 set_polygon_offset (true, 9.0);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1349
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1350 m_glfcns.glBegin (GL_QUADS);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1351
26020 912e1daa03d2 maint: Use 2D, 3D in variable names in graphics code rather than 2d,3d. Rik <rik@octave.org> parents: 25999 diff changeset	1352 if (! is2D)
22331 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 // X plane
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1355 m_glfcns.glVertex3d (xPlane, yPlaneN, zPlaneN);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1356 m_glfcns.glVertex3d (xPlane, yPlane, zPlaneN);
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 (xPlane, yPlaneN, zPlane);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1359
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1360 // Y plane
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1361 m_glfcns.glVertex3d (xPlaneN, yPlane, zPlaneN);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1362 m_glfcns.glVertex3d (xPlane, yPlane, zPlaneN);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1363 m_glfcns.glVertex3d (xPlane, yPlane, zPlane);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1364 m_glfcns.glVertex3d (xPlaneN, yPlane, zPlane);
22331 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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1367 // Z plane
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1368 m_glfcns.glVertex3d (xPlaneN, yPlaneN, zPlane);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1369 m_glfcns.glVertex3d (xPlane, yPlaneN, zPlane);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1370 m_glfcns.glVertex3d (xPlane, yPlane, zPlane);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1371 m_glfcns.glVertex3d (xPlaneN, yPlane, zPlane);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1372
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1373 m_glfcns.glEnd ();
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 set_polygon_offset (false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1376
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1377 #else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1378
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1379 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1380
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1381 // 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	1382 // 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	1383
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1384 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	1385
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1386 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1387 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1388
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1389 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1390 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	1391 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1392 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1393
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1394 if (! props.is_visible ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1395 return;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1396
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1397 bool xySym = props.get_xySym ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1398 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	1399 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	1400 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	1401 && ! 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	1402 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	1403 && ! props.xscale_is ("log");
22363 0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1404 bool boxFull = (props.get_boxstyle () == "full");
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1405 double linewidth = props.get_linewidth ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1406 double xPlane = props.get_xPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1407 double yPlane = props.get_yPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1408 double zPlane = props.get_zPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1409 double xPlaneN = props.get_xPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1410 double yPlaneN = props.get_yPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1411 double zPlaneN = props.get_zPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1412 double xpTick = props.get_xpTick ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1413 double ypTick = props.get_ypTick ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1414 double zpTick = props.get_zpTick ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1415 double xpTickN = props.get_xpTickN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1416 double ypTickN = props.get_ypTickN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1417 double zpTickN = props.get_zpTickN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1418
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1419 bool plotyy = (props.has_property ("__plotyy_axes__"));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1420
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1421 // Axes box
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1422
24807 8585b3f9c28c Use "butt" linecap to workaround split lines in printout (bug #53229). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24725 diff changeset	1423 set_linecap ("square");
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1424 set_linestyle ("-", true, linewidth);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1425
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1426 m_glfcns.glBegin (GL_LINES);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1427
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1428 if (layer2Dtop)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1429 std::swap (zpTick, zpTickN);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1430
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1431 // X box
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1432 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	1433
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1434 if (! color.isempty ())
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1435 {
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1436 set_color (color);
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1437
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1438 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	1439 {
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1440 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	1441 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	1442 }
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1443
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1444 if (props.is_box ())
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1445 {
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1446 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	1447 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	1448 if (! is2D)
22363 0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1449 {
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1450 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	1451 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	1452 if (boxFull)
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1453 {
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1454 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	1455 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	1456 }
22363 0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1457 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1458 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1459 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1460
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1461 // Y box
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1462 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	1463
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1464 if (! color.isempty ())
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1465 {
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1466 set_color (color);
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1467 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	1468 {
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1469 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	1470 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	1471 }
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1472
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1473 if (props.is_box () && ! plotyy)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1474 {
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1475 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	1476 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	1477
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1478 if (! is2D)
22363 0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1479 {
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1480 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	1481 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	1482 if (boxFull)
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1483 {
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1484 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	1485 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	1486 }
22363 0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1487 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1488 }
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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1491 // Z box
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1492 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	1493
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1494 if (! color.isempty () && ! is2D)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1495 {
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1496 set_color (color);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1497
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1498 if (xySym)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1499 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1500 m_glfcns.glVertex3d (xPlaneN, yPlane, zPlaneN);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1501 m_glfcns.glVertex3d (xPlaneN, yPlane, zPlane);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1502 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1503 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1504 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1505 m_glfcns.glVertex3d (xPlane, yPlaneN, zPlaneN);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1506 m_glfcns.glVertex3d (xPlane, yPlaneN, zPlane);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1507 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1508
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1509 if (props.is_box ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1510 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1511 m_glfcns.glVertex3d (xPlane, yPlane, zPlaneN);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1512 m_glfcns.glVertex3d (xPlane, yPlane, zPlane);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1513
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1514 if (xySym)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1515 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1516 m_glfcns.glVertex3d (xPlane, yPlaneN, zPlaneN);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1517 m_glfcns.glVertex3d (xPlane, yPlaneN, zPlane);
22331 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 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1520 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1521 m_glfcns.glVertex3d (xPlaneN, yPlane, zPlaneN);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1522 m_glfcns.glVertex3d (xPlaneN, yPlane, zPlane);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1523 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1524
22363 0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1525 if (boxFull)
0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1526 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1527 m_glfcns.glVertex3d (xPlaneN, yPlaneN, zPlaneN);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1528 m_glfcns.glVertex3d (xPlaneN, yPlaneN, zPlane);
22363 0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1529 }
22331 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 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1532
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	1533 m_glfcns.glEnd ();
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1534
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	1535 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	1536
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1537 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	1538
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1539 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1540
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1541 // 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	1542 // 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	1543
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1544 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	1545
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1546 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1547 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1548
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1549 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1550 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	1551 {
22740 3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1552 #if defined (HAVE_OPENGL)
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1553
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1554 gh_manager& gh_mgr
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1555 = __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	1556
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1557 int xstate = props.get_xstate ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1558
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	1559 if (xstate != AXE_DEPTH_DIR
24634 ab2321d4ba03 maint: strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1560 && (props.is_visible ()
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	1561 \|\| (m_selecting && props.pickableparts_is ("all"))))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1562 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1563 int zstate = props.get_zstate ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1564 bool x2Dtop = props.get_x2Dtop ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1565 bool layer2Dtop = props.get_layer2Dtop ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1566 bool xyzSym = props.get_xyzSym ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1567 bool nearhoriz = props.get_nearhoriz ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1568 double xticklen = props.get_xticklen ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1569 double xtickoffset = props.get_xtickoffset ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1570 double fy = props.get_fy ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1571 double fz = props.get_fz ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1572 double x_min = props.get_x_min ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1573 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	1574 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	1575 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	1576 double yPlane = props.get_yPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1577 double yPlaneN = props.get_yPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1578 double ypTick = props.get_ypTick ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1579 double ypTickN = props.get_ypTickN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1580 double zPlane = props.get_zPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1581 double zPlaneN = props.get_zPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1582 double zpTick = props.get_zpTick ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1583 double zpTickN = props.get_zpTickN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1584
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	1585 // X ticks and grid properties
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	1586 Matrix xticks = m_xform.xscale (props.get_xtick ().matrix_value ());
ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	1587 Matrix xmticks = m_xform.xscale (props.get_xminortickvalues ().matrix_value ());
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	1588 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	1589 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	1590 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	1591 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	1592 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	1593 double linewidth = props.get_linewidth ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1594 std::string gridstyle = props.get_gridlinestyle ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1595 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	1596 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	1597 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	1598 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	1599 double minorgridalpha = props.get_minorgridalpha ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1600 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	1601 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	1602 && (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	1603 && ! xticks.isempty ());
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1604 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	1605 && ! props.yscale_is ("log");
868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1606 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	1607 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	1608
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	1609 // 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	1610
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1611 // 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	1612 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	1613 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	1614 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	1615
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1616 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	1617 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	1618 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	1619
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1620 if (gridcolor.isempty ())
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1621 do_xgrid = false;
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1622
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1623 if (minorgridcolor.isempty ())
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1624 do_xminorgrid = false;
22528 5a1167e15c0e Fix color of (minor) grid (bug #48429). Markus Mützel <markus.muetzel@gmx.de> parents: 22500 diff changeset	1625
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	1626 // 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	1627 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	1628 {
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	1629 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	1630 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	1631 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	1632 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	1633 }
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	1634
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1635 // minor grid lines
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1636 if (do_xminorgrid)
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1637 render_grid (linewidth,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1638 minorgridstyle, minorgridcolor, minorgridalpha,
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1639 xmticks, x_min, x_max,
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1640 yPlane, yPlaneN, layer2Dtop ? zPlaneN : zPlane, zPlaneN,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1641 0, (zstate != AXE_DEPTH_DIR));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1642
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1643 // grid lines
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1644 if (do_xgrid)
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1645 render_grid (linewidth,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1646 gridstyle, gridcolor, gridalpha,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1647 xticks, x_min, x_max,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1648 yPlane, yPlaneN, layer2Dtop ? zPlaneN : zPlane, zPlaneN,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1649 0, (zstate != AXE_DEPTH_DIR));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1650
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1651 // 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	1652 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	1653 return;
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1654
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1655 set_color (props.get_xcolor_rgb ());
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1656
22711 074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1657 // axis line
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1658 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	1659 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	1660 {
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25058 diff changeset	1661 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	1662 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	1663 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	1664 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	1665 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	1666 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	1667 }
074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1668
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1669 // minor tick marks
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1670 if (do_xminortick)
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1671 {
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1672 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	1673 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	1674 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	1675 zpTick, zpTickN, 0., 0.,
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	1676 (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	1677 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	1678 0, ! is_origin && mirror);
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1679 else
22711 074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1680 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	1681 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	1682 zpTick, zpTick, 0.,
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	1683 (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	1684 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	1685 0., 0, ! is_origin && mirror);
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1686 }
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1687
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1688 // tick marks
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1689 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	1690 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	1691 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	1692 zpTick, zpTickN, 0., 0.,
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	1693 (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	1694 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	1695 0, ! is_origin && mirror);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1696 else
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1697 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	1698 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	1699 zpTick, zpTick, 0.,
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	1700 (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	1701 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	1702 0., 0, ! is_origin && mirror);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1703
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1704 // tick texts
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1705 if (xticklabels.numel () > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1706 {
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	1707 int halign = (xstate == AXE_HORZ_DIR
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	1708 ? 1
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	1709 : (xyzSym \|\| is_origin_low ? 0 : 2));
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	1710 int valign = (xstate == AXE_VERT_DIR
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	1711 ? 1
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	1712 : (x2Dtop \|\| is_origin_low ? 0 : 2));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1713
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1714 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	1715 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	1716 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	1717 zpTick +
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	1718 (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	1719 math::signum (zpTick-zpTickN)fzxtickoffset,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1720 0, halign, valign, wmax, hmax);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1721 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1722 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	1723 (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	1724 (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	1725 math::signum (ypTick-ypTickN)fyxtickoffset,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1726 zpTick, 0, halign, valign, wmax, hmax);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1727 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1728
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1729 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	1730 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1731 else
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1732 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	1733
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1734 #else
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1735
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1736 octave_unused_parameter (props);
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1737
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1738 // 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	1739 // 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	1740
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1741 panic_impossible ();
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1742
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1743 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1744 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1745
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1746 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1747 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	1748 {
22740 3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1749 #if defined (HAVE_OPENGL)
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1750
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1751 gh_manager& gh_mgr
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1752 = __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	1753
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1754 int ystate = props.get_ystate ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1755
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	1756 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	1757 && (props.is_visible ()
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	1758 \|\| (m_selecting && props.pickableparts_is ("all"))))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1759 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1760 int zstate = props.get_zstate ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1761 bool y2Dright = props.get_y2Dright ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1762 bool layer2Dtop = props.get_layer2Dtop ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1763 bool xyzSym = props.get_xyzSym ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1764 bool nearhoriz = props.get_nearhoriz ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1765 double yticklen = props.get_yticklen ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1766 double ytickoffset = props.get_ytickoffset ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1767 double fx = props.get_fx ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1768 double fz = props.get_fz ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1769 double xPlane = props.get_xPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1770 double xPlaneN = props.get_xPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1771 double xpTick = props.get_xpTick ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1772 double xpTickN = props.get_xpTickN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1773 double y_min = props.get_y_min ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1774 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	1775 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	1776 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	1777 double zPlane = props.get_zPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1778 double zPlaneN = props.get_zPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1779 double zpTick = props.get_zpTick ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1780 double zpTickN = props.get_zpTickN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1781
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	1782 // Y ticks and grid properties
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	1783 Matrix yticks = m_xform.yscale (props.get_ytick ().matrix_value ());
ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	1784 Matrix ymticks = m_xform.yscale (props.get_yminortickvalues ().matrix_value ());
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	1785 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	1786 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	1787 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	1788 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	1789 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	1790 double linewidth = props.get_linewidth ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1791 std::string gridstyle = props.get_gridlinestyle ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1792 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	1793 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	1794 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	1795 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	1796 double minorgridalpha = props.get_minorgridalpha ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1797 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	1798 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	1799 && (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	1800 && ! yticks.isempty ());
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1801 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	1802 && ! props.xscale_is ("log");
868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1803 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	1804 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	1805 && (! props.has_property ("__plotyy_axes__"));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1806
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	1807 // 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	1808
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1809 // 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	1810 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	1811 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	1812 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	1813
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1814 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	1815 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	1816 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	1817
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1818 if (gridcolor.isempty ())
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1819 do_ygrid = false;
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1820
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1821 if (minorgridcolor.isempty ())
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1822 do_yminorgrid = false;
22528 5a1167e15c0e Fix color of (minor) grid (bug #48429). Markus Mützel <markus.muetzel@gmx.de> parents: 22500 diff changeset	1823
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	1824 // 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	1825 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	1826 {
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	1827 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	1828 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	1829 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	1830 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	1831 }
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	1832
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1833 // minor grid lines
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1834 if (do_yminorgrid)
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1835 render_grid (linewidth,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1836 minorgridstyle, minorgridcolor, minorgridalpha,
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1837 ymticks, y_min, y_max,
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1838 xPlane, xPlaneN, layer2Dtop ? zPlaneN : zPlane, zPlaneN,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1839 1, (zstate != AXE_DEPTH_DIR));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1840
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1841 // grid lines
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1842 if (do_ygrid)
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1843 render_grid (linewidth,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1844 gridstyle, gridcolor, gridalpha,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1845 yticks, y_min, y_max,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1846 xPlane, xPlaneN, layer2Dtop ? zPlaneN : zPlane, zPlaneN,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1847 1, (zstate != AXE_DEPTH_DIR));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1848
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1849 // 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	1850 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	1851 return;
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1852
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1853 set_color (props.get_ycolor_rgb ());
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1854
22711 074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1855 // axis line
23116 868daa374c49 Improve support of "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 23084 diff changeset	1856 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	1857 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	1858 {
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25058 diff changeset	1859 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	1860 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	1861 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	1862 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	1863 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	1864 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	1865 }
074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1866
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1867 // minor tick marks
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1868 if (do_yminortick)
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1869 {
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1870 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	1871 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	1872 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	1873 zpTick, zpTickN, 0., 0.,
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	1874 (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	1875 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	1876 1, ! is_origin && mirror);
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1877 else
22711 074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1878 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	1879 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	1880 zpTick, zpTick,
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	1881 (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	1882 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	1883 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	1884 }
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1885
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1886 // tick marks
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1887 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	1888 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	1889 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	1890 zpTick, zpTickN, 0., 0.,
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	1891 (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	1892 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	1893 1, ! is_origin && mirror);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1894 else
22711 074765d5c83b Add support in opengl for "(xy)axislocation" "origin" (bug #48562). Markus Mützel <markus.muetzel@gmx.de> parents: 22623 diff changeset	1895 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	1896 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	1897 zpTick, zpTick,
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	1898 (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	1899 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	1900 0., 0., 1, ! is_origin && mirror);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1901
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1902 // tick texts
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1903 if (yticklabels.numel () > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1904 {
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	1905 int halign = (ystate == AXE_HORZ_DIR
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	1906 ? 1
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	1907 : (! 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	1908 int valign = (ystate == AXE_VERT_DIR
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	1909 ? 1
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23446 diff changeset	1910 : (is_origin_low ? 0 : 2));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1911
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1912 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	1913 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	1914 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	1915 zpTick +
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	1916 (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	1917 math::signum (zpTick-zpTickN)fzytickoffset,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1918 1, halign, valign, wmax, hmax);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1919 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1920 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	1921 (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	1922 (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	1923 math::signum (xpTick-xpTickN)fxytickoffset,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1924 zpTick, 1, halign, valign, wmax, hmax);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1925 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1926
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1927 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	1928 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1929 else
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1930 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	1931
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1932 #else
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1933
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1934 octave_unused_parameter (props);
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1935
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1936 // 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	1937 // 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	1938
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1939 panic_impossible ();
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1940
3b2a30e9e49f build: Fix building when '--without-opengl' option given (bug #49561). Rik <rik@octave.org> parents: 22711 diff changeset	1941 #endif
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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1944 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1945 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	1946 {
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1947 gh_manager& gh_mgr
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1948 = __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	1949
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1950 int zstate = props.get_zstate ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1951
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	1952 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	1953 && (props.is_visible ()
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	1954 \|\| (m_selecting && props.pickableparts_is ("all"))))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1955 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1956 bool xySym = props.get_xySym ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1957 bool zSign = props.get_zSign ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1958 double zticklen = props.get_zticklen ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1959 double ztickoffset = props.get_ztickoffset ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1960 double fx = props.get_fx ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1961 double fy = props.get_fy ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1962 double xPlane = props.get_xPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1963 double xPlaneN = props.get_xPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1964 double yPlane = props.get_yPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1965 double yPlaneN = props.get_yPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1966 double z_min = props.get_z_min ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1967 double z_max = props.get_z_max ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1968
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	1969 // Z ticks and grid properties
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	1970 Matrix zticks = m_xform.zscale (props.get_ztick ().matrix_value ());
ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	1971 Matrix zmticks = m_xform.zscale (props.get_zminortickvalues ().matrix_value ());
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 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	1973 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	1974 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	1975 int hmax = 0;
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1976 double linewidth = props.get_linewidth ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1977 std::string gridstyle = props.get_gridlinestyle ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1978 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	1979 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	1980 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	1981 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	1982 double minorgridalpha = props.get_minorgridalpha ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1983 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	1984 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	1985 && (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	1986 && ! zticks.isempty ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1987 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	1988
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	1989 // 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	1990
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1991 // 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	1992 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	1993 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	1994 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	1995
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	1996 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	1997 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	1998 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	1999
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	2000 if (gridcolor.isempty ())
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	2001 do_zgrid = false;
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	2002
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	2003 if (minorgridcolor.isempty ())
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	2004 do_zminorgrid = false;
22528 5a1167e15c0e Fix color of (minor) grid (bug #48429). Markus Mützel <markus.muetzel@gmx.de> parents: 22500 diff changeset	2005
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	2006 // 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	2007 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	2008 {
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	2009 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	2010 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	2011 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	2012 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	2013 }
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	2014
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2015 // minor grid lines
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2016 if (do_zminorgrid)
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	2017 render_grid (linewidth,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	2018 minorgridstyle, minorgridcolor, minorgridalpha,
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2019 zmticks, z_min, z_max,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2020 xPlane, xPlaneN, yPlane, yPlaneN, 2, true);
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 // grid lines
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2023 if (do_zgrid)
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	2024 render_grid (linewidth,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	2025 gridstyle, gridcolor, gridalpha,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	2026 zticks, z_min, z_max,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2027 xPlane, xPlaneN, yPlane, yPlaneN, 2, true);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2028
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	2029 // 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	2030 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	2031 return;
0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	2032
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2033 set_color (props.get_zcolor_rgb ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2034
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2035 // minor tick marks
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2036 if (do_zminortick)
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 if (xySym)
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 (fy))
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, xPlaneN, xPlane,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2042 yPlane, yPlane,
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 (xPlaneN-xPlane)fxzticklen/2,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2044 0., 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, xPlaneN, xPlaneN,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2047 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	2048 math::signum (yPlane-yPlaneN)fyzticklen/2,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2049 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 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2052 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	2053 if (math::isinf (fx))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2054 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	2055 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	2056 math::signum (yPlaneN-yPlane)fyzticklen/2,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2057 0., 2, mirror);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2058 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2059 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	2060 yPlaneN, yPlaneN,
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	2061 math::signum (xPlane-xPlaneN)fxzticklen/2,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2062 0., 0., 2, false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2063 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2064 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2065
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2066 // tick marks
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2067 if (xySym)
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 (fy))
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 yPlane, yPlane,
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 (xPlaneN-xPlane)fxzticklen,
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2073 0., 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, xPlaneN, xPlaneN,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2076 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	2077 math::signum (yPlane-yPlaneN)fyzticklen,
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2078 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 else
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2081 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	2082 if (math::isinf (fx))
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2083 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	2084 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	2085 math::signum (yPlaneN-yPlane)fyzticklen,
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2086 0., 2, mirror);
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2087 else
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2088 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	2089 yPlaneN, yPlane,
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	2090 math::signum (xPlane-xPlaneN)fxzticklen,
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2091 0., 0., 2, false);
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2092 }
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2093
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2094 // tick texts
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2095 if (zticklabels.numel () > 0)
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2096 {
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2097 int halign = 2;
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2098 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	2099
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2100 if (xySym)
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2101 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	2102 if (math::isinf (fy))
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2103 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	2104 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	2105 yPlane, 2, halign, valign, wmax, hmax);
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2106 else
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2107 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	2108 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	2109 2, halign, valign, wmax, hmax);
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2110 }
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2111 else
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2112 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	2113 if (math::isinf (fx))
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2114 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	2115 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	2116 2, halign, valign, wmax, hmax);
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2117 else
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2118 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	2119 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	2120 yPlaneN, 2, halign, valign, wmax, hmax);
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2121 }
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2122 }
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	2123
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	2124 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	2125 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2126 else
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	2127 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	2128 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2129
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2130 void
23546 06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	2131 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	2132 {
23562 35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	2133 #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	2134 // 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	2135 GLboolean antialias;
23562 35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	2136
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2137 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	2138
23546 06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	2139 if (antialias == GL_TRUE)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2140 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	2141
24807 8585b3f9c28c Use "butt" linecap to workaround split lines in printout (bug #53229). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24725 diff changeset	2142 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	2143 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	2144 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	2145 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	2146
06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	2147 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	2148 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	2149 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	2150
06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	2151 if (antialias == GL_TRUE)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2152 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	2153 #else
35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	2154
35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	2155 octave_unused_parameter (props);
35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	2156
35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	2157 // 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	2158 // 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	2159
35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	2160 panic_impossible ();
35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	2161
35ee7e8fb33b * gl-render.cc: Allow build to succeed without OpenGL. John W. Eaton <jwe@octave.org> parents: 23546 diff changeset	2162 #endif
23546 06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	2163 }
06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	2164
06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	2165 void
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22396 diff changeset	2166 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	2167 std::list<graphics_object>& obj_list)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2168 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2169 #if defined (HAVE_OPENGL)
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	2170 gh_manager& gh_mgr
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	2171 = __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	2172
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2173 Matrix children = props.get_all_children ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2174
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2175 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	2176 {
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	2177 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	2178
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2179 base_properties p = go.get_properties ();
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2180
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2181 if (p.is_visible ()
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	2182 \|\| (m_selecting && p.pickableparts_is ("all")))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2183 {
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	2184 if (go.isa ("light") && ! m_selecting)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2185 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2186 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	2187 {
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2188 set_clipping (p.is_clipping ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2189 draw (go);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2190 m_current_light++;
22331 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 }
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2193 else if (go.isa ("hggroup")
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	2194 && ! (m_selecting && p.pickableparts_is ("none")))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2195 draw_all_lights (go.get_properties (), obj_list);
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	2196 else if (! (m_selecting && p.pickableparts_is ("none")))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2197 obj_list.push_back (go);
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 }
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2200 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	2201
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2202 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2203 octave_unused_parameter (obj_list);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2204
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2205 // 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	2206 // 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	2207
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2208 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	2209
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2210 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2211 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2212
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2213 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2214 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	2215 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2216 #if defined (HAVE_OPENGL)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2217 // list for non-light child objects
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2218 std::list<graphics_object> obj_list;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2219 std::list<graphics_object>::iterator it;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2220
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2221 // 1st pass: draw light objects
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2222
22349 2aac9ec7df29 Do not call GL functions before window is open. (bug #48669) Markus Mützel <markus.muetzel@gmx.de> parents: 22348 diff changeset	2223 // 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	2224 // 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	2225 // 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	2226 // 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	2227 // 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	2228 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	2229
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2230 // 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	2231 // 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	2232
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2233 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	2234 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	2235 "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	2236 "exceeded.", m_max_lights);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2237
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2238 m_current_light = GL_LIGHT0;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2239 draw_all_lights (props, obj_list);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2240
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2241 // disable other OpenGL lights
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2242 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	2243 m_glfcns.glDisable (GL_LIGHT0 + i);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2244
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2245 // 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	2246 // other objects
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	2247 m_view_vector = props.get_cameraposition ().matrix_value ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2248
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2249 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	2250 ColumnVector ambient_color = props.get_ambientlightcolor_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2251 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2252 cb[i] = ambient_color(i);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2253 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	2254
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2255 // 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	2256
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2257 it = obj_list.begin ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2258 while (it != obj_list.end ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2259 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2260 graphics_object go = (*it);
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 // 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	2263 // to "data"
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2264 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	2265 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2266 set_clipping (go.get_properties ().is_clipping ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2267 draw (go);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2268
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2269 it = obj_list.erase (it);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2270 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2271 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2272 it++;
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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2275 // 3rd pass: draw remaining objects
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2276
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2277 m_glfcns.glDisable (GL_DEPTH_TEST);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2278
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2279 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	2280 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2281 graphics_object go = (*it);
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 set_clipping (go.get_properties ().is_clipping ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2284 draw (go);
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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2287 set_clipping (false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2288
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2289 // FIXME: finalize rendering (transparency processing)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2290 // 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	2291
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2292 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	2293
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2294 octave_unused_parameter (props);
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 // 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	2297 // 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	2298
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2299 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	2300
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2301 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2302 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2303
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2304 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2305 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	2306 {
22258 553490ffc203 Fix compile error and warning with '--without-opengl' (bug #48724) Markus Mützel <markus.muetzel@gmx.de> parents: 22192 diff changeset	2307 #if defined (HAVE_OPENGL)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2308
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2309 // 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	2310 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	2311 return;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2312
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2313 // 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	2314 // pickable parts is "none".
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	2315 if (m_selecting && props.pickableparts_is ("none"))
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2316 return;
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2317
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2318 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	2319
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2320 double x_min = props.get_x_min ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2321 double x_max = props.get_x_max ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2322 double y_min = props.get_y_min ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2323 double y_max = props.get_y_max ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2324 double z_min = props.get_z_min ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2325 double z_max = props.get_z_max ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2326
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2327 if (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	2328 \|\| 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	2329 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2330 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	2331 return;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2332 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2333
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2334 setup_opengl_transformation (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2335
23863 56b7352fa456 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23859 diff changeset	2336 // 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	2337 // depth sorting
7148b237f94f Fix regression introduced by cset 06805aabbdd1 (bug #50750). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23807 diff changeset	2338 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	2339 if (is2D)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2340 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	2341 else
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2342 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	2343
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2344 draw_axes_planes (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2345
23546 06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	2346 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	2347 {
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_grids (props);
857b553177a5 Fix regression with axes lines layer (see bug #39692 comment #24) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24173 diff changeset	2349 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	2350 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	2351 }
22357 8f23b5b23235 Avoid grid overlaying axes box (bug #48842) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22349 diff changeset	2352
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2353 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	2354
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2355 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	2356
23546 06805aabbdd1 Draw 2D axes primitives in the children stack order (bug #50750) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23535 diff changeset	2357 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	2358 {
857b553177a5 Fix regression with axes lines layer (see bug #39692 comment #24) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24173 diff changeset	2359 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	2360 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	2361 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	2362 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2363
22258 553490ffc203 Fix compile error and warning with '--without-opengl' (bug #48724) Markus Mützel <markus.muetzel@gmx.de> parents: 22192 diff changeset	2364 #else
553490ffc203 Fix compile error and warning with '--without-opengl' (bug #48724) Markus Mützel <markus.muetzel@gmx.de> parents: 22192 diff changeset	2365
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2366 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2367
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2368 // 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	2369 // 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	2370
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2371 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	2372
553490ffc203 Fix compile error and warning with '--without-opengl' (bug #48724) Markus Mützel <markus.muetzel@gmx.de> parents: 22192 diff changeset	2373 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2374 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2375
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2376 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2377 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	2378 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2379 #if defined (HAVE_OPENGL)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2380
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	2381 bool draw_all = m_selecting && props.pickableparts_is ("all");
ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	2382
ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	2383 Matrix x = m_xform.xscale (props.get_xdata ().matrix_value ());
ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	2384 Matrix y = m_xform.yscale (props.get_ydata ().matrix_value ());
ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	2385 Matrix z = m_xform.zscale (props.get_zdata ().matrix_value ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2386
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2387 bool has_z = (z.numel () > 0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2388 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	2389 (has_z ? z.numel ()
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2390 : 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	2391 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	2392 uint8_t clip_ok = 0x40;
c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	2393
c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	2394 std::vector<uint8_t> clip (n);
22331 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 if (has_z)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2397 for (int i = 0; i < n; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2398 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	2399 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2400 {
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	2401 double z_mid = (m_zmin+m_zmax)/2;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2402
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2403 for (int i = 0; i < n; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2404 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	2405 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2406
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2407 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	2408 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2409 set_color (props.get_color_rgb ());
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	2410 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	2411 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	2412 set_linecap ("butt");
22759 39f39eb4e476 Implement "linejoin" property (bug #48387) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22755 diff changeset	2413 set_linejoin (props.get_linejoin ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2414
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2415 if (has_z)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2416 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2417 bool flag = false;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2418
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2419 for (int i = 1; i < n; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2420 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2421 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	2422 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2423 if (! flag)
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 flag = true;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2426 m_glfcns.glBegin (GL_LINE_STRIP);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2427 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	2428 }
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2429 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	2430 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2431 else if (flag)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2432 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2433 flag = false;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2434 m_glfcns.glEnd ();
22331 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 }
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 if (flag)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2439 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2440 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2441 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2442 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2443 bool flag = false;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2444
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2445 for (int i = 1; i < n; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2446 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2447 if ((clip[i-1] & clip[i]) == clip_ok)
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 if (! flag)
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 flag = true;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2452 m_glfcns.glBegin (GL_LINE_STRIP);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2453 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	2454 }
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2455 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	2456 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2457 else if (flag)
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 flag = false;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2460 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2461 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2462 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2463
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2464 if (flag)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2465 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2466 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2467
22358 dc73bbd66363 Make sure all lines associated with axes respect axes linewidth property. Rik <rik@octave.org> parents: 22357 diff changeset	2468 set_linewidth (0.5f);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2469 set_linestyle ("-");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2470 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2471
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2472 set_clipping (false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2473
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2474 if (! props.marker_is ("none")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2475 && ! (props.markeredgecolor_is ("none")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2476 && props.markerfacecolor_is ("none")))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2477 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2478 Matrix lc, fc;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2479
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2480 if (draw_all)
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2481 lc = Matrix (1, 3, 0.0);
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2482 else if (props.markeredgecolor_is ("auto"))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2483 lc = props.get_color_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2484 else if (! props.markeredgecolor_is ("none"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2485 lc = props.get_markeredgecolor_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2486
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2487 if (draw_all)
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2488 fc = Matrix (1, 3, 0.0);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2489 if (props.markerfacecolor_is ("auto"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2490 fc = props.get_color_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2491 else if (! props.markerfacecolor_is ("none"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2492 fc = props.get_markerfacecolor_rgb ();
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 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	2495 props.get_linewidth ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2496
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2497 for (int i = 0; i < n; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2498 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2499 if (clip[i] == clip_ok)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2500 draw_marker (x(i), y(i),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2501 has_z ? z(i) : 0.0,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2502 lc, fc);
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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2505 end_marker ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2506 }
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 set_clipping (props.is_clipping ());
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2509
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2510 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	2511
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2512 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2513
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2514 // 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	2515 // 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	2516
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2517 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	2518
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2519 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2520 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2521
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2522 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2523 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	2524 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2525 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2526
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	2527 bool draw_all = m_selecting && props.pickableparts_is ("all");
ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	2528
ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	2529 const Matrix x = m_xform.xscale (props.get_xdata ().matrix_value ());
ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	2530 const Matrix y = m_xform.yscale (props.get_ydata ().matrix_value ());
ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	2531 const Matrix z = m_xform.zscale (props.get_zdata ().matrix_value ());
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 int zr = z.rows ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2534 int zc = z.columns ();
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 NDArray c;
25867 49ffa78f9243 Use "facenormals" for flat lighting on surfaces (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25864 diff changeset	2537 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	2538 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	2539 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	2540 && 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	2541 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	2542 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	2543 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	2544 && fn_dims(2) == 3);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2545
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2546 // FIXME: handle transparency
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2547 Matrix a;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2548
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2549 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	2550 (props.facecolor_is ("flat") ? 1 :
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2551 (props.facecolor_is ("interp") ? 2 :
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2552 (props.facecolor_is ("texturemap") ? 3 : -1))));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2553 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	2554 (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	2555 (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	2556 (has_vertex_normals ? 2 : 0)));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2557 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	2558 (props.facealpha_is ("flat") ? 1 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2559 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	2560 (props.edgecolor_is ("flat") ? 1 :
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2561 (props.edgecolor_is ("interp") ? 2 : -1)));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2562 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	2563 (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	2564 (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	2565 (has_vertex_normals ? 2 : 0)));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2566 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	2567 (props.edgealpha_is ("flat") ? 1 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2568 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	2569 (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	2570 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	2571
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2572 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	2573 : props.get_facecolor_rgb ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2574 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	2575 double fa = 1.0;
22331 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 float as = props.get_ambientstrength ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2578 float ds = props.get_diffusestrength ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2579 float ss = props.get_specularstrength ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2580 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	2581 float scr = props.get_specularcolorreflectance ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2582 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	2583
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2584 opengl_texture tex (m_glfcns);
22331 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 int i1, i2, j1, j2;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2587 bool x_mat = (x.rows () == z.rows ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2588 bool y_mat = (y.columns () == z.columns ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2589
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2590 i1 = i2 = j1 = j2 = 0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2591
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2592 if ((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	2593 c = props.get_color_data ().array_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2594
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2595 boolMatrix clip (z.dims (), false);
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 for (int i = 0; i < zr; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2598 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2599 if (x_mat)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2600 i1 = i;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2601
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2602 for (int j = 0; j < zc; j++)
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 (y_mat)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2605 j1 = j;
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 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	2608 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2609 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2610
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2611 if (fa_mode > 0 \|\| ea_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2612 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2613 // FIXME: implement alphadata conversion
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2614 //a = props.get_alpha_data ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2615 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2616
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2617 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	2618 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	2619
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2620 // FIXME: good candidate for caching,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2621 // 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	2622 if (fc_mode == TEXTURE)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2623 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	2624
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	2625 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	2626 {
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	2627 if (fa_mode == 0)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2628 {
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	2629 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	2630 cb[3] = fa;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2631 if (fc_mode == UNIFORM \|\| fc_mode == TEXTURE)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2632 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2633 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	2634 if (fl_mode > 0)
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 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2637 cb[i] = as * fcolor(i);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2638 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	2639
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2640 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2641 cb[i] = ds * fcolor(i);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2642 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	2643
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2644 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2645 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	2646 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	2647 }
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
25423 13b1b9a0d9c5 Move management of lights in axes from GL to graphics backend. Markus Mützel <markus.muetzel@gmx.de> parents: 25419 diff changeset	2650 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	2651 m_glfcns.glEnable (GL_LIGHTING);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2652 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	2653 ? 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	2654 set_polygon_offset (true, 1.0);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2655 if (fc_mode == TEXTURE)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2656 m_glfcns.glEnable (GL_TEXTURE_2D);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2657
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2658 for (int i = 1; i < zc; i++)
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 (y_mat)
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 i1 = i-1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2663 i2 = i;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2664 }
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 for (int j = 1; j < zr; j++)
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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2669 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	2670 \|\| clip(j-1, i) \|\| clip(j, i))
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 if (fc_mode == FLAT)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2674 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2675 // "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	2676 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	2677 continue;
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 else if (fc_mode == INTERP)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2680 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2681 // "interp" needs valid color at all 4 vertices
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	2682 if (! (math::isfinite (c(j-1, i-1))
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	2683 && math::isfinite (c(j, i-1))
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	2684 && math::isfinite (c(j-1, i))
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	2685 && math::isfinite (c(j, i))))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2686 continue;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2687 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2688
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2689 if (x_mat)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2690 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2691 j1 = j-1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2692 j2 = j;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2693 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2694
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2695 m_glfcns.glBegin (GL_QUADS);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2696
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2697 // Vertex 1
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2698 if (fc_mode == TEXTURE)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2699 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	2700 double (j-1) / (zr-1));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2701 else if (fc_mode > 0)
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 // 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	2704 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2705 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	2706 m_glfcns.glColor4fv (cb);
22331 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)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2709 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2710 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2711 cb[k] *= as;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2712 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	2713
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2714 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2715 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	2716 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	2717
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2718 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2719 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	2720 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	2721 }
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)
25867 49ffa78f9243 Use "facenormals" for flat lighting on surfaces (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25864 diff changeset	2724 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	2725 j-1, i-1);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2726
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2727 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	2728
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2729 // Vertex 2
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2730 if (fc_mode == TEXTURE)
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	2731 tex.tex_coord (double (i) / (zc-1),
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	2732 double (j-1) / (zr-1));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2733 else if (fc_mode == INTERP)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2734 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2735 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2736 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	2737 m_glfcns.glColor4fv (cb);
22331 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 > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2740 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2741 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2742 cb[k] *= as;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2743 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	2744
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2745 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2746 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	2747 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	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] = 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	2751 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	2752 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2753 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2754
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2755 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	2756 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	2757
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2758 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	2759
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2760 // Vertex 3
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2761 if (fc_mode == TEXTURE)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2762 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	2763 else if (fc_mode == INTERP)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2764 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2765 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2766 cb[k] = c(j, i, k);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2767 m_glfcns.glColor4fv (cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2768
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2769 if (fl_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2770 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2771 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2772 cb[k] *= as;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2773 m_glfcns.glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2774
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2775 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2776 cb[k] = ds * c(j, i, k);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2777 m_glfcns.glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2778
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2779 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2780 cb[k] = ss * (scr + (1-scr) * c(j, i, k));
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2781 m_glfcns.glMaterialfv (LIGHT_MODE, GL_SPECULAR, cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2782 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2783 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2784 if (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	2785 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	2786
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2787 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	2788
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2789 // Vertex 4
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2790 if (fc_mode == TEXTURE)
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	2791 tex.tex_coord (double (i-1) / (zc-1),
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	2792 double (j) / (zr-1));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2793 else if (fc_mode == INTERP)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2794 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2795 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2796 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	2797 m_glfcns.glColor4fv (cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2798
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2799 if (fl_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2800 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2801 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2802 cb[k] *= as;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2803 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	2804
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2805 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2806 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	2807 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	2808
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2809 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2810 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	2811 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	2812 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2813 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2814 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	2815 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	2816
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2817 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	2818
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2819 m_glfcns.glEnd ();
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 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2822
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2823 set_polygon_offset (false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2824 if (fc_mode == TEXTURE)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2825 m_glfcns.glDisable (GL_TEXTURE_2D);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2826
25423 13b1b9a0d9c5 Move management of lights in axes from GL to graphics backend. Markus Mützel <markus.muetzel@gmx.de> parents: 25419 diff changeset	2827 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	2828 m_glfcns.glDisable (GL_LIGHTING);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2829 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2830 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2831 {
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	2832 // 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	2833 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2834 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2835
22391 c5da5e5e9846 Fix inconsistent on-screen/printout patch and surface edges (bug #48873). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22369 diff changeset	2836 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	2837 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2838 if (props.get_edgealpha_double () == 1)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2839 {
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	2840 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	2841 if (ec_mode == UNIFORM)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2842 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2843 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	2844 if (el_mode > 0)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2845 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2846 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2847 cb[i] = as * ecolor(i);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2848 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	2849
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2850 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2851 cb[i] = ds * ecolor(i);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2852 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	2853
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2854 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2855 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	2856 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	2857 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2858 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2859
25423 13b1b9a0d9c5 Move management of lights in axes from GL to graphics backend. Markus Mützel <markus.muetzel@gmx.de> parents: 25419 diff changeset	2860 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	2861 m_glfcns.glEnable (GL_LIGHTING);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2862 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	2863 ? GL_SMOOTH : GL_FLAT);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2864
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	2865 set_linestyle (props.get_linestyle (), false,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	2866 props.get_linewidth ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2867 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	2868 set_linecap ("butt");
22759 39f39eb4e476 Implement "linejoin" property (bug #48387) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22755 diff changeset	2869 set_linejoin ("miter");
22331 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 // Mesh along Y-axis
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 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	2874 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2875 for (int i = 0; i < zc; i++)
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 if (y_mat)
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 i1 = i-1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2880 i2 = i;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2881 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2882
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2883 for (int j = 1; j < zr; j++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2884 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2885 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	2886 continue;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2887
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2888 if (ec_mode == FLAT)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2889 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2890 // "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	2891 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	2892 continue;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2893 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2894 else if (ec_mode == INTERP)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2895 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2896 // "interp" needs valid color at both vertices
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	2897 if (! (math::isfinite (c(j-1, i))
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	2898 && math::isfinite (c(j, i))))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2899 continue;
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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2902 if (x_mat)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2903 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2904 j1 = j-1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2905 j2 = j;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2906 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2907
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2908 m_glfcns.glBegin (GL_LINES);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2909
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2910 // Vertex 1
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2911 if (ec_mode > 0)
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 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2914 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	2915 m_glfcns.glColor3fv (cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2916
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2917 if (el_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2918 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2919 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2920 cb[k] *= as;
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	2921 m_glfcns.glMaterialfv (LIGHT_MODE, GL_AMBIENT,
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	2922 cb);
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 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2925 cb[k] = ds * c(j-1, i, k);
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	2926 m_glfcns.glMaterialfv (LIGHT_MODE, GL_DIFFUSE,
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	2927 cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2928
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2929 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2930 cb[k] = ss * (scr + (1-scr) * c(j-1, i, k));
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	2931 m_glfcns.glMaterialfv (LIGHT_MODE, GL_SPECULAR,
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	2932 cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2933 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2934 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2935 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	2936 {
dd40f9650821 Avoid heap-buffer-overflow with facenormals on surface edges (bug #48519). Markus Mützel <markus.muetzel@gmx.de> parents: 26430 diff changeset	2937 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	2938 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	2939 else
dd40f9650821 Avoid heap-buffer-overflow with facenormals on surface edges (bug #48519). Markus Mützel <markus.muetzel@gmx.de> parents: 26430 diff changeset	2940 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	2941 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2942
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2943 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	2944
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2945 // Vertex 2
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2946 if (ec_mode == INTERP)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2947 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2948 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2949 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	2950 m_glfcns.glColor3fv (cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2951
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2952 if (el_mode > 0)
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 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2955 cb[k] *= as;
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	2956 m_glfcns.glMaterialfv (LIGHT_MODE, GL_AMBIENT,
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	2957 cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2958
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2959 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2960 cb[k] = ds * c(j, i, k);
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	2961 m_glfcns.glMaterialfv (LIGHT_MODE, GL_DIFFUSE,
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	2962 cb);
22331 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 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2965 cb[k] = ss * (scr + (1-scr) * c(j, i, k));
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	2966 m_glfcns.glMaterialfv (LIGHT_MODE, GL_SPECULAR,
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	2967 cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2968 }
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 (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	2971 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	2972
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2973 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	2974
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	2975 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2976 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2977 }
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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2980 // Mesh along X-axis
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2981
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2982 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	2983 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2984 for (int j = 0; j < zr; j++)
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 (x_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 j1 = j-1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2989 j2 = j;
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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2992 for (int i = 1; i < zc; i++)
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 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	2995 continue;
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 if (ec_mode == FLAT)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2998 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2999 // "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	3000 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	3001 continue;
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 else if (ec_mode == INTERP)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3004 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3005 // "interp" needs valid color at both vertices
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	3006 if (! (math::isfinite (c(j, i-1))
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	3007 && math::isfinite (c(j, i))))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3008 continue;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3009 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3010
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3011 if (y_mat)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3012 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3013 i1 = i-1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3014 i2 = i;
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
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3017 m_glfcns.glBegin (GL_LINES);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3018
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3019 // Vertex 1
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3020 if (ec_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3021 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3022 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3023 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	3024 m_glfcns.glColor3fv (cb);
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 if (el_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3027 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3028 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3029 cb[k] *= as;
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	3030 m_glfcns.glMaterialfv (LIGHT_MODE, GL_AMBIENT,
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	3031 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 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3034 cb[k] = ds * c(j, i-1, k);
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	3035 m_glfcns.glMaterialfv (LIGHT_MODE, GL_DIFFUSE,
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	3036 cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3037
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3038 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3039 cb[k] = ss * (scr + (1-scr) * c(j, i-1, k));
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	3040 m_glfcns.glMaterialfv (LIGHT_MODE, GL_SPECULAR,
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	3041 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 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3044 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	3045 {
dd40f9650821 Avoid heap-buffer-overflow with facenormals on surface edges (bug #48519). Markus Mützel <markus.muetzel@gmx.de> parents: 26430 diff changeset	3046 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	3047 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	3048 else
dd40f9650821 Avoid heap-buffer-overflow with facenormals on surface edges (bug #48519). Markus Mützel <markus.muetzel@gmx.de> parents: 26430 diff changeset	3049 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	3050 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3051
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3052 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	3053
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3054 // Vertex 2
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3055 if (ec_mode == INTERP)
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 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3058 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	3059 m_glfcns.glColor3fv (cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3060
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3061 if (el_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3062 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3063 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3064 cb[k] *= as;
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	3065 m_glfcns.glMaterialfv (LIGHT_MODE, GL_AMBIENT,
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	3066 cb);
22331 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 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3069 cb[k] = ds * c(j, i, k);
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	3070 m_glfcns.glMaterialfv (LIGHT_MODE, GL_DIFFUSE,
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	3071 cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3072
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3073 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3074 cb[k] = ss * (scr + (1-scr) * c(j, i, k));
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	3075 m_glfcns.glMaterialfv (LIGHT_MODE, GL_SPECULAR,
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	3076 cb);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3077 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3078 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3079 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	3080 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	3081
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3082 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	3083
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3084 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3085 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3086 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3087 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3088
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	3089 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	3090 set_linewidth (0.5f);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3091
25423 13b1b9a0d9c5 Move management of lights in axes from GL to graphics backend. Markus Mützel <markus.muetzel@gmx.de> parents: 25419 diff changeset	3092 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	3093 m_glfcns.glDisable (GL_LIGHTING);
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 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3096 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3097 // FIXME: implement transparency
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3098 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3099 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3100
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3101 if (! props.marker_is ("none")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3102 && ! (props.markeredgecolor_is ("none")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3103 && props.markerfacecolor_is ("none")))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3104 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3105 // 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	3106 // 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	3107 // and facecolor set to none.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3108
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3109 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	3110 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	3111
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3112 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	3113 props.get_markeredgecolor_rgb ());
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3114 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	3115 props.get_markerfacecolor_rgb ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3116 Matrix cc (1, 3, 0.0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3117
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	3118 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	3119 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3120 mecolor = props.get_edgecolor_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3121 do_edge = ! props.edgecolor_is ("none");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3122 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3123
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	3124 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	3125 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3126 mfcolor = props.get_facecolor_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3127 do_face = ! props.facecolor_is ("none");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3128 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3129
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	3130 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	3131 c = props.get_color_data ().array_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3132
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3133 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	3134 props.get_linewidth ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3135
25896 c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	3136 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	3137 uint8_t clip_ok = 0x40;
c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	3138
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3139 for (int i = 0; i < zc; i++)
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 if (y_mat)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3142 i1 = i;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3143
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3144 for (int j = 0; j < zr; j++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3145 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3146 if (x_mat)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3147 j1 = j;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3148
25896 c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	3149 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	3150 != clip_ok)
c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	3151 continue;
c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	3152
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	3153 if ((do_edge && mecolor.isempty ())
80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	3154 \|\| (do_face && mfcolor.isempty ()))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3155 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3156 if (! math::isfinite (c(j,i)))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3157 continue; // Skip NaNs in color data
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3158
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3159 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3160 cc(k) = c(j,i,k);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3161 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3162
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	3163 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	3164 : Matrix ());
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	3165 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	3166 : Matrix ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3167
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3168 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	3169 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3170 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3171
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3172 end_marker ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3173 }
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3174
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3175 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3176
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3177 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3178
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3179 // 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	3180 // 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	3181
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3182 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3183
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3184 #endif
22331 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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3187 // FIXME: global optimization (rendering, data structures...),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3188 // 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	3189 void
23433 c9fab0bc983e maint: Use convention 'int& x' for naming references. Rik <rik@octave.org> parents: 23396 diff changeset	3190 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	3191 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3192 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3193
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3194 // 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	3195 std::string msg;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3196 if (props.has_bad_data (msg))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3197 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3198 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	3199 return;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3200 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3201
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	3202 bool draw_all = m_selecting && props.pickableparts_is ("all");
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3203 const Matrix f = props.get_faces ().matrix_value ();
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	3204 const Matrix v = m_xform.scale (props.get_vertices ().matrix_value ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3205 Matrix c;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3206 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	3207 double fa = 1.0;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3208
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3209 int nv = v.rows ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3210 int nf = f.rows ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3211 int fcmax = f.columns ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3212
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3213 bool has_z = (v.columns () > 2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3214 bool has_facecolor = false;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3215 bool has_facealpha = false;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3216
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3217 int fc_mode = ((props.facecolor_is ("none")
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3218 \|\| 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	3219 (props.facecolor_is ("flat") ? 1 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3220 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	3221 (props.facelighting_is ("flat") ? 1 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3222 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	3223 (props.facealpha_is ("flat") ? 1 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3224 int ec_mode = ((props.edgecolor_is ("none")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3225 \|\| props.edgecolor_is_rgb ()) ? 0 :
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3226 (props.edgecolor_is ("flat") ? 1 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3227 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	3228 (props.edgelighting_is ("flat") ? 1 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3229 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	3230 (props.edgealpha_is ("flat") ? 1 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3231 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	3232 (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	3233 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	3234
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3235 Matrix fcolor = props.get_facecolor_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3236 Matrix ecolor = props.get_edgecolor_rgb ();
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 float as = props.get_ambientstrength ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3239 float ds = props.get_diffusestrength ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3240 float ss = props.get_specularstrength ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3241 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	3242 float scr = props.get_specularcolorreflectance ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3243
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3244 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	3245 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	3246 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	3247 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	3248
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3249 boolMatrix clip (1, nv, false);
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 if (has_z)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3252 for (int i = 0; i < nv; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3253 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	3254 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3255 for (int i = 0; i < nv; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3256 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	3257
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3258 boolMatrix clip_f (1, nf, false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3259 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	3260
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3261 for (int i = 0; i < nf; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3262 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3263 bool fclip = false;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3264 int count = 0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3265
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23577 diff changeset	3266 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	3267 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	3268
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3269 clip_f(i) = fclip;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3270 count_f(i) = count;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3271 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3272
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3273 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	3274 {
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3275 if (draw_all)
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3276 c = Matrix (1, 3, 0.0);
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3277 else
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3278 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	3279
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3280 if (c.rows () == 1)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3281 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3282 // 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	3283
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3284 if (draw_all \|\| fc_mode > 0)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3285 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3286 fcolor = c;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3287 fc_mode = UNIFORM;
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
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3290 if (draw_all \|\| ec_mode > 0)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3291 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3292 ecolor = c;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3293 ec_mode = UNIFORM;
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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3296 c = Matrix ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3297 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3298 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3299 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	3300 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3301
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3302 if (fa_mode > 0 \|\| ea_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3303 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3304 // FIXME: retrieve alpha data from patch object
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3305 //a = props.get_alpha_data ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3306 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	3307 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3308
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	3309 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	3310 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	3311
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3312 octave_idx_type fr = f.rows ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3313 std::vector<vertex_data> vdata (f.numel ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3314
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3315 for (int i = 0; i < nf; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3316 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	3317 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3318 int idx = int (f(i,j) - 1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3319
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3320 Matrix vv (1, 3, 0.0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3321 Matrix cc;
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3322 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	3323 Matrix fnn (1, 3, 0.0);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3324 double aa = 1.0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3325
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3326 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	3327 if (has_z)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3328 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	3329 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	3330 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3331 double dir = 1.0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3332 if (bfl_mode > 0)
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	3333 dir = ((fn(i,0) * m_view_vector(0)
ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	3334 + fn(i,1) * m_view_vector(1)
ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	3335 + fn(i,2) * m_view_vector(2) < 0)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3336 ? ((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	3337 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	3338 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	3339 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	3340 }
27277 db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 26995 diff changeset	3341 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	3342 {
218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3343 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	3344 if (bfl_mode > 0)
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	3345 dir = ((vn(idx,0) * m_view_vector(0)
ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	3346 + vn(idx,1) * m_view_vector(1)
ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	3347 + vn(idx,2) * m_view_vector(2) < 0)
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3348 ? ((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	3349 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	3350 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	3351 vnn(2) = dir * vn(idx,2);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3352 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3353 if (c.numel () > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3354 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3355 cc.resize (1, 3);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3356 if (has_facecolor)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3357 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	3358 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3359 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	3360 }
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	3361 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	3362 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	3363 else if (a.numel () > 0)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3364 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3365 if (has_facealpha)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3366 aa = a(i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3367 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3368 aa = a(idx);
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
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	3371 vdata[i+j*fr]
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	3372 = 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	3373 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3374
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3375 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	3376 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	3377
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3378 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	3379 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3380 // 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	3381 if (fa_mode == 0)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3382 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3383 if (fc_mode == UNIFORM)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3384 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3385 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	3386 if (fl_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3387 {
28006 91316b5dc5a2 Only use ambient light for edge lighting on patches (bug #57553). Markus Mützel <markus.muetzel@gmx.de> parents: 27992 diff changeset	3388 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	3389
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3390 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3391 cb[i] = as * fcolor(i);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3392 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	3393
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3394 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3395 cb[i] = ds * fcolor(i);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3396 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	3397
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3398 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3399 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	3400 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	3401 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3402 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3403
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3404 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	3405 m_glfcns.glEnable (GL_LIGHTING);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3406
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3407 // 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	3408 // 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	3409 // 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	3410 // 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	3411 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	3412
27798 8c1cb06468db Change class of coplanar_last_idx for patch objects (bug #55895). Markus Mützel <markus.muetzel@gmx.de> parents: 27767 diff changeset	3413 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	3414 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	3415
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3416 for (int i = 0; i < nf; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3417 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3418 if (clip_f(i))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3419 continue;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3420
25419 7361fd8aed86 Fix segmentation fault with last change (bug #47677). Markus Mützel <markus.muetzel@gmx.de> parents: 25418 diff changeset	3421 bool is_non_planar = false;
30040 805357e6b058 maint: use "m_" prefix for member variables of graphics objects. Rik <rik@octave.org> parents: 29886 diff changeset	3422 if (props.m_coplanar_last_idx.size () > 0
805357e6b058 maint: use "m_" prefix for member variables of graphics objects. Rik <rik@octave.org> parents: 29886 diff changeset	3423 && props.m_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	3424 {
25419 7361fd8aed86 Fix segmentation fault with last change (bug #47677). Markus Mützel <markus.muetzel@gmx.de> parents: 25418 diff changeset	3425 is_non_planar = true;
30040 805357e6b058 maint: use "m_" prefix for member variables of graphics objects. Rik <rik@octave.org> parents: 29886 diff changeset	3426 it = props.m_coplanar_last_idx[i].end ();
27798 8c1cb06468db Change class of coplanar_last_idx for patch objects (bug #55895). Markus Mützel <markus.muetzel@gmx.de> parents: 27767 diff changeset	3427 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	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 // 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	3431 do
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3432 {
25419 7361fd8aed86 Fix segmentation fault with last change (bug #47677). Markus Mützel <markus.muetzel@gmx.de> parents: 25418 diff changeset	3433 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	3434 {
27798 8c1cb06468db Change class of coplanar_last_idx for patch objects (bug #55895). Markus Mützel <markus.muetzel@gmx.de> parents: 27767 diff changeset	3435 i_end = *it;
30040 805357e6b058 maint: use "m_" prefix for member variables of graphics objects. Rik <rik@octave.org> parents: 29886 diff changeset	3436 if (it == props.m_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	3437 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	3438 else
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3439 {
27798 8c1cb06468db Change class of coplanar_last_idx for patch objects (bug #55895). Markus Mützel <markus.muetzel@gmx.de> parents: 27767 diff changeset	3440 it--;
8c1cb06468db Change class of coplanar_last_idx for patch objects (bug #55895). Markus Mützel <markus.muetzel@gmx.de> parents: 27767 diff changeset	3441 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	3442 }
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3443 }
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3444 else
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 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	3447 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	3448 }
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 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	3451 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	3452
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3453 // 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	3454 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	3455 {
27277 db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 26995 diff changeset	3456 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	3457 = 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	3458
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	3459 tess.add_vertex (vv->m_coords.fortran_vec (), vv);
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 }
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3461
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3462 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	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 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	3465
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3466 if (fc_mode == FLAT)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3467 {
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3468 // For "flat" shading, use color of 1st vertex.
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	3469 Matrix col = vv->m_color;
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3470
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3471 if (col.numel () == 3)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3472 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3473 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	3474 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	3475 {
28006 91316b5dc5a2 Only use ambient light for edge lighting on patches (bug #57553). Markus Mützel <markus.muetzel@gmx.de> parents: 27992 diff changeset	3476 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	3477
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3478 for (int k = 0; k < 3; k++)
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	3479 cb[k] = (vv->m_ambient * col(k));
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	3480 m_glfcns.glMaterialfv (LIGHT_MODE,
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	3481 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	3482
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3483 for (int k = 0; k < 3; k++)
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	3484 cb[k] = (vv->m_diffuse * col(k));
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	3485 m_glfcns.glMaterialfv (LIGHT_MODE,
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	3486 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	3487
762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3488 for (int k = 0; k < 3; k++)
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	3489 cb[k] = vv->m_specular *
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	3490 (vv->m_specular_color_refl
c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	3491 + (1-vv->m_specular_color_refl) *
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3492 col(k));
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	3493 m_glfcns.glMaterialfv (LIGHT_MODE,
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	3494 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	3495 }
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 }
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3498
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	3499 tess.add_vertex (vv->m_coords.fortran_vec (), vv);
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
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3502 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	3503 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	3504 } while (i_start > 0);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3505 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3506
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3507 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	3508 m_glfcns.glDisable (GL_LIGHTING);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3509 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3510 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3511 {
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	3512 // FIXME: implement flat and interp transparency
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3513 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3514 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3515
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3516 if (draw_all
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3517 \|\| (! 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	3518 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3519 // FIXME: adapt to double-radio property
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3520 if (props.get_edgealpha_double () == 1)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3521 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3522 if (ec_mode == UNIFORM)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3523 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3524 m_glfcns.glColor3dv (ecolor.data ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3525 if (el_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3526 {
28006 91316b5dc5a2 Only use ambient light for edge lighting on patches (bug #57553). Markus Mützel <markus.muetzel@gmx.de> parents: 27992 diff changeset	3527 // 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	3528 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	3529 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	3530 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	3531
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3532 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3533 cb[i] = (as * ecolor(i));
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3534 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	3535 }
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
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3538 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	3539 m_glfcns.glEnable (GL_LIGHTING);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3540
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	3541 double linewidth = props.get_linewidth ();
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	3542 set_linestyle (props.get_linestyle (), false, linewidth);
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	3543 set_linewidth (linewidth);
22838 1444a65085ca Make axes corners join in printout (bug #39643) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22759 diff changeset	3544 set_linecap ("butt");
22759 39f39eb4e476 Implement "linejoin" property (bug #48387) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22755 diff changeset	3545 set_linejoin ("miter");
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3546
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	3547 // NOTE: patch contour cannot be offset. Offset must occur with
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	3548 // the 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	3549 // 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	3550 // 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	3551 // 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	3552 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	3553
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3554 for (int i = 0; i < nf; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3555 {
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3556 bool is_non_planar = false;
30040 805357e6b058 maint: use "m_" prefix for member variables of graphics objects. Rik <rik@octave.org> parents: 29886 diff changeset	3557 if (props.m_coplanar_last_idx.size () > 0
805357e6b058 maint: use "m_" prefix for member variables of graphics objects. Rik <rik@octave.org> parents: 29886 diff changeset	3558 && props.m_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	3559 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	3560 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	3561 {
25418 762eb2e33a7f Enable support of non-coplanar faces in patches for OpenGL (bug #47677). Markus Muetzel <markus.muetzel@gmx.de> parents: 25260 diff changeset	3562 // 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	3563 // Draw it as a line.
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3564 bool flag = false;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3565
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	3566 m_glfcns.glShadeModel ((ec_mode == INTERP
5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	3567 \|\| el_mode == GOURAUD)
27932 b018f553fd85 maint: Use Octave coding conventions in libinterp/ Rik <rik@octave.org> parents: 27923 diff changeset	3568 ? GL_SMOOTH : GL_FLAT);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3569
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3570 // 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	3571 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	3572 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3573 if (! clip(int (f(i,j) - 1)))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3574 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3575 vertex_data::vertex_data_rep *vv
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3576 = vdata[i+j*fr].get_rep ();
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	3577 const Matrix m = vv->m_coords;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3578 if (! flag)
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 flag = true;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3581 m_glfcns.glBegin (GL_LINE_STRIP);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3582 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3583 if (ec_mode != UNIFORM)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3584 {
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	3585 Matrix col = vv->m_color;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3586
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3587 if (col.numel () == 3)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3588 m_glfcns.glColor3dv (col.data ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3589 }
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3590 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	3591 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3592 else if (flag)
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 flag = false;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3595 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3596 }
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 // 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	3599 // from vertex 0 to vertex N.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3600 int j = count_f(i)-1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3601 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	3602 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3603 vertex_data::vertex_data_rep *vv
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3604 = vdata[i+j*fr].get_rep ();
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	3605 const Matrix m = vv->m_coords;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3606 if (ec_mode != UNIFORM)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3607 {
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	3608 Matrix col = vv->m_color;
22331 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 if (col.numel () == 3)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3611 m_glfcns.glColor3dv (col.data ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3612 }
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3613 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	3614 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3615
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3616 if (flag)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3617 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3618 }
27979 cd7f8df11669 fix spelling of tessellate on default branch (bug #57613) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	3619 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	3620 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3621 tess.begin_polygon (false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3622 tess.begin_contour ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3623
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3624 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	3625 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3626 vertex_data::vertex_data_rep *vv
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3627 = vdata[i+j*fr].get_rep ();
29427 c850a9cd28f6 use std::shared_ptr and m_ prefix for vertex_data and opengl_texture classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	3628 tess.add_vertex (vv->m_coords.fortran_vec (), vv);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3629 }
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 tess.end_contour ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3632 tess.end_polygon ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3633 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3634 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3635
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	3636 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	3637 set_linewidth (0.5f);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3638
25820 218feb083dcc Use "facenormals" for flat lighting on patches (bug #54024). Markus Mützel <markus.muetzel@gmx.de> parents: 25688 diff changeset	3639 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	3640 m_glfcns.glDisable (GL_LIGHTING);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3641 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3642 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3643 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3644 // FIXME: implement transparency
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3645 }
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 if (! props.marker_is ("none")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3649 && ! (props.markeredgecolor_is ("none")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3650 && props.markerfacecolor_is ("none")))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3651 {
24523 501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3652 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	3653 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	3654
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3655 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	3656 props.get_markeredgecolor_rgb ());
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3657 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	3658 props.get_markerfacecolor_rgb ());
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3659
501986e12b8b Implement "pickableparts" property (bug #52795). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24183 diff changeset	3660 bool has_markerfacecolor = draw_all \|\| false;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3661
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	3662 if ((mecolor.isempty () && ! props.markeredgecolor_is ("none"))
80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	3663 \|\| (mfcolor.isempty () && ! props.markerfacecolor_is ("none")))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3664 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3665 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	3666
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3667 if (mc.rows () == 1)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3668 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3669 // 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	3670 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	3671 mfcolor = mc;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3672
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	3673 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	3674 mecolor = mc;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3675 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3676 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3677 {
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	3678 if (c.isempty ())
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3679 c = props.get_color_data ().matrix_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3680 has_markerfacecolor = ((c.numel () > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3681 && (c.rows () == f.rows ()));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3682 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3683 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3684
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3685 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	3686 props.get_linewidth ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3687
25896 c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	3688 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	3689 uint8_t clip_ok = 0x40;
c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	3690
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3691 for (int i = 0; i < nf; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3692 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	3693 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3694 int idx = int (f(i,j) - 1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3695
25896 c1cd5561d1dc Fix clipping of patch/surface markers (bug #54690) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	3696 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	3697 & clip_mask) != clip_ok)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3698 continue;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3699
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3700 Matrix cc;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3701 if (c.numel () > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3702 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3703 cc.resize (1, 3);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3704 if (has_markerfacecolor)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3705 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	3706 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3707 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	3708 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3709
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	3710 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	3711 : Matrix ());
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23564 diff changeset	3712 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	3713 : Matrix ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3714
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3715 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	3716 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3717
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3718 end_marker ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3719 }
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3720
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3721 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3722
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3723 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3724
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3725 // 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	3726 // 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	3727
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3728 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3729
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3730 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3731 }
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 void
28286 496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3734 opengl_renderer::draw_scatter (const scatter::properties& props)
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3735 {
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3736 #if defined (HAVE_OPENGL)
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3737
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3738 // Do not render if the scatter object has incoherent data
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3739 std::string msg;
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3740 if (props.has_bad_data (msg))
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3741 {
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3742 warning ("opengl_renderer: %s. Not rendering.", msg.c_str ());
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3743 return;
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3744 }
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3745
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	3746 bool draw_all = m_selecting;
28286 496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3747
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3748 if (draw_all \|\| (! props.marker_is ("none")
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3749 && ! (props.markeredgecolor_is ("none")
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3750 && props.markerfacecolor_is ("none"))))
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3751 {
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3752 bool do_edge = draw_all \|\| ! props.markeredgecolor_is ("none");
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3753 bool do_face = draw_all \|\| ! props.markerfacecolor_is ("none");
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3754
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3755 const Matrix x = props.get_xdata ().matrix_value ();
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3756 const Matrix y = props.get_ydata ().matrix_value ();
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3757 const Matrix z = props.get_zdata ().matrix_value ();
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3758 const Matrix c = props.get_color_data ().matrix_value ();
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3759 const Matrix s = props.get_sizedata ().matrix_value ();
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3760
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3761 int np = x.rows ();
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3762 bool has_z = ! z.isempty ();
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3763
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3764 // If markeredgecolor is "flat", mecolor is empty
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3765 Matrix mecolor = (draw_all ? Matrix (1, 3, 0.0) :
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3766 props.get_markeredgecolor_rgb ());
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3767 Matrix mfcolor = (draw_all ? Matrix (1, 3, 0.0) :
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3768 props.get_markerfacecolor_rgb ());
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3769 const double mea = props.get_markeredgealpha ();
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3770 const double mfa = props.get_markerfacealpha ();
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3771
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3772 if (props.markerfacecolor_is ("auto"))
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3773 {
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3774 gh_manager& gh_mgr
28857 43ad651cf5a0 eliminate unnecessary uses of octave:: namespace qualifier John W. Eaton <jwe@octave.org> parents: 28763 diff changeset	3775 = __get_gh_manager__ ("opengl_renderer::draw_scatter");
28286 496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3776 graphics_object go = gh_mgr.get_object (props.get___myhandle__ ());
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3777 graphics_object ax = go.get_ancestor ("axes");
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3778 const axes::properties& ax_props
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3779 = dynamic_cast<const axes::properties&> (ax.get_properties ());
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3780
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3781 mfcolor = ax_props.get_color ().matrix_value ();
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3782 }
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3783
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3784 init_marker (props.get_marker (), std::sqrt (s(0)),
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3785 props.get_linewidth ());
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3786
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3787 uint8_t clip_mask = (props.is_clipping () ? 0x7F : 0x40);
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3788 uint8_t clip_ok = 0x40;
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3789
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3790 Matrix cc;
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3791 if (! c.isempty ())
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3792 {
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3793 if (c.rows () == 1)
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3794 cc = c;
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3795 else
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3796 {
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3797 cc.resize (1, 3);
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3798 cc(0) = c(0,0);
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3799 cc(1) = c(0,1);
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3800 cc(2) = c(0,2);
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3801 }
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3802 }
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3803
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3804 for (int i = 0; i < np; i++)
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3805 {
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3806 if ((clip_code (x(i), y(i), (has_z ? z(i) : 0.0)) & clip_mask)
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3807 != clip_ok)
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3808 continue;
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3809
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3810 if (c.rows () > 1)
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3811 {
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3812 cc(0) = c(i,0);
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3813 cc(1) = c(i,1);
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3814 cc(2) = c(i,2);
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3815 }
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3816
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3817 Matrix lc = (do_edge ? (mecolor.isempty () ? cc : mecolor)
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3818 : Matrix ());
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3819 Matrix fc = (do_face ? (mfcolor.isempty () ? cc : mfcolor)
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3820 : Matrix ());
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3821
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3822 if (s.numel () > 1)
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3823 change_marker (props.get_marker (), std::sqrt (s(i)));
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3824
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3825 draw_marker (x(i), y(i), (has_z ? z(i) : 0.0), lc, fc, mea, mfa);
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3826 }
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3827
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3828 end_marker ();
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3829 }
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3830
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3831 #else
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3832
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3833 octave_unused_parameter (props);
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3834
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3835 // This shouldn't happen because construction of opengl_renderer
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3836 // objects is supposed to be impossible if OpenGL is not available.
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3837
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3838 panic_impossible ();
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3839
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3840 #endif
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3841 }
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3842
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	3843 void
23433 c9fab0bc983e maint: Use convention 'int& x' for naming references. Rik <rik@octave.org> parents: 23396 diff changeset	3844 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	3845 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3846 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3847
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3848 // enable light source
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3849 m_glfcns.glEnable (m_current_light);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3850
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3851 // light position
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3852 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	3853 Matrix lpos = props.get_position ().matrix_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3854 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3855 pos[i] = lpos(i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3856 if (props.style_is ("local"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3857 pos[3] = 1;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3858 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	3859
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3860 // light color
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3861 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	3862 Matrix lcolor = props.get_color ().matrix_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3863 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3864 col[i] = lcolor(i);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	3865 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	3866 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	3867
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3868 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3869
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3870 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3871
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3872 // 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	3873 // 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	3874
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3875 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3876
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3877 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3878 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3879
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3880 void
23433 c9fab0bc983e maint: Use convention 'int& x' for naming references. Rik <rik@octave.org> parents: 23396 diff changeset	3881 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	3882 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3883 draw (props.get_children ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3884 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3885
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3886 void
29433 8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3887 opengl_renderer::set_ortho_coordinates (void)
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3888 {
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3889 #if defined (HAVE_OPENGL)
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3890
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3891 m_glfcns.glMatrixMode (GL_PROJECTION);
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3892 m_glfcns.glPushMatrix ();
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3893 m_glfcns.glLoadIdentity ();
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3894
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3895 Matrix vp = get_viewport_scaled ();
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	3896 m_glfcns.glOrtho (0, vp(2), vp(3), 0, m_xZ1, m_xZ2);
29433 8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3897 m_glfcns.glMatrixMode (GL_MODELVIEW);
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3898 m_glfcns.glPushMatrix ();
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3899 m_glfcns.glLoadIdentity ();
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3900
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3901 #else
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3902
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3903 // This shouldn't happen because construction of opengl_renderer
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3904 // objects is supposed to be impossible if OpenGL is not available.
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3905
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3906 panic_impossible ();
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3907
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3908 #endif
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3909 }
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3910
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3911 void
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3912 opengl_renderer::restore_previous_coordinates (void)
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3913 {
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3914 #if defined (HAVE_OPENGL)
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3915
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3916 // Restore previous coordinate system
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3917 m_glfcns.glMatrixMode (GL_MODELVIEW);
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3918 m_glfcns.glPopMatrix();
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3919 m_glfcns.glMatrixMode (GL_PROJECTION);
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3920 m_glfcns.glPopMatrix();
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3921
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3922 #else
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3923
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3924 // This shouldn't happen because construction of opengl_renderer
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3925 // objects is supposed to be impossible if OpenGL is not available.
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3926
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3927 panic_impossible ();
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3928
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3929 #endif
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3930 }
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3931
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3932 void
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3933 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	3934 {
21789 6afdf40be534 Implement graphics object "light" (patch #8943). mmuetzel <markus.muetzel@gmx.de> parents: 21782 diff changeset	3935 #if defined (HAVE_OPENGL)
6afdf40be534 Implement graphics object "light" (patch #8943). mmuetzel <markus.muetzel@gmx.de> parents: 21782 diff changeset	3936
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	3937 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	3938 return;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3939
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	3940 Matrix pos = m_xform.scale (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	3941
29433 8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3942 // Handle clipping manually when drawing text in ortho coordinates
25951 7a507e71d922 style fixes John W. Eaton <jwe@octave.org> parents: 25260 diff changeset	3943 if (! props.is_clipping ()
25952 12d4271aed87 maint: Merge stable to default. John W. Eaton <jwe@octave.org> parents: 25896 25951 diff changeset	3944 \|\| (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	3945 {
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3946 set_clipping (false);
29433 8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3947
24173 730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3948 draw_text_background (props);
29433 8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3949
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3950 set_font (props);
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3951
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3952 render_text (props.get_pixels (), props.get_extent_matrix (),
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3953 pos(0), pos(1), pos(2), props.get_rotation ());
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3954
24173 730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3955 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	3956 }
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3957
21789 6afdf40be534 Implement graphics object "light" (patch #8943). mmuetzel <markus.muetzel@gmx.de> parents: 21782 diff changeset	3958 #else
6afdf40be534 Implement graphics object "light" (patch #8943). mmuetzel <markus.muetzel@gmx.de> parents: 21782 diff changeset	3959
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3960 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3961
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3962 // 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	3963 // 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	3964
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3965 panic_impossible ();
21789 6afdf40be534 Implement graphics object "light" (patch #8943). mmuetzel <markus.muetzel@gmx.de> parents: 21782 diff changeset	3966
6afdf40be534 Implement graphics object "light" (patch #8943). mmuetzel <markus.muetzel@gmx.de> parents: 21782 diff changeset	3967 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3968 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3969
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3970 void
24173 730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3971 opengl_renderer::draw_text_background (const text::properties& props,
29433 8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3972 bool /do_rotate/)
24173 730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3973 {
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3974 #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	3975
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3976 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	3977 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	3978
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3979 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	3980 return;
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3981
25889 2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	3982 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	3983 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	3984 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	3985
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3986 // Save current transform matrices and set orthogonal window coordinates
29433 8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3987 set_ortho_coordinates ();
24173 730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3988
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3989 // 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	3990 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	3991
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	3992 // 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	3993 // 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	3994 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	3995
29433 8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	3996 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	3997
28399 2a0e566a03e1 Don't scale text margin in printout (bug #58486) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28189 diff changeset	3998 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	3999 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	4000 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	4001 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	4002 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	4003 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	4004
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	4005 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	4006 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4007 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	4008
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4009 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	4010 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	4011 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	4012
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4013 m_glfcns.glBegin (GL_QUADS);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4014 m_glfcns.glVertex2d (x0, y0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4015 m_glfcns.glVertex2d (x1, y0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4016 m_glfcns.glVertex2d (x1, y1);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4017 m_glfcns.glVertex2d (x0, y1);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4018 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	4019
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	4020 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	4021 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	4022 }
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	4023
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	4024 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	4025 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4026 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	4027
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	4028 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	4029 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	4030
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4031 m_glfcns.glBegin (GL_LINE_STRIP);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4032 m_glfcns.glVertex2d (x0, y0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4033 m_glfcns.glVertex2d (x1, y0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4034 m_glfcns.glVertex2d (x1, y1);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4035 m_glfcns.glVertex2d (x0, y1);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4036 m_glfcns.glVertex2d (x0, y0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4037 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	4038
601cc3a063f5 Fix OpenGL line-stipple bug manifested as Nouveau driver crash (bug #53644) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25103 diff changeset	4039 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	4040 }
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	4041
29433 8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4042 restore_previous_coordinates ();
24173 730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	4043
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	4044 #else
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	4045
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	4046 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	4047
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	4048 // 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	4049 // 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	4050
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	4051 panic_impossible ();
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	4052
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	4053 #endif
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	4054 }
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	4055
730227072acb Add support for text background area for OpenGL toolkits (bug #39692). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24154 diff changeset	4056 void
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4057 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	4058 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4059 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4060
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4061 octave_value cdata = props.get_color_data ();
29433 8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4062 Matrix x = props.get_xdata ().matrix_value ();
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4063 Matrix y = props.get_ydata ().matrix_value ();
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4064
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4065 draw_texture_image (cdata, x, y);
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4066
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4067 #else
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4068
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4069 octave_unused_parameter (props);
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4070
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4071 // This shouldn't happen because construction of opengl_renderer
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4072 // objects is supposed to be impossible if OpenGL is not available.
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4073
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4074 panic_impossible ();
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4075
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4076 #endif
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4077 }
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4078
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4079 void
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4080 opengl_renderer::draw_texture_image (const octave_value cdata, Matrix x,
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4081 Matrix y, bool ortho)
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4082 {
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4083 #if defined (HAVE_OPENGL)
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4084
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4085 dim_vector dv (cdata.dims ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4086 int h = dv(0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4087 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	4088 double x0, x1, y0, y1;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4089
26728 f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	4090 double dx = 1.0;
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	4091 if (w > 1)
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	4092 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	4093
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	4094 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	4095 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	4096
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	4097 double dy = 1.0;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4098 if (h > 1)
26728 f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	4099 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	4100
f034b29320ad Use OpenGl textures to render image objects (bug #55632). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26720 diff changeset	4101 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	4102 y1 = y(1)+dy/2;
22331 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 // Expect RGB data
29433 8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4105 if (dv.ndims () == 3 && (dv(2) == 3 \|\| dv(2) == 4))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4106 {
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	4107 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	4108 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	4109 {
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	4110 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	4111
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	4112 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	4113
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	4114 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	4115
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	4116 tex.tex_coord (0.0, 0.0);
29433 8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4117 if (ortho)
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4118 m_glfcns.glVertex2d (x0, y0);
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4119 else
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4120 m_glfcns.glVertex3d (x0, y0, 0.0);
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	4121
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	4122 tex.tex_coord (1.0, 0.0);
29433 8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4123 if (ortho)
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4124 m_glfcns.glVertex2d (x1, y0);
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4125 else
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4126 m_glfcns.glVertex3d (x1, y0, 0.0);
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	4127
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	4128 tex.tex_coord (1.0, 1.0);
29433 8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4129 if (ortho)
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4130 m_glfcns.glVertex2d (x1, y1);
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4131 else
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4132 m_glfcns.glVertex3d (x1, y1, 0.0);
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	4133
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	4134 tex.tex_coord (0.0, 1.0);
29433 8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4135 if (ortho)
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4136 m_glfcns.glVertex2d (x0, y1);
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4137 else
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4138 m_glfcns.glVertex3d (x0, y1, 0.0);
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	4139
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	4140 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	4141 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	4142 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4143 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4144 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4145 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	4146
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4147 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4148
29433 8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4149 octave_unused_parameter (cdata);
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4150 octave_unused_parameter (x);
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4151 octave_unused_parameter (y);
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4152 octave_unused_parameter (ortho);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4153
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4154 // 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	4155 // 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	4156
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4157 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4158
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4159 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4160 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4161
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	4162 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	4163 {
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	4164 int len = hlist.numel ();
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	4165
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	4166 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	4167
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	4168 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	4169 {
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	4170 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	4171
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	4172 if (obj)
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	4173 draw (obj, toplevel);
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	4174 }
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	4175 }
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	4176
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4177 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4178 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	4179 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4180 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4181
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4182 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	4183
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4184 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4185
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4186 octave_unused_parameter (w);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4187 octave_unused_parameter (h);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4188
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4189 // 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	4190 // 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	4191
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4192 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4193
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4194 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4195 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4196
25889 2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4197 Matrix
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4198 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	4199 {
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4200 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	4201
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4202 #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	4203 #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	4204 GLint vp[4];
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4205 #else
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4206 int vp[4];
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4207 #endif
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4208
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4209 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	4210
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4211 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	4212 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	4213
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4214 #else
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4215
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4216 // 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	4217 // 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	4218
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4219 panic_impossible ();
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4220
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4221 #endif
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4222
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4223 return retval;
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4224 }
2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4225
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4226 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4227 opengl_renderer::set_color (const Matrix& c)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4228 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4229 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4230
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4231 m_glfcns.glColor3dv (c.data ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4232
26682 0780d3f4ecad Implement "none" as a color for axes and text objects (bug #52842). Rik <rik@octave.org> parents: 26669 diff changeset	4233 if (! c.isempty ())
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	4234 m_txt_renderer.set_color (c);
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4235
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4236 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4237
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4238 octave_unused_parameter (c);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4239
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4240 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4241 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4242
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4243 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4244
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4245 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4246 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4247
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4248 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4249 opengl_renderer::set_font (const base_properties& props)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4250 {
26858 0adb232f93b9 Implement axes and text "fontsmoothing" property (bug #55833). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26728 diff changeset	4251 bool do_anti_alias = props.get ("fontsmoothing").string_value () == "on";
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	4252 m_txt_renderer.set_anti_aliasing (do_anti_alias);
ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	4253 m_txt_renderer.set_font (props.get ("fontname").string_value (),
ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	4254 props.get ("fontweight").string_value (),
ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	4255 props.get ("fontangle").string_value (),
ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	4256 props.get ("__fontsize_points__").double_value ()
ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	4257 * m_devpixratio);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4258 }
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 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4261 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	4262 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4263 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4264
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4265 if (on)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4266 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4267 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	4268 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	4269 m_glfcns.glPolygonOffset (offset, offset);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4270 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4271 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4272 {
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4273 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	4274 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	4275 }
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4276
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4277 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4278
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4279 octave_unused_parameter (on);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4280 octave_unused_parameter (offset);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4281
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4282 // 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	4283 // 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	4284
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4285 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4286
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4287 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4288 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4289
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4290 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4291 opengl_renderer::set_linewidth (float w)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4292 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4293 #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	4294 // 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	4295 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	4296
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4297 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4298
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4299 octave_unused_parameter (w);
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 // 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	4302 // 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	4303
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4304 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4305
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4306 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4307 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4308
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4309 void
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	4310 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	4311 double linewidth)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4312 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4313 #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	4314 // 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	4315 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	4316 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	4317 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	4318
c40b3b671513 Fixed dash pattern when figure "__device_pixel_ratio__" is not 1 (bug #55484) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26468 diff changeset	4319 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	4320
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4321 bool solid = false;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4322
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4323 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	4324 solid = true;
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4325 else if (s == ":")
26688 4b4881ff0dc9 Improve appearance of patterned lines at small LineWidths. Rik <rik@octave.org> parents: 26682 diff changeset	4326 {
4b4881ff0dc9 Improve appearance of patterned lines at small LineWidths. Rik <rik@octave.org> parents: 26682 diff changeset	4327 if (factor > 1)
4b4881ff0dc9 Improve appearance of patterned lines at small LineWidths. Rik <rik@octave.org> parents: 26682 diff changeset	4328 pattern = 0x5555;
4b4881ff0dc9 Improve appearance of patterned lines at small LineWidths. Rik <rik@octave.org> parents: 26682 diff changeset	4329 else
4b4881ff0dc9 Improve appearance of patterned lines at small LineWidths. Rik <rik@octave.org> parents: 26682 diff changeset	4330 pattern = 0x1111;
4b4881ff0dc9 Improve appearance of patterned lines at small LineWidths. Rik <rik@octave.org> parents: 26682 diff changeset	4331 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4332 else if (s == "--")
27932 b018f553fd85 maint: Use Octave coding conventions in libinterp/ Rik <rik@octave.org> parents: 27923 diff changeset	4333 {
26688 4b4881ff0dc9 Improve appearance of patterned lines at small LineWidths. Rik <rik@octave.org> parents: 26682 diff changeset	4334 if (factor > 1)
4b4881ff0dc9 Improve appearance of patterned lines at small LineWidths. Rik <rik@octave.org> parents: 26682 diff changeset	4335 pattern = 0x0F0F;
4b4881ff0dc9 Improve appearance of patterned lines at small LineWidths. Rik <rik@octave.org> parents: 26682 diff changeset	4336 else
4b4881ff0dc9 Improve appearance of patterned lines at small LineWidths. Rik <rik@octave.org> parents: 26682 diff changeset	4337 pattern = 0x01FF;
27932 b018f553fd85 maint: Use Octave coding conventions in libinterp/ Rik <rik@octave.org> parents: 27923 diff changeset	4338 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4339 else if (s == "-.")
26688 4b4881ff0dc9 Improve appearance of patterned lines at small LineWidths. Rik <rik@octave.org> parents: 26682 diff changeset	4340 {
4b4881ff0dc9 Improve appearance of patterned lines at small LineWidths. Rik <rik@octave.org> parents: 26682 diff changeset	4341 if (factor > 1)
4b4881ff0dc9 Improve appearance of patterned lines at small LineWidths. Rik <rik@octave.org> parents: 26682 diff changeset	4342 pattern = 0x6F6F;
4b4881ff0dc9 Improve appearance of patterned lines at small LineWidths. Rik <rik@octave.org> parents: 26682 diff changeset	4343 else
4b4881ff0dc9 Improve appearance of patterned lines at small LineWidths. Rik <rik@octave.org> parents: 26682 diff changeset	4344 pattern = 0x18FF;
4b4881ff0dc9 Improve appearance of patterned lines at small LineWidths. Rik <rik@octave.org> parents: 26682 diff changeset	4345 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4346 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	4347 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	4348
c40b3b671513 Fixed dash pattern when figure "__device_pixel_ratio__" is not 1 (bug #55484) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26468 diff changeset	4349 m_glfcns.glLineStipple (factor, pattern);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4350
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4351 if (solid && ! use_stipple)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4352 m_glfcns.glDisable (GL_LINE_STIPPLE);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4353 else
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4354 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	4355
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4356 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4357
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4358 octave_unused_parameter (s);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4359 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	4360 octave_unused_parameter (linewidth);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4361
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4362 // 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	4363 // 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	4364
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4365 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4366
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4367 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4368 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4369
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4370 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4371 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	4372 double z1, double z2)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4373 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4374 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4375
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4376 double dx = (x2-x1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4377 double dy = (y2-y1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4378 double dz = (z2-z1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4379
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4380 x1 -= 0.001dx; x2 += 0.001dx;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4381 y1 -= 0.001dy; y2 += 0.001dy;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4382 z1 -= 0.001dz; z2 += 0.001dz;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4383
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4384 ColumnVector p (4, 0.0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4385
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4386 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	4387 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	4388 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	4389 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	4390 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	4391 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	4392 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	4393 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	4394 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	4395 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	4396 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	4397 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	4398
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	4399 m_xmin = x1; m_xmax = x2;
ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	4400 m_ymin = y1; m_ymax = y2;
ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	4401 m_zmin = z1; m_zmax = z2;
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4402
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4403 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4404
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4405 octave_unused_parameter (x1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4406 octave_unused_parameter (x2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4407 octave_unused_parameter (y1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4408 octave_unused_parameter (y2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4409 octave_unused_parameter (z1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4410 octave_unused_parameter (z2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4411
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4412 // 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	4413 // 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	4414
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4415 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4416
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4417 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4418 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4419
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4420 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4421 opengl_renderer::set_clipping (bool enable)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4422 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4423 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4424
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4425 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	4426
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4427 if (enable != has_clipping)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4428 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4429 if (enable)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4430 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	4431 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	4432 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4433 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	4434 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	4435 }
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4436
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4437 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4438
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4439 octave_unused_parameter (enable);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4440
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4441 // 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	4442 // 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	4443
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4444 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4445
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4446 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4447 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4448
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4449 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4450 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	4451 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4452 #if defined (HAVE_OPENGL)
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4453 m_glfcns.glMatrixMode (GL_PROJECTION);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4454 m_glfcns.glPushMatrix ();
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4455 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	4456
25889 2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	4457 Matrix vp = get_viewport_scaled ();
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	4458 m_glfcns.glOrtho (0, vp(2), vp(3), 0, m_xZ1, m_xZ2);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4459 m_glfcns.glMatrixMode (GL_MODELVIEW);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4460 m_glfcns.glPushMatrix ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4461
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4462 set_clipping (false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4463 set_linewidth (width);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4464
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	4465 m_marker_id = make_marker_list (m, size, false);
ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	4466 m_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	4467
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4468 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4469
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4470 octave_unused_parameter (m);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4471 octave_unused_parameter (size);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4472 octave_unused_parameter (width);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4473
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4474 // 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	4475 // 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	4476
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4477 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4478
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4479 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4480 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4481
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4482 void
28286 496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	4483 opengl_renderer::change_marker (const std::string& m, double size)
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	4484 {
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	4485 #if defined (HAVE_OPENGL)
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	4486
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	4487 m_marker_id = make_marker_list (m, size, false);
ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	4488 m_filled_marker_id = make_marker_list (m, size, true);
28286 496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	4489
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	4490 #else
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	4491
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	4492 octave_unused_parameter (m);
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	4493 octave_unused_parameter (size);
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	4494
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	4495 // This shouldn't happen because construction of opengl_renderer
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	4496 // objects is supposed to be impossible if OpenGL is not available.
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	4497
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	4498 panic_impossible ();
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	4499
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	4500 #endif
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	4501 }
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	4502
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	4503 void
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4504 opengl_renderer::end_marker (void)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4505 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4506 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4507
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	4508 m_glfcns.glDeleteLists (m_marker_id, 1);
ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	4509 m_glfcns.glDeleteLists (m_filled_marker_id, 1);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4510
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4511 m_glfcns.glMatrixMode (GL_MODELVIEW);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4512 m_glfcns.glPopMatrix ();
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4513 m_glfcns.glMatrixMode (GL_PROJECTION);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4514 m_glfcns.glPopMatrix ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4515 set_linewidth (0.5f);
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4516
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4517 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4518
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4519 // 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	4520 // 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	4521
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4522 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4523
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4524 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4525 }
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 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4528 opengl_renderer::draw_marker (double x, double y, double z,
28286 496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	4529 const Matrix& lc, const Matrix& fc,
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	4530 const double la, const double fa)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4531 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4532 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4533
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	4534 ColumnVector tmp = m_xform.transform (x, y, z, false);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4535
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4536 m_glfcns.glLoadIdentity ();
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4537 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	4538
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	4539 if (m_filled_marker_id > 0 && fc.numel () > 0)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4540 {
28286 496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	4541 m_glfcns.glColor4d (fc(0), fc(1), fc(2), fa);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4542 set_polygon_offset (true, -1.0);
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	4543 m_glfcns.glCallList (m_filled_marker_id);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4544 if (lc.numel () > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4545 {
28286 496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	4546 m_glfcns.glColor4d (lc(0), lc(1), lc(2), la);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4547 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	4548 m_glfcns.glEdgeFlag (GL_TRUE);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4549 set_polygon_offset (true, -2.0);
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	4550 m_glfcns.glCallList (m_filled_marker_id);
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4551 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	4552 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4553 set_polygon_offset (false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4554 }
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	4555 else if (m_marker_id > 0 && lc.numel () > 0)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4556 {
28286 496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	4557 m_glfcns.glColor4d (lc(0), lc(1), lc(2), la);
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	4558 m_glfcns.glCallList (m_marker_id);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4559 }
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4560
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4561 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4562
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4563 octave_unused_parameter (x);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4564 octave_unused_parameter (y);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4565 octave_unused_parameter (z);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4566 octave_unused_parameter (lc);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4567 octave_unused_parameter (fc);
28286 496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	4568 octave_unused_parameter (la);
496735a910c1 Add graphics object "scatter" (bug #58282). Markus Mützel <markus.muetzel@gmx.de> parents: 28189 diff changeset	4569 octave_unused_parameter (fa);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4570
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4571 // 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	4572 // 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	4573
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4574 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4575
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4576 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4577 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4578
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4579 void
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4580 opengl_renderer::init_maxlights (void)
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4581 {
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4582 #if defined (HAVE_OPENGL)
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4583
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4584 // 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	4585 if (m_max_lights == 0)
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4586 {
28558 c9f7d1d7a6e7 gl-render.cc: Fix enumeration error. Markus Mützel <markus.muetzel@gmx.de> parents: 28399 diff changeset	4587 GLint max_lights;
c9f7d1d7a6e7 gl-render.cc: Fix enumeration error. Markus Mützel <markus.muetzel@gmx.de> parents: 28399 diff changeset	4588 m_glfcns.glGetIntegerv (GL_MAX_LIGHTS, &max_lights);
c9f7d1d7a6e7 gl-render.cc: Fix enumeration error. Markus Mützel <markus.muetzel@gmx.de> parents: 28399 diff changeset	4589 m_max_lights = max_lights;
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4590 }
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4591
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4592 #else
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4593
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4594 // 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	4595 // 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	4596
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4597 panic_impossible ();
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4598
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4599 #endif
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4600 }
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4601
26417 4166610a41bc do not include private file oct-opengl.h in public headers (bug #55277) Mike Miller <mtmiller@octave.org> parents: 26407 diff changeset	4602 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	4603 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	4604 {
25864 baeb93e9febc allow building without OpenGL to work again John W. Eaton <jwe@octave.org> parents: 25863 diff changeset	4605 #if defined (HAVE_OPENGL)
baeb93e9febc allow building without OpenGL to work again John W. Eaton <jwe@octave.org> parents: 25863 diff changeset	4606
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4607 // 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	4608 // 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	4609 // better way?
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4610
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4611 std::ostringstream buf;
25864 baeb93e9febc allow building without OpenGL to work again John W. Eaton <jwe@octave.org> parents: 25863 diff changeset	4612
26417 4166610a41bc do not include private file oct-opengl.h in public headers (bug #55277) Mike Miller <mtmiller@octave.org> parents: 26407 diff changeset	4613 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	4614
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4615 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	4616
4166610a41bc do not include private file oct-opengl.h in public headers (bug #55277) Mike Miller <mtmiller@octave.org> parents: 26407 diff changeset	4617 #else
4166610a41bc do not include private file oct-opengl.h in public headers (bug #55277) Mike Miller <mtmiller@octave.org> parents: 26407 diff changeset	4618
4166610a41bc do not include private file oct-opengl.h in public headers (bug #55277) Mike Miller <mtmiller@octave.org> parents: 26407 diff changeset	4619 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	4620
4166610a41bc do not include private file oct-opengl.h in public headers (bug #55277) Mike Miller <mtmiller@octave.org> parents: 26407 diff changeset	4621 // 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	4622 // 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	4623
4166610a41bc do not include private file oct-opengl.h in public headers (bug #55277) Mike Miller <mtmiller@octave.org> parents: 26407 diff changeset	4624 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	4625 return std::string ();
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4626
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4627 #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	4628 }
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4629
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4630 void
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4631 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	4632 {
21797 e5f083f9704e eliminate some duplicate code in gl-render.cc John W. Eaton <jwe@octave.org> parents: 21790 diff changeset	4633 #if defined (HAVE_OPENGL)
e5f083f9704e eliminate some duplicate code in gl-render.cc John W. Eaton <jwe@octave.org> parents: 21790 diff changeset	4634
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4635 double x = n(j,i,0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4636 double y = n(j,i,1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4637 double z = n(j,i,2);
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 double d = sqrt (xx + yy + z*z);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4640
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4641 double dir = 1.0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4642
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4643 if (bfl_mode > 0)
30121 5c9f5353eef3 maint: use "m_" prefix for member variables in file gl-render.cc Rik <rik@octave.org> parents: 30040 diff changeset	4644 dir = ((xm_view_vector(0) + ym_view_vector(1) + z*m_view_vector(2) < 0)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4645 ? ((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	4646
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4647 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	4648
e5f083f9704e eliminate some duplicate code in gl-render.cc John W. Eaton <jwe@octave.org> parents: 21790 diff changeset	4649 #else
e5f083f9704e eliminate some duplicate code in gl-render.cc John W. Eaton <jwe@octave.org> parents: 21790 diff changeset	4650
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4651 octave_unused_parameter (bfl_mode);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4652 octave_unused_parameter (n);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4653 octave_unused_parameter (j);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4654 octave_unused_parameter (i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4655
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4656 // 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	4657 // 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	4658
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4659 panic_impossible ();
21797 e5f083f9704e eliminate some duplicate code in gl-render.cc John W. Eaton <jwe@octave.org> parents: 21790 diff changeset	4660
e5f083f9704e eliminate some duplicate code in gl-render.cc John W. Eaton <jwe@octave.org> parents: 21790 diff changeset	4661 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4662 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4663
28189 5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	4664 double
5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	4665 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	4666 {
5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	4667 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	4668
5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	4669 // 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	4670 // 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	4671 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	4672 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	4673
5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	4674 double retval = val;
5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	4675
5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	4676 if (! m_printing)
5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	4677 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	4678
5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	4679 return retval;
5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	4680 }
5624fd0c5efb Fix inconsistent marker size between screen and printout (bug #57552) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 28006 diff changeset	4681
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4682 unsigned int
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4683 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	4684 bool filled) const
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4685 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4686 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4687
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4688 char c = marker[0];
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4689
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4690 if (filled && (c == '+' \|\| c == 'x' \|\| c == '*' \|\| c == '.'))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4691 return 0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4692
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4693 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	4694
9a678e0de658 Measure LineWidth in points, not pixels, for Matlab compatibility (bug #53056). Rik <rik@octave.org> parents: 26688 diff changeset	4695 // 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	4696 double sz = points_to_pixels (size);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4697
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4698 // constants for the * marker
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4699 const double sqrt2d4 = 0.35355339059327;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4700 double tt = sz*sqrt2d4;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4701
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4702 m_glfcns.glNewList (ID, GL_COMPILE);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4703
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4704 switch (marker[0])
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	4705 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4706 case '+':
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4707 m_glfcns.glBegin (GL_LINES);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4708 m_glfcns.glVertex2d (-sz/2, 0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4709 m_glfcns.glVertex2d (sz/2, 0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4710 m_glfcns.glVertex2d (0, -sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4711 m_glfcns.glVertex2d (0, sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4712 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4713 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4714 case 'x':
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4715 m_glfcns.glBegin (GL_LINES);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4716 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	4717 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	4718 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	4719 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	4720 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4721 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4722 case '*':
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4723 m_glfcns.glBegin (GL_LINES);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4724 m_glfcns.glVertex2d (-sz/2, 0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4725 m_glfcns.glVertex2d (sz/2, 0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4726 m_glfcns.glVertex2d (0, -sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4727 m_glfcns.glVertex2d (0, sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4728 m_glfcns.glVertex2d (-tt, -tt);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4729 m_glfcns.glVertex2d (+tt, +tt);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4730 m_glfcns.glVertex2d (-tt, +tt);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4731 m_glfcns.glVertex2d (+tt, -tt);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4732 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4733 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4734 case '.':
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4735 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4736 // 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	4737
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4738 // 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	4739 if (sz > 0 && sz < 3)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4740 sz = 3;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4741
25688 b2917b7858ba maint: Use Octave convention for spacing of C++ cast statements. Rik <rik@octave.org> parents: 25438 diff changeset	4742 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	4743 if (! (div % 2))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4744 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	4745 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	4746 double ang_step = M_PI / div;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4747
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4748 m_glfcns.glBegin (GL_POLYGON);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4749 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	4750 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	4751 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4752 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4753 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4754 case 's':
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4755 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	4756 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	4757 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	4758 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	4759 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	4760 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4761 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4762 case 'o':
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4763 {
25688 b2917b7858ba maint: Use Octave convention for spacing of C++ cast statements. Rik <rik@octave.org> parents: 25438 diff changeset	4764 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	4765 if (! (div % 2))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4766 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	4767 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	4768 double ang_step = M_PI / div;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4769
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4770 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	4771 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	4772 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	4773 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4774 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4775 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4776 case 'd':
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4777 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	4778 m_glfcns.glVertex2d (0, -sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4779 m_glfcns.glVertex2d (sz/2, 0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4780 m_glfcns.glVertex2d (0, sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4781 m_glfcns.glVertex2d (-sz/2, 0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4782 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4783 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4784 case 'v':
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4785 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	4786 m_glfcns.glVertex2d (0, sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4787 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	4788 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	4789 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4790 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4791 case '^':
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4792 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	4793 m_glfcns.glVertex2d (0, -sz/2);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4794 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	4795 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	4796 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4797 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4798 case '>':
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4799 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	4800 m_glfcns.glVertex2d (sz/2, 0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4801 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	4802 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	4803 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4804 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4805 case '<':
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4806 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	4807 m_glfcns.glVertex2d (-sz/2, 0);
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4808 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	4809 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	4810 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4811 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4812 case 'p':
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4813 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4814 double ang, r, dr;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4815 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	4816
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4817 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	4818 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	4819 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4820 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	4821 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	4822 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	4823 }
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4824 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4825 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4826 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4827 case 'h':
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4828 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4829 double ang, r, dr;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4830 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	4831
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4832 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	4833 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	4834 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4835 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	4836 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	4837 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	4838 }
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4839 m_glfcns.glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4840 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4841 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4842 default:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4843 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	4844 break;
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	4845 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4846
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25828 diff changeset	4847 m_glfcns.glEndList ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4848
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4849 return ID;
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4850
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4851 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4852
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4853 octave_unused_parameter (marker);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4854 octave_unused_parameter (size);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4855 octave_unused_parameter (filled);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4856
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4857 // 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	4858 // 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	4859
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4860 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4861
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4862 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4863 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4864
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4865 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4866 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	4867 uint8NDArray& pixels,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4868 Matrix& bbox,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4869 int halign, int valign, double rotation)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4870 {
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	4871 m_txt_renderer.text_to_pixels (txt, pixels, bbox, halign, valign,
ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	4872 rotation, m_interpreter);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4873 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4874
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4875 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4876 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	4877 std::list<text_renderer::string>& lst,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4878 Matrix& bbox,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4879 int halign, int valign, double rotation)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4880 {
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	4881 m_txt_renderer.text_to_strlist (txt, lst, bbox, halign, valign,
ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	4882 rotation, m_interpreter);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4883 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4884
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4885 Matrix
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4886 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	4887 double x, double y, double z,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4888 int halign, int valign, double rotation)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4889 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4890 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4891
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4892 Matrix bbox (1, 4, 0.0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4893
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4894 if (txt.empty ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4895 return bbox;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4896
29886 ebd1ac75e99f use m_ prefix for data members in gl-render classes John W. Eaton <jwe@octave.org> parents: 29435 diff changeset	4897 if (m_txt_renderer.ok ())
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4898 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4899 uint8NDArray pixels;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4900 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	4901
29433 8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4902 render_text (pixels, bbox, x, y, z, rotation);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4903 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4904
21209 67d2965af0b5 revamp text rendering classes John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	4905 return bbox;
67d2965af0b5 revamp text rendering classes John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	4906
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4907 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4908
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4909 octave_unused_parameter (txt);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4910 octave_unused_parameter (x);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4911 octave_unused_parameter (y);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4912 octave_unused_parameter (z);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4913 octave_unused_parameter (halign);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4914 octave_unused_parameter (valign);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4915 octave_unused_parameter (rotation);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4916
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4917 // 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	4918 // 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	4919
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4920 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4921
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4922 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4923 }
29433 8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4924
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4925 void
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4926 opengl_renderer::render_text (uint8NDArray pixels, Matrix bbox,
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4927 double x, double y, double z, double rotation)
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4928 {
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4929 #if defined (HAVE_OPENGL)
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4930
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4931 // Transform data coordinates to screen pixel ortho coordinates
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4932 ColumnVector pixpos = get_transform ().transform (x, y, z, false);
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4933 Matrix xdata(1, 2, bbox(0) / m_devpixratio);
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4934 xdata(1) += (bbox(2) - 1) / m_devpixratio;
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4935 Matrix ydata(1, 2, -bbox(1) / m_devpixratio);
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4936 ydata(1) -= (bbox(3) - 1) / m_devpixratio;
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4937
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4938 bool blend = m_glfcns.glIsEnabled (GL_BLEND);
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4939 m_glfcns.glEnable (GL_BLEND);
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4940 m_glfcns.glEnable (GL_ALPHA_TEST);
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4941
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4942 set_ortho_coordinates ();
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4943
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4944 // Translate coordinates so that the text anchor is (0,0)
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4945 m_glfcns.glTranslated (pixpos(0), pixpos(1), -pixpos(2));
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4946
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4947 m_glfcns.glRotated (-rotation, 0.0, 0.0, 1.0);
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4948
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4949 // Permute pixels returned by freetype
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4950 Array<octave_idx_type> perm (dim_vector (3, 1));
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4951 perm(0) = 2;
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4952 perm(1) = 1;
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4953 perm(2) = 0;
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4954 draw_texture_image (pixels.permute (perm),
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4955 xdata, ydata, true);
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4956
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4957 restore_previous_coordinates ();
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4958
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4959 m_glfcns.glDisable (GL_ALPHA_TEST);
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4960
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4961 if (! blend)
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4962 m_glfcns.glDisable (GL_BLEND);
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4963
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4964 #else
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4965
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4966 octave_unused_parameter (pixels);
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4967 octave_unused_parameter (bbox);
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4968 octave_unused_parameter (x);
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4969 octave_unused_parameter (y);
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4970 octave_unused_parameter (z);
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4971 octave_unused_parameter (rotation);
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4972
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4973 // This shouldn't happen because construction of opengl_renderer
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4974 // objects is supposed to be impossible if OpenGL is not available.
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4975
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4976 panic_impossible ();
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4977
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4978 #endif
8811d8274118 Allow arbitrary text rotation onscreen (bug #33118) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29427 diff changeset	4979 }
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	4980 }

Mercurial > octave

annotate libinterp/corefcn/gl-render.cc @ 30121:5c9f5353eef3