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

annotate libinterp/corefcn/gl-render.cc @ 22396:52c205a0ad88

Make linestyles compatible at larger linewidths (bug #48884). * gl-render.h (set_linestyle): Change prototype to have a linewidth input. * gl-render.h (render_grid): Change prototype to have a linewidth input. * gl-render.cc (render_grid): Change function to have linewidth input. Call set_linestyle with additional linewidth input. * gl-render.cc (draw_axes_boxes, draw_axes_x_grid, draw_axes_y_grid, draw_axes_z_grid, draw_line, draw_surface, draw_patch): Get linewidth from axes properties. Call set_linestyle with additional linewidth input. * gl-render.cc (set_linestyle): Use linewdith as repetition factor in glLineStipple. Update binary stipple patterns to get better visual results. * gl2ps-print.cc (set_linestyle): Change function to have linewidth input.

author	Rik <rik@octave.org>
date	Fri, 26 Aug 2016 14:22:14 -0700
parents	026067ffcf66
children	34ce5be04942

rev	line source
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1 /*
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2
22323 bac0d6f07a3e maint: Update copyright notices for 2016. John W. Eaton <jwe@octave.org> parents: 22268 diff changeset	3 Copyright (C) 2008-2016 Michael Goffioul
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	4
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	5 This file is part of Octave.
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	6
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	7 Octave is free software; you can redistribute it and/or modify it
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	8 under the terms of the GNU General Public License as published by the
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	9 Free Software Foundation; either version 3 of the License, or (at your
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	10 option) any later version.
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	11
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	12 Octave is distributed in the hope that it will be useful, but WITHOUT
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	15 for more details.
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	16
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	17 You should have received a copy of the GNU General Public License
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	18 along with Octave; see the file COPYING. If not, see
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	19 <http://www.gnu.org/licenses/>.
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	20
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	21 */
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	22
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21691 diff changeset	23 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21209 diff changeset	24 # include "config.h"
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	25 #endif
13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	26
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	27 #include <iostream>
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	28
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21691 diff changeset	29 #if defined (HAVE_WINDOWS_H)
21200 fcac5dbbf9ed maint: Indent #ifdef blocks in libinterp. Rik <rik@octave.org> parents: 21198 diff changeset	30 # define WIN32_LEAN_AND_MEAN
fcac5dbbf9ed maint: Indent #ifdef blocks in libinterp. Rik <rik@octave.org> parents: 21198 diff changeset	31 # include <windows.h>
21196 bd96c2efd4fe move include statements for OpenGL headers to a single file John W. Eaton <jwe@octave.org> parents: 21115 diff changeset	32 #endif
bd96c2efd4fe move include statements for OpenGL headers to a single file John W. Eaton <jwe@octave.org> parents: 21115 diff changeset	33
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	34 #include <lo-mappers.h>
8377 25bc2d31e1bf improve OCTAVE_LOCAL_BUFFER Jaroslav Hajek <highegg@gmail.com> parents: 8263 diff changeset	35 #include "oct-locbuf.h"
13985 43cc49c7abd1 Use thread-safe atomic reference counting (GCC and MSVC). Michael Goffioul <michael.goffioul@gmail.com> parents: 13961 diff changeset	36 #include "oct-refcount.h"
21115 629643522cc0 include errwarn.h in all files that use gripe_disabled_feature John W. Eaton <jwe@octave.org> parents: 21109 diff changeset	37
629643522cc0 include errwarn.h in all files that use gripe_disabled_feature John W. Eaton <jwe@octave.org> parents: 21109 diff changeset	38 #include "errwarn.h"
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	39 #include "gl-render.h"
21196 bd96c2efd4fe move include statements for OpenGL headers to a single file John W. Eaton <jwe@octave.org> parents: 21115 diff changeset	40 #include "oct-opengl.h"
21209 67d2965af0b5 revamp text rendering classes John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	41 #include "text-renderer.h"
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	42
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	43 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	44
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	45 static int
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	46 next_power_of_2 (int n)
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	47 {
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	48 int m = 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	49
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	50 while (m < n && m < std::numeric_limits<int>::max ())
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	51 m <<= 1;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	52
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	53 return m;
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	54 }
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	55
22393 026067ffcf66 fix build with minimal dependencies John W. Eaton <jwe@octave.org> parents: 22391 diff changeset	56 #endif
026067ffcf66 fix build with minimal dependencies John W. Eaton <jwe@octave.org> parents: 22391 diff changeset	57
22326 71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	58 namespace octave
71dd9d5a5ecd move more new classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	59 {
22393 026067ffcf66 fix build with minimal dependencies John W. Eaton <jwe@octave.org> parents: 22391 diff changeset	60 #if defined (HAVE_OPENGL)
026067ffcf66 fix build with minimal dependencies John W. Eaton <jwe@octave.org> parents: 22391 diff changeset	61
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	62 #define LIGHT_MODE GL_FRONT_AND_BACK
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7825 diff changeset	63
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	64 // Use symbolic names for axes
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	65 enum
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	66 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	67 X_AXIS,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	68 Y_AXIS,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	69 Z_AXIS
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	70 };
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	71
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	72 // Use symbolic names for color mode
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	73 enum
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	74 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	75 UNIFORM,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	76 FLAT,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	77 INTERP,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	78 TEXTURE
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	79 };
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	80
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	81 // Use symbolic names for lighting
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	82 enum
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	83 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	84 NONE,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	85 //FLAT, // Already declared in anonymous enum for color mode
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	86 GOURAUD = 2
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	87 };
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	88
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	89 // Win32 API requires the CALLBACK attributes for
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	90 // GLU callback functions. Define it to empty on
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	91 // other platforms.
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21691 diff changeset	92 #if ! defined (CALLBACK)
21200 fcac5dbbf9ed maint: Indent #ifdef blocks in libinterp. Rik <rik@octave.org> parents: 21198 diff changeset	93 # define CALLBACK
7833 8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	94 #endif
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	95
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	96 class
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	97 opengl_texture
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	98 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	99 protected:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	100 class texture_rep
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	101 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	102 public:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	103 texture_rep (void)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	104 : id (), w (), h (), tw (), th (), tx (), ty (),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	105 valid (false), count (1)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	106 { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	107
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	108 texture_rep (GLuint id_arg, int w_arg, int h_arg, int tw_arg, int th_arg)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	109 : id (id_arg), w (w_arg), h (h_arg), tw (tw_arg), th (th_arg),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	110 tx (double(w)/tw), ty (double(h)/th), valid (true),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	111 count (1) { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	112
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	113 ~texture_rep (void)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	114 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	115 if (valid)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	116 glDeleteTextures (1, &id);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	117 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	118
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	119 void bind (int mode) const
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	120 { if (valid) glBindTexture (mode, id); }
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 tex_coord (double q, double r) const
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	123 { if (valid) glTexCoord2d (qtx, rty); }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	124
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	125 GLuint id;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	126 int w, h;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	127 int tw, th;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	128 double tx, ty;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	129 bool valid;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	130 octave_refcount<int> count;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	131 };
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	132
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	133 texture_rep *rep;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	134
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	135 private:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	136 opengl_texture (texture_rep *_rep) : rep (_rep) { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	137
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	138 public:
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	139 opengl_texture (void) : rep (new texture_rep ()) { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	140
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	141 opengl_texture (const opengl_texture& tx)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	142 : rep (tx.rep)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	143 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	144 rep->count++;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	145 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	146
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	147 ~opengl_texture (void)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	148 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	149 if (--rep->count == 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	150 delete rep;
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	151 }
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	152
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	153 opengl_texture& operator = (const opengl_texture& tx)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	154 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	155 if (--rep->count == 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	156 delete rep;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	157
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	158 rep = tx.rep;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	159 rep->count++;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	160
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	161 return *this;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	162 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	163
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	164 static opengl_texture create (const octave_value& data);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	165
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	166 void bind (int mode = GL_TEXTURE_2D) const
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	167 { rep->bind (mode); }
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	168
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	169 void tex_coord (double q, double r) const
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	170 { rep->tex_coord (q, r); }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	171
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	172 bool is_valid (void) const
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	173 { return rep->valid; }
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	174 };
c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	175
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	176 opengl_texture
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	177 opengl_texture::create (const octave_value& data)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	178 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	179 opengl_texture retval;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	180
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	181 dim_vector dv (data.dims ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	182
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	183 // Expect RGB data
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	184 if (dv.ndims () == 3 && dv(2) == 3)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	185 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	186 // 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	187 // 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	188 int h, w, tw, th;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	189 h = dv(0), w = dv(1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	190 GLuint id;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	191 bool ok = true;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	192
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	193 tw = next_power_of_2 (w);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	194 th = next_power_of_2 (h);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	195
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	196 glGenTextures (1, &id);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	197 glBindTexture (GL_TEXTURE_2D, id);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	198
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	199 if (data.is_double_type ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	200 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	201 const NDArray xdata = data.array_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	202
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	203 OCTAVE_LOCAL_BUFFER (float, a, (3twth));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	204
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	205 for (int i = 0; i < h; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	206 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	207 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	208 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	209 a[idx] = xdata(i,j,0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	210 a[idx+1] = xdata(i,j,1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	211 a[idx+2] = xdata(i,j,2);
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 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	214
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	215 glTexImage2D (GL_TEXTURE_2D, 0, 3, tw, th, 0, GL_RGB, GL_FLOAT, a);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	216 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	217 else if (data.is_uint8_type ())
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 const uint8NDArray xdata = data.uint8_array_value ();
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 OCTAVE_LOCAL_BUFFER (octave_uint8, a, (3twth));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	222
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	223 for (int i = 0; i < h; i++)
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 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	226 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	227 a[idx] = xdata(i,j,0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	228 a[idx+1] = xdata(i,j,1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	229 a[idx+2] = xdata(i,j,2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	230 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	231 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	232
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	233 glTexImage2D (GL_TEXTURE_2D, 0, 3, tw, th, 0,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	234 GL_RGB, GL_UNSIGNED_BYTE, a);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	235 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	236 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	237 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	238 ok = false;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	239 warning ("opengl_texture::create: invalid texture data type (double or uint8 required)");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	240 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	241
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	242 if (ok)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	243 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	244 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	245 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	246
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	247 if (glGetError () != GL_NO_ERROR)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	248 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	249 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	250 retval = opengl_texture (new texture_rep (id, w, h, tw, th));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	251 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	252 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	253 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	254 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	255
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	256 return retval;
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	257 }
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	258
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	259 class
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	260 opengl_tesselator
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	261 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	262 public:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	263 #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	264 typedef GLvoid (CALLBACK *fcn) (...);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	265 #else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	266 typedef void (CALLBACK *fcn) (void);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	267 #endif
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	268
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	269 public:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	270
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	271 opengl_tesselator (void) : glu_tess (0), fill () { init (); }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	272
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	273 virtual ~opengl_tesselator (void)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	274 { if (glu_tess) gluDeleteTess (glu_tess); }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	275
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	276 void begin_polygon (bool filled = true)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	277 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	278 gluTessProperty (glu_tess, GLU_TESS_BOUNDARY_ONLY,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	279 (filled ? GL_FALSE : GL_TRUE));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	280 fill = filled;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	281 gluTessBeginPolygon (glu_tess, this);
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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	284 void end_polygon (void) const
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	285 { gluTessEndPolygon (glu_tess); }
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 void begin_contour (void) const
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	288 { gluTessBeginContour (glu_tess); }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	289
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	290 void end_contour (void) const
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	291 { gluTessEndContour (glu_tess); }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	292
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	293 void add_vertex (double loc, void data) const
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	294 { gluTessVertex (glu_tess, loc, data); }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	295
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	296 protected:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	297 virtual void begin (GLenum /type/) { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	298
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	299 virtual void end (void) { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	300
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	301 virtual void vertex (void * /data/) { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	302
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	303 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	304 GLfloat [4] /w/, void ** /out_data/) { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	305
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	306 virtual void edge_flag (GLboolean /flag/) { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	307
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	308 virtual void error (GLenum err)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	309 { ::error ("OpenGL tesselation error (%d)", err); }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	310
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	311 virtual void init (void)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	312 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	313 glu_tess = gluNewTess ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	314
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	315 gluTessCallback (glu_tess, GLU_TESS_BEGIN_DATA,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	316 reinterpret_cast<fcn> (tess_begin));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	317 gluTessCallback (glu_tess, GLU_TESS_END_DATA,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	318 reinterpret_cast<fcn> (tess_end));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	319 gluTessCallback (glu_tess, GLU_TESS_VERTEX_DATA,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	320 reinterpret_cast<fcn> (tess_vertex));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	321 gluTessCallback (glu_tess, GLU_TESS_COMBINE_DATA,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	322 reinterpret_cast<fcn> (tess_combine));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	323 gluTessCallback (glu_tess, GLU_TESS_EDGE_FLAG_DATA,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	324 reinterpret_cast<fcn> (tess_edge_flag));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	325 gluTessCallback (glu_tess, GLU_TESS_ERROR_DATA,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	326 reinterpret_cast<fcn> (tess_error));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	327 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	328
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	329 bool is_filled (void) const { return fill; }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	330
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	331 private:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	332 static void CALLBACK tess_begin (GLenum type, void *t)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	333 { reinterpret_cast<opengl_tesselator *> (t)->begin (type); }
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 static void CALLBACK tess_end (void *t)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	336 { reinterpret_cast<opengl_tesselator *> (t)->end (); }
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 static void CALLBACK tess_vertex (void v, void t)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	339 { reinterpret_cast<opengl_tesselator *> (t)->vertex (v); }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	340
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	341 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	342 void *out, void t)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	343 { reinterpret_cast<opengl_tesselator *> (t)->combine (c, v, w, out); }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	344
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	345 static void CALLBACK tess_edge_flag (GLboolean flag, void *t)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	346 { reinterpret_cast<opengl_tesselator *> (t)->edge_flag (flag); }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	347
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	348 static void CALLBACK tess_error (GLenum err, void *t)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	349 { reinterpret_cast<opengl_tesselator *> (t)->error (err); }
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 private:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	352
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	353 // No copying!
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	354
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	355 opengl_tesselator (const opengl_tesselator&);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	356
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	357 opengl_tesselator operator = (const opengl_tesselator&);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	358
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	359 GLUtesselator *glu_tess;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	360 bool fill;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	361 };
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	362
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	363 class
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	364 vertex_data
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	365 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	366 public:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	367 class vertex_data_rep
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	368 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	369 public:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	370 Matrix coords;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	371 Matrix color;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	372 Matrix normal;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	373 double alpha;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	374 float ambient;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	375 float diffuse;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	376 float specular;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	377 float specular_exp;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	378 float specular_color_refl;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	379
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	380 // reference counter
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	381 octave_refcount<int> count;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	382
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	383 vertex_data_rep (void)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	384 : coords (), color (), normal (), alpha (),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	385 ambient (), diffuse (), specular (), specular_exp (),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	386 specular_color_refl (), count (1) { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	387
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	388 vertex_data_rep (const Matrix& c, const Matrix& col, const Matrix& n,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	389 double a, float as, float ds, float ss, float se,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	390 float scr)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	391 : coords (c), color (col), normal (n), alpha (a),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	392 ambient (as), diffuse (ds), specular (ss), specular_exp (se),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	393 specular_color_refl (scr), count (1) { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	394 };
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 private:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	397 vertex_data_rep *rep;
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 vertex_data_rep *nil_rep (void) const
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	400 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	401 static vertex_data_rep *nr = new vertex_data_rep ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	402
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	403 return nr;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	404 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	405
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	406 public:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	407 vertex_data (void) : rep (nil_rep ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	408 { rep->count++; }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	409
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	410 vertex_data (const vertex_data& v) : rep (v.rep)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	411 { rep->count++; }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	412
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	413 vertex_data (const Matrix& c, const Matrix& col, const Matrix& n,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	414 double a, float as, float ds, float ss, float se,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	415 float scr)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	416 : rep (new vertex_data_rep (c, col, n, a, as, ds, ss, se, scr))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	417 { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	418
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	419 vertex_data (vertex_data_rep *new_rep)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	420 : rep (new_rep) { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	421
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	422 ~vertex_data (void)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	423 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	424 if (--rep->count == 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	425 delete rep;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	426 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	427
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	428 vertex_data& operator = (const vertex_data& v)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	429 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	430 if (--rep->count == 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	431 delete rep;
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 rep = v.rep;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	434 rep->count++;
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 return *this;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	437 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	438
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	439 vertex_data_rep *get_rep (void) const { return rep; }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	440 };
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	441
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	442 class
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	443 opengl_renderer::patch_tesselator : public opengl_tesselator
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	444 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	445 public:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	446 patch_tesselator (opengl_renderer *r, int cmode, int lmode, float idx = 0.0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	447 : opengl_tesselator (), renderer (r),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	448 color_mode (cmode), light_mode (lmode), index (idx),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	449 first (true), tmp_vdata ()
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	450 { }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	451
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	452 protected:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	453 void begin (GLenum type)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	454 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	455 //printf ("patch_tesselator::begin (%d)\n", type);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	456 first = true;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	457
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	458 if (color_mode == INTERP \|\| light_mode == GOURAUD)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	459 glShadeModel (GL_SMOOTH);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	460 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	461 glShadeModel (GL_FLAT);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	462
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	463 if (is_filled ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	464 renderer->set_polygon_offset (true, index);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	465
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	466 glBegin (type);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	467 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	468
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	469 void end (void)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	470 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	471 //printf ("patch_tesselator::end\n");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	472 glEnd ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	473 renderer->set_polygon_offset (false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	474 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	475
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	476 void vertex (void *data)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	477 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	478 vertex_data::vertex_data_rep *v
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	479 = reinterpret_cast<vertex_data::vertex_data_rep *> (data);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	480 //printf ("patch_tesselator::vertex (%g, %g, %g)\n", v->coords(0), v->coords(1), v->coords(2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	481
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	482 // 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	483 // 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	484
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	485 if (color_mode == INTERP \|\| (color_mode == FLAT && ! is_filled ()))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	486 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	487 Matrix col = v->color;
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 if (col.numel () == 3)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	490 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	491 glColor3dv (col.data ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	492 if (light_mode > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	493 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	494 float buf[4] = { 0, 0, 0, 1 };
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	495
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	496 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	497 buf[k] = (v->ambient * col(k));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	498 glMaterialfv (LIGHT_MODE, GL_AMBIENT, buf);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	499
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	500 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	501 buf[k] = (v->diffuse * col(k));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	502 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, buf);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	503
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	504 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	505 buf[k] = v->specular * (v->specular_color_refl +
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	506 (1 - v->specular_color_refl) * col(k));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	507 glMaterialfv (LIGHT_MODE, GL_SPECULAR, buf);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	508
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	509 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	510 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	511 }
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 if (light_mode > 0 && (first \|\| light_mode == GOURAUD))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	514 glNormal3dv (v->normal.data ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	515
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	516 glVertex3dv (v->coords.data ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	517
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	518 first = false;
7831 c7925666f0bf Add OpenGL texture wrapper class (not complete yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	519 }
22331 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 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	522 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	523 //printf ("patch_tesselator::combine\n");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	524
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	525 vertex_data::vertex_data_rep *v[4];
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	526 int vmax = 4;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	527
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	528 for (int i = 0; i < 4; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	529 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	530 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	531
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	532 if (vmax == 4 && ! v[i])
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	533 vmax = i;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	534 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	535
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	536 Matrix vv (1, 3, 0.0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	537 Matrix cc;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	538 Matrix nn (1, 3, 0.0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	539 double aa = 0.0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	540
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	541 vv(0) = xyz[0];
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	542 vv(1) = xyz[1];
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	543 vv(2) = xyz[2];
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	544
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	545 if (v[0]->color.numel ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	546 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	547 cc.resize (1, 3, 0.0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	548 for (int ic = 0; ic < 3; ic++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	549 for (int iv = 0; iv < vmax; iv++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	550 cc(ic) += (w[iv] * v[iv]->color (ic));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	551 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	552
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	553 if (v[0]->normal.numel () > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	554 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	555 for (int in = 0; in < 3; in++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	556 for (int iv = 0; iv < vmax; iv++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	557 nn(in) += (w[iv] * v[iv]->normal (in));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	558 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	559
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	560 for (int iv = 0; iv < vmax; iv++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	561 aa += (w[iv] * v[iv]->alpha);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	562
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	563 vertex_data new_v (vv, cc, nn, aa, v[0]->ambient, v[0]->diffuse,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	564 v[0]->specular, v[0]->specular_exp, v[0]->specular_color_refl);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	565 tmp_vdata.push_back (new_v);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	566
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	567 *out_data = new_v.get_rep ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	568 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	569
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	570 private:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	571
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	572 // No copying!
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	573
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	574 patch_tesselator (const patch_tesselator&);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	575
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	576 patch_tesselator& operator = (const patch_tesselator&);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	577
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	578 opengl_renderer *renderer;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	579 int color_mode;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	580 int light_mode;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	581 int index;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	582 bool first;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	583 std::list<vertex_data> tmp_vdata;
7833 8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7831 diff changeset	584 };
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	585
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	586 #else
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	587
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	588 class
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	589 opengl_renderer::patch_tesselator
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	590 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	591 // Dummy class.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	592 };
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	593
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	594 #endif
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	595
22393 026067ffcf66 fix build with minimal dependencies John W. Eaton <jwe@octave.org> parents: 22391 diff changeset	596 }
026067ffcf66 fix build with minimal dependencies John W. Eaton <jwe@octave.org> parents: 22391 diff changeset	597
22258 553490ffc203 Fix compile error and warning with '--without-opengl' (bug #48724) Markus Mützel <markus.muetzel@gmx.de> parents: 22192 diff changeset	598 #if defined (HAVE_OPENGL)
553490ffc203 Fix compile error and warning with '--without-opengl' (bug #48724) Markus Mützel <markus.muetzel@gmx.de> parents: 22192 diff changeset	599
22393 026067ffcf66 fix build with minimal dependencies John W. Eaton <jwe@octave.org> parents: 22391 diff changeset	600 static int
026067ffcf66 fix build with minimal dependencies John W. Eaton <jwe@octave.org> parents: 22391 diff changeset	601 get_maxlights (void)
026067ffcf66 fix build with minimal dependencies John W. Eaton <jwe@octave.org> parents: 22391 diff changeset	602 {
026067ffcf66 fix build with minimal dependencies John W. Eaton <jwe@octave.org> parents: 22391 diff changeset	603
026067ffcf66 fix build with minimal dependencies John W. Eaton <jwe@octave.org> parents: 22391 diff changeset	604 static int max_lights = 0;
026067ffcf66 fix build with minimal dependencies John W. Eaton <jwe@octave.org> parents: 22391 diff changeset	605
026067ffcf66 fix build with minimal dependencies John W. Eaton <jwe@octave.org> parents: 22391 diff changeset	606 // Check actual maximum number of lights possible
026067ffcf66 fix build with minimal dependencies John W. Eaton <jwe@octave.org> parents: 22391 diff changeset	607 if (max_lights == 0)
026067ffcf66 fix build with minimal dependencies John W. Eaton <jwe@octave.org> parents: 22391 diff changeset	608 {
026067ffcf66 fix build with minimal dependencies John W. Eaton <jwe@octave.org> parents: 22391 diff changeset	609 for (max_lights = 0; max_lights < GL_MAX_LIGHTS; max_lights++)
026067ffcf66 fix build with minimal dependencies John W. Eaton <jwe@octave.org> parents: 22391 diff changeset	610 {
026067ffcf66 fix build with minimal dependencies John W. Eaton <jwe@octave.org> parents: 22391 diff changeset	611 glDisable (GL_LIGHT0 + max_lights);
026067ffcf66 fix build with minimal dependencies John W. Eaton <jwe@octave.org> parents: 22391 diff changeset	612 if (glGetError ())
026067ffcf66 fix build with minimal dependencies John W. Eaton <jwe@octave.org> parents: 22391 diff changeset	613 break;
026067ffcf66 fix build with minimal dependencies John W. Eaton <jwe@octave.org> parents: 22391 diff changeset	614 }
026067ffcf66 fix build with minimal dependencies John W. Eaton <jwe@octave.org> parents: 22391 diff changeset	615 }
026067ffcf66 fix build with minimal dependencies John W. Eaton <jwe@octave.org> parents: 22391 diff changeset	616
026067ffcf66 fix build with minimal dependencies John W. Eaton <jwe@octave.org> parents: 22391 diff changeset	617 return max_lights;
026067ffcf66 fix build with minimal dependencies John W. Eaton <jwe@octave.org> parents: 22391 diff changeset	618
026067ffcf66 fix build with minimal dependencies John W. Eaton <jwe@octave.org> parents: 22391 diff changeset	619 }
22192 20b225a3ebf8 Update to light (patch #8943) Markus Mützel <markus.muetzel@gmx.de> parents: 22105 diff changeset	620
20b225a3ebf8 Update to light (patch #8943) Markus Mützel <markus.muetzel@gmx.de> parents: 22105 diff changeset	621 #endif
20b225a3ebf8 Update to light (patch #8943) Markus Mützel <markus.muetzel@gmx.de> parents: 22105 diff changeset	622
22393 026067ffcf66 fix build with minimal dependencies John W. Eaton <jwe@octave.org> parents: 22391 diff changeset	623 namespace octave
026067ffcf66 fix build with minimal dependencies John W. Eaton <jwe@octave.org> parents: 22391 diff changeset	624 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	625 opengl_renderer::opengl_renderer (void)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	626 : toolkit (), xform (), xmin (), xmax (), ymin (), ymax (),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	627 zmin (), zmax (), xZ1 (), xZ2 (), marker_id (), filled_marker_id (),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	628 camera_pos (), camera_dir (), interpreter ("none"), txt_renderer ()
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	629 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	630 // 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	631 // 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	632 // OpenGL types.
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	633
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	634 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	635
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	636 // 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	637 // FIXME: should we check signed vs. unsigned?
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	638
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	639 static bool ok = (sizeof (int) <= sizeof (GLsizei));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	640
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	641 if (! ok)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	642 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	643
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	644 #else
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	645
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	646 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	647
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	648 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	649 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	650
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	651 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	652 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	653 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	654 if (! go.valid_object ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	655 return;
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 const base_properties& props = go.get_properties ();
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 if (! toolkit)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	660 toolkit = props.get_toolkit ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	661
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	662 if (go.isa ("figure"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	663 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	664 else if (go.isa ("axes"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	665 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	666 else if (go.isa ("line"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	667 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	668 else if (go.isa ("surface"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	669 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	670 else if (go.isa ("patch"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	671 draw_patch (dynamic_cast<const patch::properties&> (props));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	672 else if (go.isa ("light"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	673 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	674 else if (go.isa ("hggroup"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	675 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	676 else if (go.isa ("text"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	677 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	678 else if (go.isa ("image"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	679 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	680 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	681 \|\| go.isa ("uicontextmenu") \|\| go.isa ("uitoolbar")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	682 \|\| go.isa ("uipushtool") \|\| go.isa ("uitoggletool"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	683 ; // SKIP
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	684 else if (go.isa ("uipanel"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	685 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	686 if (toplevel)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	687 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	688 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	689 else if (go.isa ("uibuttongroup"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	690 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	691 if (toplevel)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	692 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	693 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	694 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	695 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	696 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	697 props.graphics_object_name ().c_str ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	698 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	699 }
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 #if defined (HAVE_OPENGL)
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 static std::string
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	704 gl_get_string (GLenum id)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	705 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	706 // This is kind of ugly, but glGetString returns a pointer to GLubyte
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	707 // and there is no std::string constructor that matches. Is there a
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	708 // better way?
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	709
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	710 std::ostringstream buf;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	711 buf << glGetString (id);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	712 return std::string (buf.str ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	713 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	714
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	715 #endif
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	716
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	717 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	718 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	719 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	720 // Initialize OpenGL context
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	721
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	722 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	723
21689 9467549bd5ff * gl-render.cc: Allow compilation without OPENGL. John W. Eaton <jwe@octave.org> parents: 21684 diff changeset	724 #if defined (HAVE_OPENGL)
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	725
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	726 props.set___gl_extensions__ (gl_get_string (GL_EXTENSIONS));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	727 props.set___gl_renderer__ (gl_get_string (GL_RENDERER));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	728 props.set___gl_vendor__ (gl_get_string (GL_VENDOR));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	729 props.set___gl_version__ (gl_get_string (GL_VERSION));
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	730
21689 9467549bd5ff * gl-render.cc: Allow compilation without OPENGL. John W. Eaton <jwe@octave.org> parents: 21684 diff changeset	731 #endif
21684 1449e3b98941 store OpenGL version info in figure properties John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	732
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	733 // Draw children
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	734
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	735 draw (props.get_all_children (), false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	736 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	737
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	738 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	739 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	740 const graphics_object& go)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	741 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	742 graphics_object fig = go.get_ancestor ("figure");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	743 const figure::properties& figProps =
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	744 dynamic_cast<const figure::properties&> (fig.get_properties ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	745
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	746 // Initialize OpenGL context
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	747
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	748 init_gl_context (figProps.is_graphicssmoothing (),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	749 props.get_backgroundcolor_rgb ());
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 // Draw children
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	752
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	753 draw (props.get_all_children (), false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	754 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	755
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	756 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	757 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	758 const graphics_object& go)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	759 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	760 graphics_object fig = go.get_ancestor ("figure");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	761 const figure::properties& figProps =
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	762 dynamic_cast<const figure::properties&> (fig.get_properties ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	763
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	764 // Initialize OpenGL context
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	765
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	766 init_gl_context (figProps.is_graphicssmoothing (),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	767 props.get_backgroundcolor_rgb ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	768
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	769 // Draw children
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	770
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	771 draw (props.get_all_children (), false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	772 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	773
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	774 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	775 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	776 {
21689 9467549bd5ff * gl-render.cc: Allow compilation without OPENGL. John W. Eaton <jwe@octave.org> parents: 21684 diff changeset	777 #if defined (HAVE_OPENGL)
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	778
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	779 // Initialize OpenGL context
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	780
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	781 glEnable (GL_DEPTH_TEST);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	782 glDepthFunc (GL_LEQUAL);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	783 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	784 glAlphaFunc (GL_GREATER, 0.0f);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	785 glEnable (GL_NORMALIZE);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	786
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	787 if (enhanced)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	788 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	789 glEnable (GL_BLEND);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	790 glEnable (GL_MULTISAMPLE);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	791 GLint iMultiSample, iNumSamples;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	792 glGetIntegerv (GL_SAMPLE_BUFFERS, &iMultiSample);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	793 glGetIntegerv (GL_SAMPLES, &iNumSamples);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	794 if (iMultiSample != GL_TRUE \|\| iNumSamples == 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	795 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	796 // MultiSample not implemented. Use old-style anti-aliasing
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	797 glDisable (GL_MULTISAMPLE);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	798 glEnable (GL_LINE_SMOOTH);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	799 glHint (GL_LINE_SMOOTH_HINT, GL_NICEST);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	800 }
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 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	803 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	804 glDisable (GL_BLEND);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	805 glDisable (GL_LINE_SMOOTH);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	806 }
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 // Clear background
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	809
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	810 if (c.numel () >= 3)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	811 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	812 glClearColor (c(0), c(1), c(2), 1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	813 glClear (GL_COLOR_BUFFER_BIT \| GL_DEPTH_BUFFER_BIT);
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 #else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	817
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	818 octave_unused_parameter (enhanced);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	819 octave_unused_parameter (c);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	820
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	821 // 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	822 // 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	823
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	824 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	825
21689 9467549bd5ff * gl-render.cc: Allow compilation without OPENGL. John W. Eaton <jwe@octave.org> parents: 21684 diff changeset	826 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	827 }
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 void
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	830 opengl_renderer::render_grid (const double linewidth,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	831 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	832 const Matrix& gridcolor, const double gridalpha,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	833 const Matrix& ticks, double lim1, double lim2,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	834 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	835 int xyz, bool is_3D)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	836 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	837 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	838
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	839 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	840 set_linestyle (gridstyle, true, linewidth);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	841 glBegin (GL_LINES);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	842 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	843 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	844 double val = ticks(i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	845 if (lim1 <= val && val <= lim2)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	846 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	847 if (xyz == X_AXIS)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	848 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	849 glVertex3d (val, p1N, p2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	850 glVertex3d (val, p1, p2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	851 if (is_3D)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	852 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	853 glVertex3d (val, p1, p2N);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	854 glVertex3d (val, p1, p2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	855 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	856 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	857 else if (xyz == Y_AXIS)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	858 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	859 glVertex3d (p1N, val, p2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	860 glVertex3d (p1, val, p2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	861 if (is_3D)
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 glVertex3d (p1, val, p2N);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	864 glVertex3d (p1, val, p2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	865 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	866 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	867 else if (xyz == Z_AXIS)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	868 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	869 glVertex3d (p1N, p2, val);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	870 glVertex3d (p1, p2, val);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	871 glVertex3d (p1, p2N, val);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	872 glVertex3d (p1, p2, val);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	873 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	874 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	875 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	876 glEnd ();
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	877 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	878 double black[3] = {0, 0, 0};
2b1612cf38e4 gl-render.cc/.h: (minor)gridcolor and (minor)gridalpha for OpenGL toolkits (bug #48429) Markus Mützel <markus.muetzel@gmx.de> parents: 22331 diff changeset	879 glColor3dv (black);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	880
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	881 #else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	882
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	883 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	884 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	885 octave_unused_parameter (gridalpha);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	886 octave_unused_parameter (ticks);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	887 octave_unused_parameter (lim1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	888 octave_unused_parameter (lim2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	889 octave_unused_parameter (p1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	890 octave_unused_parameter (p1N);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	891 octave_unused_parameter (p2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	892 octave_unused_parameter (p2N);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	893 octave_unused_parameter (xyz);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	894 octave_unused_parameter (is_3D);
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 ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	900
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	901 #endif
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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	905 opengl_renderer::render_tickmarks (const Matrix& ticks,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	906 double lim1, double lim2,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	907 double p1, double p1N,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	908 double p2, double p2N,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	909 double dx, double dy, double dz,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	910 int xyz, bool mirror)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	911 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	912 #if defined (HAVE_OPENGL)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	913
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	914 glBegin (GL_LINES);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	915
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	916 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	917 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	918 double val = ticks(i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	919
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	920 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 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	924 glVertex3d (val, p1, p2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	925 glVertex3d (val, p1+dy, p2+dz);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	926 if (mirror)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	927 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	928 glVertex3d (val, p1N, p2N);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	929 glVertex3d (val, p1N-dy, p2N-dz);
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 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	934 glVertex3d (p1, val, p2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	935 glVertex3d (p1+dx, val, p2+dz);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	936 if (mirror)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	937 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	938 glVertex3d (p1N, val, p2N);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	939 glVertex3d (p1N-dx, val, p2N-dz);
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 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	944 glVertex3d (p1, p2, val);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	945 glVertex3d (p1+dx, p2+dy, val);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	946 if (mirror)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	947 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	948 glVertex3d (p1N, p2N, val);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	949 glVertex3d (p1N-dx, p2N-dy, val);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	950 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	951 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	952 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	953 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	954
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	955 glEnd ();
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	956
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	957 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	958
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	959 octave_unused_parameter (ticks);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	960 octave_unused_parameter (lim1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	961 octave_unused_parameter (lim2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	962 octave_unused_parameter (p1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	963 octave_unused_parameter (p1N);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	964 octave_unused_parameter (p2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	965 octave_unused_parameter (p2N);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	966 octave_unused_parameter (dx);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	967 octave_unused_parameter (dy);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	968 octave_unused_parameter (dz);
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 (mirror);
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_ticktexts (const Matrix& ticks,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	982 const string_vector& ticklabels,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	983 double lim1, double lim2,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	984 double p1, double p2,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	985 int xyz, int ha, int va,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	986 int& wmax, int& hmax)
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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	990 int nticks = ticks.numel ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	991 int nlabels = ticklabels.numel ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	992
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	993 if (nlabels == 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	994 return;
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 for (int i = 0; i < nticks; i++)
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 double val = ticks(i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	999
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1000 if (lim1 <= val && val <= lim2)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1001 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1002 Matrix b;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1003
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1004 std::string label (ticklabels(i % nlabels));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1005 label.erase (0, label.find_first_not_of (" "));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1006 label = label.substr (0, label.find_last_not_of (" ")+1);
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 // 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	1009 // drawn after axes object, for correct rendering?
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1010 if (xyz == X_AXIS)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1011 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1012 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	1013 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1014 else if (xyz == Y_AXIS)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1015 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1016 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	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 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1020 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	1021 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1022
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1023 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	1024 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	1025 }
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 #else
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 octave_unused_parameter (ticks);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1031 octave_unused_parameter (ticklabels);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1032 octave_unused_parameter (lim1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1033 octave_unused_parameter (lim2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1034 octave_unused_parameter (p1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1035 octave_unused_parameter (p2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1036 octave_unused_parameter (xyz);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1037 octave_unused_parameter (ha);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1038 octave_unused_parameter (va);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1039 octave_unused_parameter (wmax);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1040 octave_unused_parameter (hmax);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1041
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1042 // 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	1043 // 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	1044
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1045 panic_impossible ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1046
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1047 #endif
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1048 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1049
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1050 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1051 opengl_renderer::finish (void)
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 #if defined (HAVE_OPENGL)
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 glFinish ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1056
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1057 #else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1058
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1059 // 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	1060 // 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	1061
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1062 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	1063
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1064 #endif
22331 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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1067 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1068 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	1069 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1070 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1071
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1072 // setup OpenGL transformation
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 Matrix x_zlim = props.get_transform_zlim ();
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 xZ1 = x_zlim(0)-(x_zlim(1)-x_zlim(0))/2;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1077 xZ2 = x_zlim(1)+(x_zlim(1)-x_zlim(0))/2;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1078
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1079 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	1080 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	1081
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1082 #if defined (HAVE_FRAMEWORK_OPENGL)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1083 GLint vw[4];
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1084 #else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1085 int vw[4];
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1086 #endif
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 glGetIntegerv (GL_VIEWPORT, vw);
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 glMatrixMode (GL_MODELVIEW);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1091 glLoadIdentity ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1092 glScaled (1, 1, -1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1093 glMultMatrixd (x_mat1.data ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1094 glMatrixMode (GL_PROJECTION);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1095 glLoadIdentity ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1096 glOrtho (0, vw[2], vw[3], 0, xZ1, xZ2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1097 glMultMatrixd (x_mat2.data ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1098 glMatrixMode (GL_MODELVIEW);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1099
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1100 glClear (GL_DEPTH_BUFFER_BIT);
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 // store axes transformation data
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 xform = props.get_transform ();
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1105
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1106 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	1107
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1108 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1109
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1110 // 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	1111 // 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	1112
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1113 panic_impossible ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1114
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1115 #endif
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1116 }
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 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1119 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	1120 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1121 #if defined (HAVE_OPENGL)
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 Matrix axe_color = props.get_color_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1124 if (axe_color.is_empty () \|\| ! props.is_visible ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1125 return;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1126
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1127 double xPlane = props.get_xPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1128 double yPlane = props.get_yPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1129 double zPlane = props.get_zPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1130 double xPlaneN = props.get_xPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1131 double yPlaneN = props.get_yPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1132 double zPlaneN = props.get_zPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1133 bool is2d = props.get_is2D ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1134
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1135 // Axes planes
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1136 set_color (axe_color);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1137 set_polygon_offset (true, 2.5);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1138
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1139 glBegin (GL_QUADS);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1140
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1141 if (! is2d)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1142 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1143 // X plane
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1144 glVertex3d (xPlane, yPlaneN, zPlaneN);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1145 glVertex3d (xPlane, yPlane, zPlaneN);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1146 glVertex3d (xPlane, yPlane, zPlane);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1147 glVertex3d (xPlane, yPlaneN, zPlane);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1148
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1149 // Y plane
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1150 glVertex3d (xPlaneN, yPlane, zPlaneN);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1151 glVertex3d (xPlane, yPlane, zPlaneN);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1152 glVertex3d (xPlane, yPlane, zPlane);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1153 glVertex3d (xPlaneN, yPlane, zPlane);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1154 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1155
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1156 // Z plane
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1157 glVertex3d (xPlaneN, yPlaneN, zPlane);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1158 glVertex3d (xPlane, yPlaneN, zPlane);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1159 glVertex3d (xPlane, yPlane, zPlane);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1160 glVertex3d (xPlaneN, yPlane, zPlane);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1161
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1162 glEnd ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1163
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1164 set_polygon_offset (false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1165
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1166 #else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1167
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1168 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1169
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1170 // 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	1171 // 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	1172
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1173 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	1174
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1175 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1176 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1177
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1178 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1179 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	1180 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1181 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1182
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1183 if (! props.is_visible ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1184 return;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1185
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1186 bool xySym = props.get_xySym ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1187 bool layer2Dtop = props.get_layer2Dtop ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1188 bool is2d = props.get_is2D ();
22363 0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1189 bool boxFull = (props.get_boxstyle () == "full");
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1190 double linewidth = props.get_linewidth ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1191 double xPlane = props.get_xPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1192 double yPlane = props.get_yPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1193 double zPlane = props.get_zPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1194 double xPlaneN = props.get_xPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1195 double yPlaneN = props.get_yPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1196 double zPlaneN = props.get_zPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1197 double xpTick = props.get_xpTick ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1198 double ypTick = props.get_ypTick ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1199 double zpTick = props.get_zpTick ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1200 double xpTickN = props.get_xpTickN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1201 double ypTickN = props.get_ypTickN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1202 double zpTickN = props.get_zpTickN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1203
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1204 bool plotyy = (props.has_property ("__plotyy_axes__"));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1205
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1206 // Axes box
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1207
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1208 set_linestyle ("-", true, linewidth);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1209
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1210 glBegin (GL_LINES);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1211
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1212 if (layer2Dtop)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1213 std::swap (zpTick, zpTickN);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1214
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1215 // X box
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1216 set_color (props.get_xcolor_rgb ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1217 glVertex3d (xPlaneN, ypTick, zpTick);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1218 glVertex3d (xPlane, ypTick, zpTick);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1219
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1220 if (props.is_box ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1221 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1222 glVertex3d (xPlaneN, ypTickN, zpTick);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1223 glVertex3d (xPlane, ypTickN, zpTick);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1224 if (! is2d)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1225 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1226 glVertex3d (xPlaneN, ypTickN, zpTickN);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1227 glVertex3d (xPlane, ypTickN, zpTickN);
22363 0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1228 if (boxFull)
0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1229 {
0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1230 glVertex3d (xPlaneN, ypTick, zpTickN);
0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1231 glVertex3d (xPlane, ypTick, zpTickN);
0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1232 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1233 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1234 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1235
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1236 // Y box
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1237 set_color (props.get_ycolor_rgb ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1238 glVertex3d (xpTick, yPlaneN, zpTick);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1239 glVertex3d (xpTick, yPlane, zpTick);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1240
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1241 if (props.is_box () && ! plotyy)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1242 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1243 glVertex3d (xpTickN, yPlaneN, zpTick);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1244 glVertex3d (xpTickN, yPlane, zpTick);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1245
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1246 if (! is2d)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1247 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1248 glVertex3d (xpTickN, yPlaneN, zpTickN);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1249 glVertex3d (xpTickN, yPlane, zpTickN);
22363 0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1250 if (boxFull)
0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1251 {
0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1252 glVertex3d (xpTick, yPlaneN, zpTickN);
0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1253 glVertex3d (xpTick, yPlane, zpTickN);
0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1254 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1255 }
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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1258 // Z box
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1259 if (! is2d)
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 set_color (props.get_zcolor_rgb ());
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 if (xySym)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1264 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1265 glVertex3d (xPlaneN, yPlane, zPlaneN);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1266 glVertex3d (xPlaneN, yPlane, zPlane);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1267 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1268 else
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 glVertex3d (xPlane, yPlaneN, zPlaneN);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1271 glVertex3d (xPlane, yPlaneN, zPlane);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1272 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1273
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1274 if (props.is_box ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1275 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1276 glVertex3d (xPlane, yPlane, zPlaneN);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1277 glVertex3d (xPlane, yPlane, zPlane);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1278
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1279 if (xySym)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1280 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1281 glVertex3d (xPlane, yPlaneN, zPlaneN);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1282 glVertex3d (xPlane, yPlaneN, zPlane);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1283 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1284 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1285 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1286 glVertex3d (xPlaneN, yPlane, zPlaneN);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1287 glVertex3d (xPlaneN, yPlane, zPlane);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1288 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1289
22363 0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1290 if (boxFull)
0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1291 {
0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1292 glVertex3d (xPlaneN, yPlaneN, zPlaneN);
0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1293 glVertex3d (xPlaneN, yPlaneN, zPlane);
0ca341841198 Implement "boxstyle" graphics property. Rik <rik@octave.org> parents: 22362 diff changeset	1294 }
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 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1297
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1298 glEnd ();
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1299
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1300 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	1301
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1302 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1303
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1304 // 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	1305 // 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	1306
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1307 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	1308
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1309 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1310 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1311
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1312 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1313 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	1314 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1315 int xstate = props.get_xstate ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1316
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1317 if (props.is_visible () && xstate != AXE_DEPTH_DIR)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1318 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1319 int zstate = props.get_zstate ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1320 bool x2Dtop = props.get_x2Dtop ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1321 bool layer2Dtop = props.get_layer2Dtop ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1322 bool xyzSym = props.get_xyzSym ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1323 bool nearhoriz = props.get_nearhoriz ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1324 double xticklen = props.get_xticklen ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1325 double xtickoffset = props.get_xtickoffset ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1326 double fy = props.get_fy ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1327 double fz = props.get_fz ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1328 double x_min = props.get_x_min ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1329 double x_max = props.get_x_max ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1330 double yPlane = props.get_yPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1331 double yPlaneN = props.get_yPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1332 double ypTick = props.get_ypTick ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1333 double ypTickN = props.get_ypTickN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1334 double zPlane = props.get_zPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1335 double zPlaneN = props.get_zPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1336 double zpTick = props.get_zpTick ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1337 double zpTickN = props.get_zpTickN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1338
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1339 // X grid
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1340
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1341 double linewidth = props.get_linewidth ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1342 std::string gridstyle = props.get_gridlinestyle ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1343 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	1344 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	1345 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	1346 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	1347 double minorgridalpha = props.get_minorgridalpha ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1348 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	1349 bool do_xminorgrid = (props.is_xminorgrid ()
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1350 && (minorgridstyle != "none"));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1351 bool do_xminortick = props.is_xminortick ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1352 Matrix xticks = xform.xscale (props.get_xtick ().matrix_value ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1353 Matrix xmticks = xform.xscale (props.get_xmtick ().matrix_value ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1354 string_vector xticklabels = props.get_xticklabel ().string_vector_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1355 int wmax = 0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1356 int hmax = 0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1357 bool tick_along_z = nearhoriz \|\| octave::math::isinf (fy);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1358 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	1359
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	1360 // 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	1361 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	1362 {
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	1363 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	1364 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	1365 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	1366 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	1367 }
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	1368
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1369 // minor grid lines
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1370 if (do_xminorgrid)
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1371 render_grid (linewidth,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1372 minorgridstyle, minorgridcolor, minorgridalpha,
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1373 xmticks, x_min, x_max,
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1374 yPlane, yPlaneN, layer2Dtop ? zPlaneN : zPlane, zPlaneN,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1375 0, (zstate != AXE_DEPTH_DIR));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1376
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1377 // grid lines
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1378 if (do_xgrid)
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1379 render_grid (linewidth,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1380 gridstyle, gridcolor, gridalpha,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1381 xticks, x_min, x_max,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1382 yPlane, yPlaneN, layer2Dtop ? zPlaneN : zPlane, zPlaneN,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1383 0, (zstate != AXE_DEPTH_DIR));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1384
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1385 set_color (props.get_xcolor_rgb ());
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1386
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1387 // minor tick marks
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1388 if (do_xminortick)
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1389 {
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1390 if (tick_along_z)
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1391 render_tickmarks (xmticks, x_min, x_max, ypTick, ypTick,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1392 zpTick, zpTickN, 0., 0.,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1393 octave::math::signum (zpTick-zpTickN)fzxticklen/2,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1394 0, mirror);
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1395 else
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1396 render_tickmarks (xmticks, x_min, x_max, ypTick, ypTickN,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1397 zpTick, zpTick, 0.,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1398 octave::math::signum (ypTick-ypTickN)fyxticklen/2,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1399 0., 0, mirror);
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1400 }
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1401
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1402 // tick marks
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1403 if (tick_along_z)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1404 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1405 render_tickmarks (xticks, x_min, x_max, ypTick, ypTick,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1406 zpTick, zpTickN, 0., 0.,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1407 octave::math::signum (zpTick-zpTickN)fzxticklen,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1408 0, mirror);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1409 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1410 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1411 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1412 render_tickmarks (xticks, x_min, x_max, ypTick, ypTickN,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1413 zpTick, zpTick, 0.,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1414 octave::math::signum (ypTick-ypTickN)fyxticklen,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1415 0., 0, mirror);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1416 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1417
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1418 // tick texts
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1419 if (xticklabels.numel () > 0)
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 int halign = (xstate == AXE_HORZ_DIR ? 1 : (xyzSym ? 0 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1422 int valign = (xstate == AXE_VERT_DIR ? 1 : (x2Dtop ? 0 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1423
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1424 if (tick_along_z)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1425 render_ticktexts (xticks, xticklabels, x_min, x_max, ypTick,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1426 zpTick+octave::math::signum (zpTick-zpTickN)fzxtickoffset,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1427 0, halign, valign, wmax, hmax);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1428 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1429 render_ticktexts (xticks, xticklabels, x_min, x_max,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1430 ypTick+octave::math::signum (ypTick-ypTickN)fyxtickoffset,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1431 zpTick, 0, halign, valign, wmax, hmax);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1432 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1433
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1434 gh_manager::get_object (props.get_xlabel ()).set ("visible", "on");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1435 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1436 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1437 gh_manager::get_object (props.get_xlabel ()).set ("visible", "off");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1438 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1439
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1440 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1441 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	1442 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1443 int ystate = props.get_ystate ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1444
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1445 if (ystate != AXE_DEPTH_DIR && props.is_visible ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1446 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1447 int zstate = props.get_zstate ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1448 bool y2Dright = props.get_y2Dright ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1449 bool layer2Dtop = props.get_layer2Dtop ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1450 bool xyzSym = props.get_xyzSym ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1451 bool nearhoriz = props.get_nearhoriz ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1452 double yticklen = props.get_yticklen ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1453 double ytickoffset = props.get_ytickoffset ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1454 double fx = props.get_fx ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1455 double fz = props.get_fz ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1456 double xPlane = props.get_xPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1457 double xPlaneN = props.get_xPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1458 double xpTick = props.get_xpTick ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1459 double xpTickN = props.get_xpTickN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1460 double y_min = props.get_y_min ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1461 double y_max = props.get_y_max ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1462 double zPlane = props.get_zPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1463 double zPlaneN = props.get_zPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1464 double zpTick = props.get_zpTick ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1465 double zpTickN = props.get_zpTickN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1466
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1467 // Y grid
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1468
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1469 double linewidth = props.get_linewidth ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1470 std::string gridstyle = props.get_gridlinestyle ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1471 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	1472 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	1473 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	1474 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	1475 double minorgridalpha = props.get_minorgridalpha ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1476 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	1477 bool do_yminorgrid = (props.is_yminorgrid ()
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1478 && (minorgridstyle != "none"));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1479 bool do_yminortick = props.is_yminortick ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1480 Matrix yticks = xform.yscale (props.get_ytick ().matrix_value ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1481 Matrix ymticks = xform.yscale (props.get_ymtick ().matrix_value ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1482 string_vector yticklabels = props.get_yticklabel ().string_vector_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1483 int wmax = 0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1484 int hmax = 0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1485 bool tick_along_z = nearhoriz \|\| octave::math::isinf (fx);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1486 bool mirror = props.is_box () && ystate != AXE_ANY_DIR
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1487 && (! props.has_property ("__plotyy_axes__"));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1488
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	1489 // 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	1490 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	1491 {
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	1492 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	1493 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	1494 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	1495 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	1496 }
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	1497
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1498 // minor grid lines
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1499 if (do_yminorgrid)
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1500 render_grid (linewidth,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1501 minorgridstyle, minorgridcolor, minorgridalpha,
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1502 ymticks, y_min, y_max,
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1503 xPlane, xPlaneN, layer2Dtop ? zPlaneN : zPlane, zPlaneN,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1504 1, (zstate != AXE_DEPTH_DIR));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1505
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1506 // grid lines
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1507 if (do_ygrid)
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1508 render_grid (linewidth,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1509 gridstyle, gridcolor, gridalpha,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1510 yticks, y_min, y_max,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1511 xPlane, xPlaneN, layer2Dtop ? zPlaneN : zPlane, zPlaneN,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1512 1, (zstate != AXE_DEPTH_DIR));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1513
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1514 set_color (props.get_ycolor_rgb ());
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1515
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1516 // minor tick marks
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1517 if (do_yminortick)
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1518 {
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1519 if (tick_along_z)
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1520 render_tickmarks (ymticks, y_min, y_max, xpTick, xpTick,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1521 zpTick, zpTickN, 0., 0.,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1522 octave::math::signum (zpTick-zpTickN)fzyticklen/2,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1523 1, mirror);
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1524 else
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1525 render_tickmarks (ymticks, y_min, y_max, xpTick, xpTickN,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1526 zpTick, zpTick,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1527 octave::math::signum (xpTick-xpTickN)fxyticklen/2,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1528 0., 0., 1, mirror);
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1529 }
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1530
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1531 // tick marks
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1532 if (tick_along_z)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1533 render_tickmarks (yticks, y_min, y_max, xpTick, xpTick,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1534 zpTick, zpTickN, 0., 0.,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1535 octave::math::signum (zpTick-zpTickN)fzyticklen,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1536 1, mirror);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1537 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1538 render_tickmarks (yticks, y_min, y_max, xpTick, xpTickN,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1539 zpTick, zpTick,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1540 octave::math::signum (xPlaneN-xPlane)fxyticklen,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1541 0., 0., 1, mirror);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1542
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1543 // tick texts
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1544 if (yticklabels.numel () > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1545 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1546 int halign = (ystate == AXE_HORZ_DIR
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1547 ? 1 : (! xyzSym \|\| y2Dright ? 0 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1548 int valign = (ystate == AXE_VERT_DIR ? 1 : 2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1549
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1550 if (tick_along_z)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1551 render_ticktexts (yticks, yticklabels, y_min, y_max, xpTick,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1552 zpTick+octave::math::signum (zpTick-zpTickN)fzytickoffset,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1553 1, halign, valign, wmax, hmax);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1554 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1555 render_ticktexts (yticks, yticklabels, y_min, y_max,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1556 xpTick+octave::math::signum (xpTick-xpTickN)fxytickoffset,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1557 zpTick, 1, halign, valign, wmax, hmax);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1558 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1559
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1560 gh_manager::get_object (props.get_ylabel ()).set ("visible", "on");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1561 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1562 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1563 gh_manager::get_object (props.get_ylabel ()).set ("visible", "off");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1564 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1565
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1566 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1567 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	1568 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1569 int zstate = props.get_zstate ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1570
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1571 if (zstate != AXE_DEPTH_DIR && props.is_visible ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1572 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1573 bool xySym = props.get_xySym ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1574 bool zSign = props.get_zSign ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1575 double zticklen = props.get_zticklen ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1576 double ztickoffset = props.get_ztickoffset ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1577 double fx = props.get_fx ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1578 double fy = props.get_fy ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1579 double xPlane = props.get_xPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1580 double xPlaneN = props.get_xPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1581 double yPlane = props.get_yPlane ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1582 double yPlaneN = props.get_yPlaneN ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1583 double z_min = props.get_z_min ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1584 double z_max = props.get_z_max ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1585
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1586 // Z Grid
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1587
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1588 double linewidth = props.get_linewidth ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1589 std::string gridstyle = props.get_gridlinestyle ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1590 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	1591 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	1592 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	1593 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	1594 double minorgridalpha = props.get_minorgridalpha ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1595 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	1596 bool do_zminorgrid = (props.is_zminorgrid ()
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1597 && (minorgridstyle != "none"));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1598 bool do_zminortick = props.is_zminortick ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1599 Matrix zticks = xform.zscale (props.get_ztick ().matrix_value ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1600 Matrix zmticks = xform.zscale (props.get_zmtick ().matrix_value ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1601 string_vector zticklabels = props.get_zticklabel ().string_vector_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1602 int wmax = 0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1603 int hmax = 0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1604 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	1605
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	1606 // 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	1607 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	1608 {
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	1609 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	1610 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	1611 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	1612 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	1613 }
9deb86bb5632 gl-render.cc: Draw minor grid lines at major ticks if major grid is off (bug #48528) Markus Mützel <markus.muetzel@gmx.de> parents: 22347 diff changeset	1614
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1615 // minor grid lines
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1616 if (do_zminorgrid)
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1617 render_grid (linewidth,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1618 minorgridstyle, minorgridcolor, minorgridalpha,
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1619 zmticks, z_min, z_max,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1620 xPlane, xPlaneN, yPlane, yPlaneN, 2, true);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1621
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1622 // grid lines
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1623 if (do_zgrid)
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1624 render_grid (linewidth,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1625 gridstyle, gridcolor, gridalpha,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1626 zticks, z_min, z_max,
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1627 xPlane, xPlaneN, yPlane, yPlaneN, 2, true);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1628
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1629 set_color (props.get_zcolor_rgb ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1630
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1631 // minor tick marks
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1632 if (do_zminortick)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1633 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1634 if (xySym)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1635 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1636 if (octave::math::isinf (fy))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1637 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	1638 yPlane, yPlane,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1639 octave::math::signum (xPlaneN-xPlane)fxzticklen/2,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1640 0., 0., 2, mirror);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1641 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1642 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	1643 yPlane, yPlane, 0.,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1644 octave::math::signum (yPlane-yPlaneN)fyzticklen/2,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1645 0., 2, false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1646 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1647 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1648 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1649 if (octave::math::isinf (fx))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1650 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	1651 yPlaneN, yPlane, 0.,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1652 octave::math::signum (yPlaneN-yPlane)fyzticklen/2,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1653 0., 2, mirror);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1654 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1655 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	1656 yPlaneN, yPlaneN,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1657 octave::math::signum (xPlane-xPlaneN)fxzticklen/2,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1658 0., 0., 2, false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1659 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1660 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1661
22362 f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1662 // tick marks
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1663 if (xySym)
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1664 {
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1665 if (octave::math::isinf (fy))
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1666 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	1667 yPlane, yPlane,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1668 octave::math::signum (xPlaneN-xPlane)fxzticklen,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1669 0., 0., 2, mirror);
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1670 else
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1671 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	1672 yPlane, yPlane, 0.,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1673 octave::math::signum (yPlane-yPlaneN)fyzticklen,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1674 0., 2, false);
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1675 }
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1676 else
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1677 {
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1678 if (octave::math::isinf (fx))
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1679 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	1680 yPlaneN, yPlane, 0.,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1681 octave::math::signum (yPlaneN-yPlane)fyzticklen,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1682 0., 2, mirror);
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1683 else
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1684 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	1685 yPlaneN, yPlane,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1686 octave::math::signum (xPlane-xPlaneN)fxzticklen,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1687 0., 0., 2, false);
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1688 }
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1689
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1690 // tick texts
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1691 if (zticklabels.numel () > 0)
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1692 {
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1693 int halign = 2;
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1694 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	1695
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1696 if (xySym)
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1697 {
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1698 if (octave::math::isinf (fy))
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1699 render_ticktexts (zticks, zticklabels, z_min, z_max,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1700 xPlaneN+octave::math::signum (xPlaneN-xPlane)fxztickoffset,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1701 yPlane, 2, halign, valign, wmax, hmax);
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1702 else
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1703 render_ticktexts (zticks, zticklabels, z_min, z_max, xPlaneN,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1704 yPlane+octave::math::signum (yPlane-yPlaneN)fyztickoffset,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1705 2, halign, valign, wmax, hmax);
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1706 }
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1707 else
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1708 {
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1709 if (octave::math::isinf (fx))
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1710 render_ticktexts (zticks, zticklabels, z_min, z_max, xPlane,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1711 yPlaneN+octave::math::signum (yPlaneN-yPlane)fyztickoffset,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1712 2, halign, valign, wmax, hmax);
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1713 else
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1714 render_ticktexts (zticks, zticklabels, z_min, z_max,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1715 xPlane+octave::math::signum (xPlane-xPlaneN)fxztickoffset,
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1716 yPlaneN, 2, halign, valign, wmax, hmax);
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1717 }
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1718 }
f3ce0015dd42 Draw tick marks in appropriate axes color (OpenGL renderers). Rik <rik@octave.org> parents: 22358 diff changeset	1719
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1720 gh_manager::get_object (props.get_zlabel ()).set ("visible", "on");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1721 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1722 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1723 gh_manager::get_object (props.get_zlabel ()).set ("visible", "off");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1724 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1725
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1726 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1727 opengl_renderer::draw_all_lights (const base_properties& props, std::list<graphics_object>& obj_list)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1728 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1729 #if defined (HAVE_OPENGL)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1730 Matrix children = props.get_all_children ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1731
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1732 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	1733 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1734 graphics_object go = gh_manager::get_object (children(i));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1735
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1736 if (go.get_properties ().is_visible ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1737 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1738 if (go.isa ("light"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1739 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1740 if (num_lights < max_lights)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1741 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1742 current_light = GL_LIGHT0 + num_lights;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1743 set_clipping (go.get_properties ().is_clipping ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1744 draw (go);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1745 num_lights++;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1746 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1747 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1748 warning_with_id ("Octave:max-lights-exceeded",
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1749 "light: Maximum number of lights (%d) in these axes is "
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1750 "exceeded.", max_lights);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1751 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1752 else if (go.isa ("hggroup"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1753 draw_all_lights (go.get_properties (), obj_list);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1754 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1755 obj_list.push_back (go);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1756 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1757 }
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1758 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	1759
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1760 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1761 octave_unused_parameter (obj_list);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1762
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1763 // 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	1764 // 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	1765
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1766 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	1767
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1768 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1769 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1770
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1771 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1772 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	1773 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1774 #if defined (HAVE_OPENGL)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1775 // list for non-light child objects
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1776 std::list<graphics_object> obj_list;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1777 std::list<graphics_object>::iterator it;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1778
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1779 // 1st pass: draw light objects
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1780
22349 2aac9ec7df29 Do not call GL functions before window is open. (bug #48669) Markus Mützel <markus.muetzel@gmx.de> parents: 22348 diff changeset	1781 // 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	1782 // 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	1783 // 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	1784 // 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	1785 // Check actual maximum number of lights possible
2aac9ec7df29 Do not call GL functions before window is open. (bug #48669) Markus Mützel <markus.muetzel@gmx.de> parents: 22348 diff changeset	1786 max_lights = get_maxlights ();
2aac9ec7df29 Do not call GL functions before window is open. (bug #48669) Markus Mützel <markus.muetzel@gmx.de> parents: 22348 diff changeset	1787
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1788 // 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	1789 // 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	1790
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1791 num_lights = 0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1792 draw_all_lights (props, obj_list);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1793
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1794 // disable other OpenGL lights
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1795 for (int i = num_lights; i < max_lights; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1796 glDisable (GL_LIGHT0 + i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1797
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1798 // 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	1799 // other objects
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1800 view_vector = props.get_cameraposition ().matrix_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1801
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1802 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	1803 ColumnVector ambient_color = props.get_ambientlightcolor_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1804 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1805 cb[i] = ambient_color(i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1806 glLightfv (GL_LIGHT0, GL_AMBIENT, cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1807
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1808 // 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	1809
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1810 it = obj_list.begin ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1811 while (it != obj_list.end ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1812 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1813 graphics_object go = (*it);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1814
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1815 // 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	1816 // to "data"
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1817 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	1818 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1819 set_clipping (go.get_properties ().is_clipping ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1820 draw (go);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1821
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1822 it = obj_list.erase (it);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1823 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1824 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1825 it++;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1826 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1827
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1828 // 3rd pass: draw remaining objects
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1829
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1830 glDisable (GL_DEPTH_TEST);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1831
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1832 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	1833 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1834 graphics_object go = (*it);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1835
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1836 set_clipping (go.get_properties ().is_clipping ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1837 draw (go);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1838 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1839
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1840 glEnable (GL_DEPTH_TEST);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1841
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1842 set_clipping (false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1843
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1844 // FIXME: finalize rendering (transparency processing)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1845 // 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	1846
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1847 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	1848
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1849 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1850
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1851 // 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	1852 // 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	1853
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1854 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	1855
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1856 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1857 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1858
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1859 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1860 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	1861 {
22258 553490ffc203 Fix compile error and warning with '--without-opengl' (bug #48724) Markus Mützel <markus.muetzel@gmx.de> parents: 22192 diff changeset	1862 #if defined (HAVE_OPENGL)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1863
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1864 // 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	1865 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	1866 return;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1867
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1868 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	1869
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1870 double x_min = props.get_x_min ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1871 double x_max = props.get_x_max ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1872 double y_min = props.get_y_min ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1873 double y_max = props.get_y_max ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1874 double z_min = props.get_z_min ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1875 double z_max = props.get_z_max ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1876
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1877 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	1878 \|\| 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	1879 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1880 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	1881 return;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1882 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1883
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1884 setup_opengl_transformation (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1885
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1886 // Disable line smoothing for axes
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1887 GLboolean antialias;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1888 glGetBooleanv (GL_LINE_SMOOTH, &antialias);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1889 if (antialias == GL_TRUE)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1890 glDisable (GL_LINE_SMOOTH);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1891
22357 8f23b5b23235 Avoid grid overlaying axes box (bug #48842) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22349 diff changeset	1892 set_font (props);
8f23b5b23235 Avoid grid overlaying axes box (bug #48842) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22349 diff changeset	1893 set_interpreter (props.get_ticklabelinterpreter ());
22358 dc73bbd66363 Make sure all lines associated with axes respect axes linewidth property. Rik <rik@octave.org> parents: 22357 diff changeset	1894 set_linewidth (props.get_linewidth ());
22357 8f23b5b23235 Avoid grid overlaying axes box (bug #48842) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22349 diff changeset	1895
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1896 // draw axes object
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1897 draw_axes_planes (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1898
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1899 draw_axes_x_grid (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1900 draw_axes_y_grid (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1901 draw_axes_z_grid (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1902
22357 8f23b5b23235 Avoid grid overlaying axes box (bug #48842) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22349 diff changeset	1903 if (props.get_tag () != "legend" \|\| props.get_box () != "off")
8f23b5b23235 Avoid grid overlaying axes box (bug #48842) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22349 diff changeset	1904 draw_axes_boxes (props);
8f23b5b23235 Avoid grid overlaying axes box (bug #48842) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22349 diff changeset	1905
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1906 set_linestyle ("-"); // Disable LineStipple
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1907
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1908 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	1909
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1910 // Re-enable line smoothing for children
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1911 if (antialias == GL_TRUE)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1912 glEnable (GL_LINE_SMOOTH);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1913
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1914 draw_axes_children (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1915
22258 553490ffc203 Fix compile error and warning with '--without-opengl' (bug #48724) Markus Mützel <markus.muetzel@gmx.de> parents: 22192 diff changeset	1916 #else
553490ffc203 Fix compile error and warning with '--without-opengl' (bug #48724) Markus Mützel <markus.muetzel@gmx.de> parents: 22192 diff changeset	1917
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1918 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1919
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1920 // 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	1921 // 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	1922
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1923 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	1924
553490ffc203 Fix compile error and warning with '--without-opengl' (bug #48724) Markus Mützel <markus.muetzel@gmx.de> parents: 22192 diff changeset	1925 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1926 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1927
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1928 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1929 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	1930 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	1931 #if defined (HAVE_OPENGL)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1932
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1933 Matrix x = xform.xscale (props.get_xdata ().matrix_value ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1934 Matrix y = xform.yscale (props.get_ydata ().matrix_value ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1935 Matrix z = xform.zscale (props.get_zdata ().matrix_value ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1936
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1937 bool has_z = (z.numel () > 0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1938 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	1939 (has_z ? z.numel ()
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1940 : std::numeric_limits<int>::max ())));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1941 octave_uint8 clip_mask = (props.is_clipping () ? 0x7F : 0x40), clip_ok (0x40);
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 std::vector<octave_uint8> clip (n);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1944
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1945 if (has_z)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1946 for (int i = 0; i < n; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1947 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	1948 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1949 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1950 double z_mid = (zmin+zmax)/2;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1951
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1952 for (int i = 0; i < n; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1953 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	1954 }
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 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	1957 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1958 set_color (props.get_color_rgb ());
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	1959 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	1960 set_linewidth (props.get_linewidth ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1961
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1962 if (has_z)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1963 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1964 bool flag = false;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1965
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1966 for (int i = 1; i < n; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1967 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1968 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	1969 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1970 if (! flag)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1971 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1972 flag = true;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1973 glBegin (GL_LINE_STRIP);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1974 glVertex3d (x(i-1), y(i-1), z(i-1));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1975 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1976 glVertex3d (x(i), y(i), z(i));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1977 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1978 else if (flag)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1979 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1980 flag = false;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1981 glEnd ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1982 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1983 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1984
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1985 if (flag)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1986 glEnd ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1987 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1988 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1989 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1990 bool flag = false;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1991
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1992 for (int i = 1; i < n; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1993 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1994 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	1995 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1996 if (! flag)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1997 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1998 flag = true;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	1999 glBegin (GL_LINE_STRIP);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2000 glVertex2d (x(i-1), y(i-1));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2001 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2002 glVertex2d (x(i), y(i));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2003 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2004 else if (flag)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2005 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2006 flag = false;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2007 glEnd ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2008 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2009 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2010
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2011 if (flag)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2012 glEnd ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2013 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2014
22358 dc73bbd66363 Make sure all lines associated with axes respect axes linewidth property. Rik <rik@octave.org> parents: 22357 diff changeset	2015 set_linewidth (0.5f);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2016 set_linestyle ("-");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2017 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2018
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2019 set_clipping (false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2020
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2021 if (! props.marker_is ("none")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2022 && ! (props.markeredgecolor_is ("none")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2023 && props.markerfacecolor_is ("none")))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2024 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2025 Matrix lc, fc;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2026
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2027 if (props.markeredgecolor_is ("auto"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2028 lc = props.get_color_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2029 else if (! props.markeredgecolor_is ("none"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2030 lc = props.get_markeredgecolor_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2031
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2032 if (props.markerfacecolor_is ("auto"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2033 fc = props.get_color_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2034 else if (! props.markerfacecolor_is ("none"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2035 fc = props.get_markerfacecolor_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2036
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2037 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	2038 props.get_linewidth ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2039
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2040 for (int i = 0; i < n; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2041 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2042 if (clip[i] == clip_ok)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2043 draw_marker (x(i), y(i),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2044 has_z ? z(i) : 0.0,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2045 lc, fc);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2046 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2047
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2048 end_marker ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2049 }
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 set_clipping (props.is_clipping ());
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2052
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2053 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	2054
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2055 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2056
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2057 // 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	2058 // 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	2059
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2060 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	2061
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2062 #endif
22331 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 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2066 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	2067 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2068 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2069
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2070 const Matrix x = xform.xscale (props.get_xdata ().matrix_value ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2071 const Matrix y = xform.yscale (props.get_ydata ().matrix_value ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2072 const Matrix z = xform.zscale (props.get_zdata ().matrix_value ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2073
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2074 int zr = z.rows ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2075 int zc = z.columns ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2076
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2077 NDArray c;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2078 const NDArray n = props.get_vertexnormals ().array_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2079
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2080 // FIXME: handle transparency
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2081 Matrix a;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2082
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2083 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	2084 (props.facecolor_is ("flat") ? 1 :
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2085 (props.facecolor_is ("interp") ? 2 :
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2086 (props.facecolor_is ("texturemap") ? 3 : -1))));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2087 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	2088 (props.facelighting_is ("flat") ? 1 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2089 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	2090 (props.facealpha_is ("flat") ? 1 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2091 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	2092 (props.edgecolor_is ("flat") ? 1 :
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2093 (props.edgecolor_is ("interp") ? 2 : -1)));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2094 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	2095 (props.edgelighting_is ("flat") ? 1 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2096 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	2097 (props.edgealpha_is ("flat") ? 1 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2098 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	2099 (props.backfacelighting_is ("reverselit") ? 1 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2100
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2101 Matrix fcolor = (fc_mode == TEXTURE ? Matrix (1, 3, 1.0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2102 : props.get_facecolor_rgb ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2103 Matrix ecolor = props.get_edgecolor_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2104
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2105 float as = props.get_ambientstrength ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2106 float ds = props.get_diffusestrength ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2107 float ss = props.get_specularstrength ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2108 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	2109 float scr = props.get_specularcolorreflectance ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2110 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	2111
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2112 opengl_texture tex;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2113
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2114 int i1, i2, j1, j2;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2115 bool x_mat = (x.rows () == z.rows ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2116 bool y_mat = (y.columns () == z.columns ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2117
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2118 i1 = i2 = j1 = j2 = 0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2119
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2120 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	2121 c = props.get_color_data ().array_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2122
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2123 boolMatrix clip (z.dims (), false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2124
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2125 for (int i = 0; i < zr; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2126 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2127 if (x_mat)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2128 i1 = i;
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 for (int j = 0; j < zc; j++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2131 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2132 if (y_mat)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2133 j1 = j;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2134
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2135 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	2136 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2137 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2138
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2139 if (fa_mode > 0 \|\| ea_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2140 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2141 // FIXME: implement alphadata conversion
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2142 //a = props.get_alpha_data ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2143 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2144
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2145 if (fl_mode > 0 \|\| el_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2146 glMaterialf (LIGHT_MODE, GL_SHININESS, se);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2147
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2148 // FIXME: good candidate for caching,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2149 // 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	2150 if (fc_mode == TEXTURE)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2151 tex = opengl_texture::create (props.get_color_data ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2152
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2153 if (! props.facecolor_is ("none"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2154 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2155 if (props.get_facealpha_double () == 1)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2156 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2157 if (fc_mode == UNIFORM \|\| fc_mode == TEXTURE)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2158 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2159 glColor3dv (fcolor.data ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2160 if (fl_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2161 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2162 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2163 cb[i] = as * fcolor(i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2164 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2165
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2166 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2167 cb[i] = ds * fcolor(i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2168 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2169
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2170 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2171 cb[i] = ss * (scr + (1-scr) * fcolor(i));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2172 glMaterialfv (LIGHT_MODE, GL_SPECULAR, cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2173 }
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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2176 if ((fl_mode > 0) && (num_lights > 0))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2177 glEnable (GL_LIGHTING);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2178 glShadeModel ((fc_mode == INTERP \|\| fl_mode == GOURAUD) ? GL_SMOOTH
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2179 : GL_FLAT);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2180 set_polygon_offset (true, 1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2181 if (fc_mode == TEXTURE)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2182 glEnable (GL_TEXTURE_2D);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2183
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2184 for (int i = 1; i < zc; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2185 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2186 if (y_mat)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2187 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2188 i1 = i-1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2189 i2 = i;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2190 }
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 for (int j = 1; j < zr; j++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2193 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2194
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2195 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	2196 \|\| clip(j-1, i) \|\| clip(j, i))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2197 continue;
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 if (fc_mode == FLAT)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2200 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2201 // "flat" only needs color at lower-left vertex
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2202 if (! octave::math::finite (c(j-1,i-1)))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2203 continue;
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 else if (fc_mode == INTERP)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2206 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2207 // "interp" needs valid color at all 4 vertices
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2208 if (! (octave::math::finite (c(j-1, i-1)) && octave::math::finite (c(j, i-1))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2209 && octave::math::finite (c(j-1, i)) && octave::math::finite (c(j, i))))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2210 continue;
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 if (x_mat)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2214 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2215 j1 = j-1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2216 j2 = j;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2217 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2218
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2219 glBegin (GL_QUADS);
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 // Vertex 1
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2222 if (fc_mode == TEXTURE)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2223 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	2224 double (j-1) / (zr-1));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2225 else if (fc_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2226 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2227 // 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	2228 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2229 cb[k] = c(j-1, i-1, k);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2230 glColor3fv (cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2231
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2232 if (fl_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2233 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2234 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2235 cb[k] *= as;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2236 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2237
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2238 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2239 cb[k] = ds * c(j-1, i-1, k);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2240 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2241
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2242 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2243 cb[k] = ss * (scr + (1-scr) * c(j-1, i-1, k));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2244 glMaterialfv (LIGHT_MODE, GL_SPECULAR, cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2245 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2246 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2247 if (fl_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2248 set_normal (bfl_mode, n, j-1, i-1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2249
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2250 glVertex3d (x(j1,i-1), y(j-1,i1), z(j-1,i-1));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2251
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2252 // Vertex 2
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2253 if (fc_mode == TEXTURE)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2254 tex.tex_coord (double (i) / (zc-1), double (j-1) / (zr-1));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2255 else if (fc_mode == INTERP)
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 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2258 cb[k] = c(j-1, i, k);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2259 glColor3fv (cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2260
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2261 if (fl_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2262 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2263 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2264 cb[k] *= as;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2265 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2266
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2267 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2268 cb[k] = ds * c(j-1, i, k);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2269 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
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 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2272 cb[k] = ss * (scr + (1-scr) * c(j-1, i, k));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2273 glMaterialfv (LIGHT_MODE, GL_SPECULAR, cb);
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 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2276
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2277 if (fl_mode == GOURAUD)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2278 set_normal (bfl_mode, n, j-1, i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2279
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2280 glVertex3d (x(j1,i), y(j-1,i2), z(j-1,i));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2281
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2282 // Vertex 3
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2283 if (fc_mode == TEXTURE)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2284 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	2285 else if (fc_mode == INTERP)
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 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2288 cb[k] = c(j, i, k);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2289 glColor3fv (cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2290
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2291 if (fl_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2292 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2293 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2294 cb[k] *= as;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2295 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2296
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2297 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2298 cb[k] = ds * c(j, i, k);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2299 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2300
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2301 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2302 cb[k] = ss * (scr + (1-scr) * c(j, i, k));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2303 glMaterialfv (LIGHT_MODE, GL_SPECULAR, cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2304 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2305 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2306 if (fl_mode == GOURAUD)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2307 set_normal (bfl_mode, n, j, i);
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 glVertex3d (x(j2,i), y(j,i2), z(j,i));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2310
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2311 // Vertex 4
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2312 if (fc_mode == TEXTURE)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2313 tex.tex_coord (double (i-1) / (zc-1), double (j) / (zr-1));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2314 else if (fc_mode == INTERP)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2315 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2316 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2317 cb[k] = c(j, i-1, k);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2318 glColor3fv (cb);
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 if (fl_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2321 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2322 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2323 cb[k] *= as;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2324 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2325
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2326 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2327 cb[k] = ds * c(j, i-1, k);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2328 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
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 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2331 cb[k] = ss * (scr + (1-scr) * c(j, i-1, k));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2332 glMaterialfv (LIGHT_MODE, GL_SPECULAR, cb);
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 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2335 if (fl_mode == GOURAUD)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2336 set_normal (bfl_mode, n, j, i-1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2337
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2338 glVertex3d (x(j2,i-1), y(j,i1), z(j,i-1));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2339
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2340 glEnd ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2341 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2342 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2343
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2344 set_polygon_offset (false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2345 if (fc_mode == TEXTURE)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2346 glDisable (GL_TEXTURE_2D);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2347
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2348 if ((fl_mode > 0) && (num_lights > 0))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2349 glDisable (GL_LIGHTING);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2350 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2351 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2352 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2353 // FIXME: implement transparency
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 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2356
22391 c5da5e5e9846 Fix inconsistent on-screen/printout patch and surface edges (bug #48873). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22369 diff changeset	2357 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	2358 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2359 if (props.get_edgealpha_double () == 1)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2360 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2361 if (ec_mode == UNIFORM)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2362 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2363 glColor3dv (ecolor.data ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2364 if (fl_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2365 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2366 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2367 cb[i] = as * ecolor(i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2368 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2369
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2370 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2371 cb[i] = ds * ecolor(i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2372 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2373
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2374 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2375 cb[i] = ss * (scr + (1-scr) * ecolor(i));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2376 glMaterialfv (LIGHT_MODE, GL_SPECULAR, cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2377 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2378 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2379
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2380 if ((el_mode > 0) && (num_lights > 0))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2381 glEnable (GL_LIGHTING);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2382 glShadeModel ((ec_mode == INTERP \|\| el_mode == GOURAUD) ? GL_SMOOTH
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2383 : GL_FLAT);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2384
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	2385 set_linestyle (props.get_linestyle (), false,
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	2386 props.get_linewidth ());
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2387 set_linewidth (props.get_linewidth ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2388
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2389 // Mesh along Y-axis
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2390
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2391 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	2392 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2393 for (int i = 0; i < zc; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2394 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2395 if (y_mat)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2396 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2397 i1 = i-1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2398 i2 = i;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2399 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2400
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2401 for (int j = 1; j < zr; j++)
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 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	2404 continue;
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 if (ec_mode == FLAT)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2407 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2408 // "flat" only needs color at lower-left vertex
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2409 if (! octave::math::finite (c(j-1,i)))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2410 continue;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2411 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2412 else if (ec_mode == INTERP)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2413 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2414 // "interp" needs valid color at both vertices
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2415 if (! (octave::math::finite (c(j-1, i)) && octave::math::finite (c(j, i))))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2416 continue;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2417 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2418
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2419 if (x_mat)
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 j1 = j-1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2422 j2 = j;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2423 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2424
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2425 glBegin (GL_LINES);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2426
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2427 // Vertex 1
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2428 if (ec_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2429 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2430 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2431 cb[k] = c(j-1, i, k);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2432 glColor3fv (cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2433
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2434 if (el_mode > 0)
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 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2437 cb[k] *= as;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2438 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2439
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2440 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2441 cb[k] = ds * c(j-1, i, k);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2442 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2443
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2444 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2445 cb[k] = ss * (scr + (1-scr) * c(j-1, i, k));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2446 glMaterialfv (LIGHT_MODE, GL_SPECULAR, cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2447 }
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 (el_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2450 set_normal (bfl_mode, n, j-1, i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2451
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2452 glVertex3d (x(j1,i), y(j-1,i2), z(j-1,i));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2453
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2454 // Vertex 2
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2455 if (ec_mode == INTERP)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2456 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2457 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2458 cb[k] = c(j, i, k);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2459 glColor3fv (cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2460
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2461 if (el_mode > 0)
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 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2464 cb[k] *= as;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2465 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
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 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2468 cb[k] = ds * c(j, i, k);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2469 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
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 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2472 cb[k] = ss * (scr + (1-scr) * c(j, i, k));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2473 glMaterialfv (LIGHT_MODE, GL_SPECULAR, cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2474 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2475 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2476 if (el_mode == GOURAUD)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2477 set_normal (bfl_mode, n, j, i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2478
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2479 glVertex3d (x(j2,i), y(j,i2), z(j,i));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2480
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2481 glEnd ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2482 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2483 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2484 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2485
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2486 // Mesh along X-axis
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2487
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2488 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	2489 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2490 for (int j = 0; j < zr; j++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2491 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2492 if (x_mat)
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 j1 = j-1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2495 j2 = j;
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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2498 for (int i = 1; i < zc; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2499 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2500 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	2501 continue;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2502
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2503 if (ec_mode == FLAT)
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 // "flat" only needs color at lower-left vertex
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2506 if (! octave::math::finite (c(j,i-1)))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2507 continue;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2508 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2509 else if (ec_mode == INTERP)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2510 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2511 // "interp" needs valid color at both vertices
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2512 if (! (octave::math::finite (c(j, i-1)) && octave::math::finite (c(j, i))))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2513 continue;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2514 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2515
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2516 if (y_mat)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2517 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2518 i1 = i-1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2519 i2 = i;
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 glBegin (GL_LINES);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2523
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2524 // Vertex 1
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2525 if (ec_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2526 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2527 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2528 cb[k] = c(j, i-1, k);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2529 glColor3fv (cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2530
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2531 if (el_mode > 0)
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 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2534 cb[k] *= as;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2535 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2536
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2537 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2538 cb[k] = ds * c(j, i-1, k);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2539 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2540
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2541 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2542 cb[k] = ss * (scr + (1-scr) * c(j, i-1, k));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2543 glMaterialfv (LIGHT_MODE, GL_SPECULAR, cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2544 }
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 if (el_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2547 set_normal (bfl_mode, n, j, i-1);
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 glVertex3d (x(j2,i-1), y(j,i1), z(j,i-1));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2550
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2551 // Vertex 2
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2552 if (ec_mode == INTERP)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2553 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2554 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2555 cb[k] = c(j, i, k);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2556 glColor3fv (cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2557
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2558 if (el_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2559 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2560 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2561 cb[k] *= as;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2562 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2563
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2564 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2565 cb[k] = ds * c(j, i, k);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2566 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2567
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2568 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2569 cb[k] = ss * (scr + (1-scr) * c(j, i, k));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2570 glMaterialfv (LIGHT_MODE, GL_SPECULAR, cb);
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 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2573 if (el_mode == GOURAUD)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2574 set_normal (bfl_mode, n, j, i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2575
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2576 glVertex3d (x(j2,i), y(j,i2), z(j,i));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2577
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2578 glEnd ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2579 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2580 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2581 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2582
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	2583 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	2584 set_linewidth (0.5f);
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 if ((el_mode > 0) && (num_lights > 0))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2587 glDisable (GL_LIGHTING);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2588 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2589 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2590 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2591 // FIXME: implement transparency
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2592 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2593 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2594
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2595 if (! props.marker_is ("none")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2596 && ! (props.markeredgecolor_is ("none")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2597 && props.markerfacecolor_is ("none")))
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 // 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	2600 // 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	2601 // and facecolor set to none.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2602
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2603 bool do_edge = ! props.markeredgecolor_is ("none");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2604 bool do_face = ! props.markerfacecolor_is ("none");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2605
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2606 Matrix mecolor = props.get_markeredgecolor_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2607 Matrix mfcolor = props.get_markerfacecolor_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2608 Matrix cc (1, 3, 0.0);
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 if (mecolor.is_empty () && props.markeredgecolor_is ("auto"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2611 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2612 mecolor = props.get_edgecolor_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2613 do_edge = ! props.edgecolor_is ("none");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2614 }
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 if (mfcolor.is_empty () && props.markerfacecolor_is ("auto"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2617 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2618 mfcolor = props.get_facecolor_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2619 do_face = ! props.facecolor_is ("none");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2620 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2621
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2622 if ((mecolor.is_empty () \|\| mfcolor.is_empty ()) && c.is_empty ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2623 c = props.get_color_data ().array_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2624
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2625 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	2626 props.get_linewidth ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2627
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2628 for (int i = 0; i < zc; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2629 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2630 if (y_mat)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2631 i1 = i;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2632
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2633 for (int j = 0; j < zr; j++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2634 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2635 if (clip(j,i))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2636 continue;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2637
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2638 if (x_mat)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2639 j1 = j;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2640
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2641 if ((do_edge && mecolor.is_empty ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2642 \|\| (do_face && mfcolor.is_empty ()))
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 if (! octave::math::finite (c(j,i)))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2645 continue; // Skip NaNs in color data
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2646
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2647 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2648 cc(k) = c(j,i,k);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2649 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2650
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2651 Matrix lc = (do_edge ? (mecolor.is_empty () ? cc : mecolor)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2652 : Matrix ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2653 Matrix fc = (do_face ? (mfcolor.is_empty () ? cc : mfcolor)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2654 : Matrix ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2655
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2656 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	2657 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2658 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2659
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2660 end_marker ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2661 }
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2662
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2663 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	2664
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2665 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2666
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2667 // 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	2668 // 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	2669
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2670 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	2671
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2672 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2673 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2674
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2675 // FIXME: global optimization (rendering, data structures...),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2676 // 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	2677 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2678 opengl_renderer::draw_patch (const patch::properties &props)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2679 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2680 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	2681
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2682 // 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	2683 std::string msg;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2684 if (props.has_bad_data (msg))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2685 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2686 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	2687 return;
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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2690 const Matrix f = props.get_faces ().matrix_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2691 const Matrix v = xform.scale (props.get_vertices ().matrix_value ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2692 Matrix c;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2693 const Matrix n = props.get_vertexnormals ().matrix_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2694 Matrix a;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2695
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2696 int nv = v.rows ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2697 int nf = f.rows ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2698 int fcmax = f.columns ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2699
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2700 bool has_z = (v.columns () > 2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2701 bool has_facecolor = false;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2702 bool has_facealpha = false;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2703 // FIXME: remove when patch object has normal computation (patch #8951)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2704 bool has_normals = (n.rows () == nv);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2705
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2706 int fc_mode = ((props.facecolor_is ("none")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2707 \|\| props.facecolor_is_rgb ()) ? 0 :
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2708 (props.facecolor_is ("flat") ? 1 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2709 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	2710 (props.facelighting_is ("flat") ? 1 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2711 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	2712 (props.facealpha_is ("flat") ? 1 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2713 int ec_mode = ((props.edgecolor_is ("none")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2714 \|\| props.edgecolor_is_rgb ()) ? 0 :
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2715 (props.edgecolor_is ("flat") ? 1 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2716 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	2717 (props.edgelighting_is ("flat") ? 1 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2718 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	2719 (props.edgealpha_is ("flat") ? 1 : 2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2720 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	2721 (props.backfacelighting_is ("reverselit") ? 1 : 2));
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 Matrix fcolor = props.get_facecolor_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2724 Matrix ecolor = props.get_edgecolor_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2725
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2726 float as = props.get_ambientstrength ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2727 float ds = props.get_diffusestrength ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2728 float ss = props.get_specularstrength ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2729 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	2730 float scr = props.get_specularcolorreflectance ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2731
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2732 boolMatrix clip (1, nv, false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2733
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2734 if (has_z)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2735 for (int i = 0; i < nv; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2736 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	2737 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2738 for (int i = 0; i < nv; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2739 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	2740
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2741 boolMatrix clip_f (1, nf, false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2742 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	2743
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2744 for (int i = 0; i < nf; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2745 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2746 bool fclip = false;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2747 int count = 0;
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 j = 0; j < fcmax && ! octave::math::isnan (f(i,j)); j++, count++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2750 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	2751
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2752 clip_f(i) = fclip;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2753 count_f(i) = count;
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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2756 if (fc_mode > 0 \|\| ec_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2757 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2758 c = props.get_color_data ().matrix_value ();
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 if (c.rows () == 1)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2761 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2762 // 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	2763
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2764 if (fc_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2765 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2766 fcolor = c;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2767 fc_mode = UNIFORM;
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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2770 if (ec_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2771 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2772 ecolor = c;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2773 ec_mode = UNIFORM;
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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2776 c = Matrix ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2777 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2778 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2779 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	2780 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2781
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2782 if (fa_mode > 0 \|\| ea_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2783 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2784 // FIXME: retrieve alpha data from patch object
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2785 //a = props.get_alpha_data ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2786 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	2787 }
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 octave_idx_type fr = f.rows ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2790 std::vector<vertex_data> vdata (f.numel ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2791
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2792 for (int i = 0; i < nf; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2793 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	2794 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2795 int idx = int (f(i,j) - 1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2796
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2797 Matrix vv (1, 3, 0.0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2798 Matrix cc;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2799 Matrix nn (1, 3, 0.0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2800 double aa = 1.0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2801
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2802 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	2803 if (has_z)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2804 vv(2) = v(idx,2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2805 if (has_normals)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2806 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2807 double dir = 1.0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2808 if (bfl_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2809 dir = ((n(idx,0) * view_vector(0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2810 + n(idx,1) * view_vector(1)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2811 + n(idx,2) * view_vector(2) < 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2812 ? ((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	2813 nn(0) = dir * n(idx,0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2814 nn(1) = dir * n(idx,1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2815 nn(2) = dir * n(idx,2);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2816 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2817 if (c.numel () > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2818 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2819 cc.resize (1, 3);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2820 if (has_facecolor)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2821 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	2822 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2823 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	2824 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2825 if (a.numel () > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2826 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2827 if (has_facealpha)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2828 aa = a(i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2829 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2830 aa = a(idx);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2831 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2832
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2833 vdata[i+j*fr] = vertex_data (vv, cc, nn, aa, as, ds, ss, se, scr);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	2834 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2835
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2836 if (fl_mode > 0 \|\| el_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2837 glMaterialf (LIGHT_MODE, GL_SHININESS, se);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2838
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2839 if (! props.facecolor_is ("none"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2840 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2841 // FIXME: adapt to double-radio property
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2842 if (props.get_facealpha_double () == 1)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2843 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2844 if (fc_mode == UNIFORM)
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 glColor3dv (fcolor.data ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2847 if (fl_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2848 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2849 float cb[4] = { 0, 0, 0, 1 };
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2850
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2851 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2852 cb[i] = as * fcolor(i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2853 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2854
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2855 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2856 cb[i] = ds * fcolor(i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2857 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
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 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2860 cb[i] = ss * (scr + (1-scr) * fcolor(i));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2861 glMaterialfv (LIGHT_MODE, GL_SPECULAR, cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2862 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2863 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2864
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2865 if ((fl_mode > 0) && (num_lights > 0) && has_normals)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2866 glEnable (GL_LIGHTING);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2867
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2868 // NOTE: Push filled part of patch backwards to avoid Z-fighting with
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2869 // tesselator outline. A value of 1.0 seems to work fine. Value
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2870 // can't be too large or the patch will be pushed below the axes
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2871 // planes at +2.5.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2872 patch_tesselator tess (this, fc_mode, fl_mode, 1.0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2873
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2874 for (int i = 0; i < nf; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2875 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2876 if (clip_f(i))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2877 continue;
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 tess.begin_polygon (true);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2880 tess.begin_contour ();
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 // 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	2883 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	2884 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2885 vertex_data::vertex_data_rep vv = vdata[i+jfr].get_rep ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2886
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2887 tess.add_vertex (vv->coords.fortran_vec (), vv);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2888 }
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 if (count_f(i) > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2891 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2892 vertex_data::vertex_data_rep *vv = vdata[i].get_rep ();
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 if (fc_mode == FLAT)
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 // For "flat" shading, use color of 1st vertex.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2897 Matrix col = vv->color;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2898
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2899 if (col.numel () == 3)
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 glColor3dv (col.data ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2902 if (fl_mode > 0)
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 float cb[4] = { 0, 0, 0, 1 };
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2905
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2906 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2907 cb[k] = (vv->ambient * col(k));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2908 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
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 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2911 cb[k] = (vv->diffuse * col(k));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2912 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2913
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2914 for (int k = 0; k < 3; k++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2915 cb[k] = vv->specular * (vv->specular_color_refl
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2916 + (1-vv->specular_color_refl) * col(k));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2917 glMaterialfv (LIGHT_MODE, GL_SPECULAR, cb);
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 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2920 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2921
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2922 tess.add_vertex (vv->coords.fortran_vec (), vv);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2923 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2924
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2925 tess.end_contour ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2926 tess.end_polygon ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2927 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2928
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2929 if ((fl_mode > 0) && (num_lights > 0) && has_normals)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2930 glDisable (GL_LIGHTING);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2931 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2932 else
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 // FIXME: implement transparency
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2935 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2936 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2937
22391 c5da5e5e9846 Fix inconsistent on-screen/printout patch and surface edges (bug #48873). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 22369 diff changeset	2938 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	2939 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2940 // FIXME: adapt to double-radio property
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2941 if (props.get_edgealpha_double () == 1)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2942 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2943 if (ec_mode == UNIFORM)
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 glColor3dv (ecolor.data ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2946 if (el_mode > 0)
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 float cb[4] = { 0, 0, 0, 1 };
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2949
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2950 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2951 cb[i] = (as * ecolor(i));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2952 glMaterialfv (LIGHT_MODE, GL_AMBIENT, cb);
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 i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2955 cb[i] = ds * ecolor(i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2956 glMaterialfv (LIGHT_MODE, GL_DIFFUSE, cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2957
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2958 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2959 cb[i] = ss * (scr + (1-scr) * ecolor(i));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2960 glMaterialfv (LIGHT_MODE, GL_SPECULAR, cb);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2961 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2962 }
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 if ((el_mode > 0) && (num_lights > 0) && has_normals)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2965 glEnable (GL_LIGHTING);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2966
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	2967 double linewidth = props.get_linewidth ();
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	2968 set_linestyle (props.get_linestyle (), false, linewidth);
52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	2969 set_linewidth (linewidth);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2970
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2971 // NOTE: patch contour cannot be offset. Offset must occur with the
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2972 // filled portion of the patch above. The tesselator uses
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2973 // 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	2974 // 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	2975 // not supported by glPolygonOffset which is used to do Z offsets.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2976 patch_tesselator tess (this, ec_mode, el_mode);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2977
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2978 for (int i = 0; i < nf; i++)
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 if (clip_f(i))
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 // This is an unclosed contour. Draw it as a line.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2983 bool flag = false;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2984
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2985 glShadeModel ((ec_mode == INTERP \|\| el_mode == GOURAUD)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2986 ? GL_SMOOTH : GL_FLAT);
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 // 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	2989 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	2990 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2991 if (! clip(int (f(i,j) - 1)))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2992 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2993 vertex_data::vertex_data_rep *vv
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2994 = vdata[i+j*fr].get_rep ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2995 const Matrix m = vv->coords;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2996 if (! flag)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2997 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2998 flag = true;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	2999 glBegin (GL_LINE_STRIP);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3000 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3001 if (ec_mode != UNIFORM)
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 Matrix col = vv->color;
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 if (col.numel () == 3)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3006 glColor3dv (col.data ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3007 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3008 glVertex3d (m(0), m(1), m(2));
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 else if (flag)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3011 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3012 flag = false;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3013 glEnd ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3014 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3015 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3016 // 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	3017 // from vertex 0 to vertex N.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3018 int j = count_f(i)-1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3019 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	3020 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3021 vertex_data::vertex_data_rep *vv
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3022 = vdata[i+j*fr].get_rep ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3023 const Matrix m = vv->coords;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3024 if (ec_mode != UNIFORM)
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 Matrix col = vv->color;
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 if (col.numel () == 3)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3029 glColor3dv (col.data ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3030 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3031 glVertex3d (m(0), m(1), m(2));
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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3034 if (flag)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3035 glEnd ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3036 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3037 else // Normal edge contour drawn with tesselator
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3038 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3039 tess.begin_polygon (false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3040 tess.begin_contour ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3041
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3042 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	3043 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3044 vertex_data::vertex_data_rep *vv
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3045 = vdata[i+j*fr].get_rep ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3046 tess.add_vertex (vv->coords.fortran_vec (), vv);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3047 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3048
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3049 tess.end_contour ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3050 tess.end_polygon ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3051 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3052 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3053
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	3054 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	3055 set_linewidth (0.5f);
22331 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 if ((el_mode > 0) && (num_lights > 0) && has_normals)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3058 glDisable (GL_LIGHTING);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3059 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3060 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3061 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3062 // FIXME: implement transparency
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3063 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3064 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3065
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3066 if (! props.marker_is ("none")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3067 && ! (props.markeredgecolor_is ("none")
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3068 && props.markerfacecolor_is ("none")))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3069 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3070 bool do_edge = ! props.markeredgecolor_is ("none");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3071 bool do_face = ! props.markerfacecolor_is ("none");
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 Matrix mecolor = props.get_markeredgecolor_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3074 Matrix mfcolor = props.get_markerfacecolor_rgb ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3075
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3076 bool has_markerfacecolor = false;
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 if ((mecolor.is_empty () && ! props.markeredgecolor_is ("none"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3079 \|\| (mfcolor.is_empty () && ! props.markerfacecolor_is ("none")))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3080 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3081 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	3082
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3083 if (mc.rows () == 1)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3084 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3085 // 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	3086 if (mfcolor.is_empty () && ! props.markerfacecolor_is ("none"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3087 mfcolor = mc;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3088
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3089 if (mecolor.is_empty () && ! props.markeredgecolor_is ("none"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3090 mecolor = mc;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3091 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3092 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3093 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3094 if (c.is_empty ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3095 c = props.get_color_data ().matrix_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3096 has_markerfacecolor = ((c.numel () > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3097 && (c.rows () == f.rows ()));
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 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	3102 props.get_linewidth ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3103
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3104 for (int i = 0; i < nf; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3105 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	3106 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3107 int idx = int (f(i,j) - 1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3108
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3109 if (clip(idx))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3110 continue;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3111
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3112 Matrix cc;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3113 if (c.numel () > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3114 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3115 cc.resize (1, 3);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3116 if (has_markerfacecolor)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3117 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	3118 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3119 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	3120 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3121
20974 1edf15793cac maint: Use is_empty rather than "numel () == 0" for clarity. Rik <rik@octave.org> parents: 20955 diff changeset	3122 Matrix lc = (do_edge ? (mecolor.is_empty () ? cc : mecolor)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3123 : Matrix ());
20974 1edf15793cac maint: Use is_empty rather than "numel () == 0" for clarity. Rik <rik@octave.org> parents: 20955 diff changeset	3124 Matrix fc = (do_face ? (mfcolor.is_empty () ? cc : mfcolor)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3125 : Matrix ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3126
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3127 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	3128 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3129
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3130 end_marker ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3131 }
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3132
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3133 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3134
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3135 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3136
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3137 // 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	3138 // 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	3139
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3140 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3141
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3142 #endif
22331 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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3145 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3146 opengl_renderer::draw_light (const light::properties &props)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3147 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3148 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3149
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3150 // enable light source
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3151 glEnable (current_light);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3152
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3153 // light position
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3154 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	3155 Matrix lpos = props.get_position ().matrix_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3156 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3157 pos[i] = lpos(i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3158 if (props.style_is ("local"))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3159 pos[3] = 1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3160 glLightfv (current_light, GL_POSITION, pos);
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 // light color
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3163 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	3164 Matrix lcolor = props.get_color ().matrix_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3165 for (int i = 0; i < 3; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3166 col[i] = lcolor(i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3167 glLightfv (current_light, GL_DIFFUSE, col);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3168 glLightfv (current_light, GL_SPECULAR, col);
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3169
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3170 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3171
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3172 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3173
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3174 // 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	3175 // 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	3176
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3177 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3178
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3179 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3180 }
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 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3183 opengl_renderer::draw_hggroup (const hggroup::properties &props)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3184 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3185 draw (props.get_children ());
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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3188 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3189 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	3190 {
21789 6afdf40be534 Implement graphics object "light" (patch #8943). mmuetzel <markus.muetzel@gmx.de> parents: 21782 diff changeset	3191 #if defined (HAVE_OPENGL)
6afdf40be534 Implement graphics object "light" (patch #8943). mmuetzel <markus.muetzel@gmx.de> parents: 21782 diff changeset	3192
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3193 if (props.get_string ().is_empty ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3194 return;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3195
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3196 set_font (props);
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 Matrix pos = xform.scale (props.get_data_position ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3199 const Matrix bbox = props.get_extent_matrix ();
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 // FIXME: handle margin and surrounding box
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3202 bool blend = glIsEnabled (GL_BLEND);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3203
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3204 glEnable (GL_BLEND);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3205 glEnable (GL_ALPHA_TEST);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3206 glRasterPos3d (pos(0), pos(1), pos.numel () > 2 ? pos(2) : 0.0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3207 glBitmap (0, 0, 0, 0, bbox(0), bbox(1), 0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3208 glDrawPixels (bbox(2), bbox(3),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3209 GL_RGBA, GL_UNSIGNED_BYTE, props.get_pixels ().data ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3210 glDisable (GL_ALPHA_TEST);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3211 if (! blend)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3212 glDisable (GL_BLEND);
21789 6afdf40be534 Implement graphics object "light" (patch #8943). mmuetzel <markus.muetzel@gmx.de> parents: 21782 diff changeset	3213
6afdf40be534 Implement graphics object "light" (patch #8943). mmuetzel <markus.muetzel@gmx.de> parents: 21782 diff changeset	3214 #else
6afdf40be534 Implement graphics object "light" (patch #8943). mmuetzel <markus.muetzel@gmx.de> parents: 21782 diff changeset	3215
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3216 octave_unused_parameter (props);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3217
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3218 // 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	3219 // 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	3220
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3221 panic_impossible ();
21789 6afdf40be534 Implement graphics object "light" (patch #8943). mmuetzel <markus.muetzel@gmx.de> parents: 21782 diff changeset	3222
6afdf40be534 Implement graphics object "light" (patch #8943). mmuetzel <markus.muetzel@gmx.de> parents: 21782 diff changeset	3223 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3224 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3225
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3226 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3227 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	3228 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3229 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3230
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3231 octave_value cdata = props.get_color_data ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3232 dim_vector dv (cdata.dims ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3233 int h = dv(0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3234 int w = dv(1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3235
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3236 Matrix x = props.get_xdata ().matrix_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3237 Matrix y = props.get_ydata ().matrix_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3238
22369 17c9cc85842e Fix display of scaled images in OpenGL toolkits (bug #48879). Rik <rik@octave.org> parents: 22363 diff changeset	3239 // Someone wants us to draw an empty image? No way.
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3240 if (x.is_empty () \|\| y.is_empty ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3241 return;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3242
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3243 if (w > 1 && x(1) == x(0))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3244 x(1) = x(1) + (w-1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3245
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3246 if (h > 1 && y(1) == y(0))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3247 y(1) = y(1) + (h-1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3248
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3249 const ColumnVector p0 = xform.transform (x(0), y(0), 0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3250 const ColumnVector p1 = xform.transform (x(1), y(1), 0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3251
22369 17c9cc85842e Fix display of scaled images in OpenGL toolkits (bug #48879). Rik <rik@octave.org> parents: 22363 diff changeset	3252 if (octave::math::isnan (p0(0)) \|\| octave::math::isnan (p0(1))
17c9cc85842e Fix display of scaled images in OpenGL toolkits (bug #48879). Rik <rik@octave.org> parents: 22363 diff changeset	3253 \|\| octave::math::isnan (p1(0)) \|\| octave::math::isnan (p1(1)))
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3254 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3255 warning ("opengl_renderer: image X,Y data too large to draw");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3256 return;
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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3259 // image pixel size in screen pixel units
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3260 float pix_dx, pix_dy;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3261 // image pixel size in normalized units
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3262 float nor_dx, nor_dy;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3263
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3264 if (w > 1)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3265 {
22369 17c9cc85842e Fix display of scaled images in OpenGL toolkits (bug #48879). Rik <rik@octave.org> parents: 22363 diff changeset	3266 pix_dx = (p1(0) - p0(0)) / (w-1);
17c9cc85842e Fix display of scaled images in OpenGL toolkits (bug #48879). Rik <rik@octave.org> parents: 22363 diff changeset	3267 nor_dx = (x(1) - x(0)) / (w-1);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3268 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3269 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3270 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3271 const ColumnVector p1w = xform.transform (x(1) + 1, y(1), 0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3272 pix_dx = p1w(0) - p0(0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3273 nor_dx = 1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3274 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3275
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3276 if (h > 1)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3277 {
22369 17c9cc85842e Fix display of scaled images in OpenGL toolkits (bug #48879). Rik <rik@octave.org> parents: 22363 diff changeset	3278 pix_dy = (p1(1) - p0(1)) / (h-1);
17c9cc85842e Fix display of scaled images in OpenGL toolkits (bug #48879). Rik <rik@octave.org> parents: 22363 diff changeset	3279 nor_dy = (y(1) - y(0)) / (h-1);
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3280 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3281 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3282 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3283 const ColumnVector p1h = xform.transform (x(1), y(1) + 1, 0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3284 pix_dy = p1h(1) - p0(1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3285 nor_dy = 1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3286 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3287
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3288 // OpenGL won't draw any of the image if its origin is outside the
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3289 // viewport/clipping plane so we must do the clipping ourselves.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3290
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3291 int j0, j1, i0, i1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3292 j0 = 0, j1 = w;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3293 i0 = 0, i1 = h;
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 float im_xmin = x(0) - nor_dx/2;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3296 float im_xmax = x(1) + nor_dx/2;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3297 float im_ymin = y(0) - nor_dy/2;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3298 float im_ymax = y(1) + nor_dy/2;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3299 if (props.is_clipping ()) // clip to axes
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 if (im_xmin < xmin)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3302 j0 += (xmin - im_xmin)/nor_dx + 1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3303 if (im_xmax > xmax)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3304 j1 -= (im_xmax - xmax)/nor_dx;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3305
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3306 if (im_ymin < ymin)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3307 i0 += (ymin - im_ymin)/nor_dy + 1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3308 if (im_ymax > ymax)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3309 i1 -= (im_ymax - ymax)/nor_dy;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3310 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3311 else // clip to viewport
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3312 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3313 GLfloat vp[4];
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3314 glGetFloatv (GL_VIEWPORT, vp);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3315 // FIXME: actually add the code to do it!
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3316 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3317
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3318 if (i0 >= i1 \|\| j0 >= j1)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3319 return;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3320
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3321 glPixelZoom (pix_dx, -pix_dy);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3322 glRasterPos3d (im_xmin + nor_dxj0, im_ymin + nor_dyi0, 0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3323
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3324 // by default this is 4
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3325 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3326
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3327 // Expect RGB data
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3328 if (dv.ndims () == 3 && dv(2) == 3)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3329 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3330 if (cdata.is_double_type ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3331 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3332 const NDArray xcdata = cdata.array_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3333
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3334 OCTAVE_LOCAL_BUFFER (GLfloat, a, 3(j1-j0)(i1-i0));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3335
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3336 for (int i = i0; i < i1; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3337 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3338 for (int j = j0, idx = (i-i0)(j1-j0)3; j < j1; j++, idx += 3)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3339 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3340 a[idx] = xcdata(i,j,0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3341 a[idx+1] = xcdata(i,j,1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3342 a[idx+2] = xcdata(i,j,2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3343 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3344 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3345
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3346 draw_pixels (j1-j0, i1-i0, a);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3347
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3348 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3349 else if (cdata.is_single_type ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3350 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3351 const FloatNDArray xcdata = cdata.float_array_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3352
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3353 OCTAVE_LOCAL_BUFFER (GLfloat, a, 3(j1-j0)(i1-i0));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3354
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3355 for (int i = i0; i < i1; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3356 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3357 for (int j = j0, idx = (i-i0)(j1-j0)3; j < j1; j++, idx += 3)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3358 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3359 a[idx] = xcdata(i,j,0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3360 a[idx+1] = xcdata(i,j,1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3361 a[idx+2] = xcdata(i,j,2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3362 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3363 }
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 draw_pixels (j1-j0, i1-i0, a);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3366
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3367 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3368 else if (cdata.is_uint8_type ())
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 const uint8NDArray xcdata = cdata.uint8_array_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3371
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3372 OCTAVE_LOCAL_BUFFER (GLubyte, a, 3(j1-j0)(i1-i0));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3373
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3374 for (int i = i0; i < i1; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3375 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3376 for (int j = j0, idx = (i-i0)(j1-j0)3; j < j1; j++, idx += 3)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3377 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3378 a[idx] = xcdata(i,j,0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3379 a[idx+1] = xcdata(i,j,1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3380 a[idx+2] = xcdata(i,j,2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3381 }
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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3384 draw_pixels (j1-j0, i1-i0, a);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3385
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3386 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3387 else if (cdata.is_uint16_type ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3388 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3389 const uint16NDArray xcdata = cdata.uint16_array_value ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3390
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3391 OCTAVE_LOCAL_BUFFER (GLushort, a, 3(j1-j0)(i1-i0));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3392
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3393 for (int i = i0; i < i1; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3394 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3395 for (int j = j0, idx = (i-i0)(j1-j0)3; j < j1; j++, idx += 3)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3396 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3397 a[idx] = xcdata(i,j,0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3398 a[idx+1] = xcdata(i,j,1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3399 a[idx+2] = xcdata(i,j,2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3400 }
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 draw_pixels (j1-j0, i1-i0, a);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3404
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3405 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3406 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3407 warning ("opengl_renderer: invalid image data type (expected double, single, uint8, or uint16)");
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3408 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3409 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3410 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	3411
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3412 glPixelZoom (1, 1);
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11385 diff changeset	3413
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3414 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3415
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3416 octave_unused_parameter (props);
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 // 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	3419 // 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	3420
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3421 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3422
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3423 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3424 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3425
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3426 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3427 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	3428 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3429 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3430
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3431 glViewport (0, 0, w, h);
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3432
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3433 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3434
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3435 octave_unused_parameter (w);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3436 octave_unused_parameter (h);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3437
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3438 // 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	3439 // 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	3440
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3441 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3442
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3443 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3444 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3445
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3446 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3447 opengl_renderer::draw_pixels (int width, int height, const float *data)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3448 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3449 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3450
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3451 glDrawPixels (width, height, GL_RGB, GL_FLOAT, data);
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3452
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3453 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3454
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3455 octave_unused_parameter (width);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3456 octave_unused_parameter (height);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3457 octave_unused_parameter (data);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3458
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3459 // 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	3460 // 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	3461
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3462 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3463
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3464 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3465 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3466
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3467 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3468 opengl_renderer::draw_pixels (int width, int height, const uint8_t *data)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3469 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3470 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3471
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3472 glDrawPixels (width, height, GL_RGB, GL_UNSIGNED_BYTE, data);
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3473
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3474 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3475
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3476 octave_unused_parameter (width);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3477 octave_unused_parameter (height);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3478 octave_unused_parameter (data);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3479
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3480 // 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	3481 // 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	3482
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3483 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3484
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3485 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3486 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3487
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3488 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3489 opengl_renderer::draw_pixels (int width, int height, const uint16_t *data)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3490 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3491 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3492
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3493 glDrawPixels (width, height, GL_RGB, GL_UNSIGNED_SHORT, data);
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3494
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3495 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3496
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3497 octave_unused_parameter (width);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3498 octave_unused_parameter (height);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3499 octave_unused_parameter (data);
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 // 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	3502 // 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	3503
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3504 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3505
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3506 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3507 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3508
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3509 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3510 opengl_renderer::set_color (const Matrix& c)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3511 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3512 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3513
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3514 glColor3dv (c.data ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3515
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3516 txt_renderer.set_color (c);
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3517
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3518 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3519
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3520 octave_unused_parameter (c);
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 // 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	3523 // 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	3524
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3525 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3526
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3527 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3528 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3529
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3530 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3531 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	3532 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3533 txt_renderer.set_font (props.get ("fontname").string_value (),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3534 props.get ("fontweight").string_value (),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3535 props.get ("fontangle").string_value (),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3536 props.get ("fontsize_points").double_value ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3537 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3538
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3539 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3540 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	3541 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3542 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3543
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3544 if (on)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3545 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3546 glEnable (GL_POLYGON_OFFSET_FILL);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3547 glEnable (GL_POLYGON_OFFSET_LINE);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3548 glPolygonOffset (offset, offset);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3549 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3550 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3551 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3552 glDisable (GL_POLYGON_OFFSET_FILL);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3553 glDisable (GL_POLYGON_OFFSET_LINE);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3554 }
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3555
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3556 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3557
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3558 octave_unused_parameter (on);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3559 octave_unused_parameter (offset);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3560
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3561 // 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	3562 // 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	3563
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3564 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3565
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3566 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3567 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3568
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3569 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3570 opengl_renderer::set_linewidth (float w)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3571 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3572 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3573
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3574 glLineWidth (w);
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3575
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3576 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3577
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3578 octave_unused_parameter (w);
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 // 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	3581 // 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	3582
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3583 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3584
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3585 #endif
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
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3588 void
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	3589 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	3590 double linewidth)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3591 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3592 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3593
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3594 bool solid = false;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3595
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3596 if (s == "-")
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 glLineStipple (1, static_cast<unsigned short> (0xFFFF));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3599 solid = true;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3600 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3601 else if (s == ":")
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	3602 glLineStipple (linewidth, static_cast<unsigned short> (0x5555));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3603 else if (s == "--")
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	3604 glLineStipple (linewidth, static_cast<unsigned short> (0x0F0F));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3605 else if (s == "-.")
22396 52c205a0ad88 Make linestyles compatible at larger linewidths (bug #48884). Rik <rik@octave.org> parents: 22393 diff changeset	3606 glLineStipple (linewidth, static_cast<unsigned short> (0x6F6F));
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3607 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3608 glLineStipple (1, static_cast<unsigned short> (0x0000));
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 (solid && ! use_stipple)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3611 glDisable (GL_LINE_STIPPLE);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3612 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3613 glEnable (GL_LINE_STIPPLE);
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3614
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3615 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3616
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3617 octave_unused_parameter (s);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3618 octave_unused_parameter (use_stipple);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3619
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3620 // 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	3621 // 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	3622
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3623 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3624
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3625 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3626 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3627
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3628 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3629 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	3630 double z1, double z2)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3631 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3632 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3633
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3634 double dx = (x2-x1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3635 double dy = (y2-y1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3636 double dz = (z2-z1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3637
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3638 x1 -= 0.001dx; x2 += 0.001dx;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3639 y1 -= 0.001dy; y2 += 0.001dy;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3640 z1 -= 0.001dz; z2 += 0.001dz;
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 ColumnVector p (4, 0.0);
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 p(0) = -1; p(3) = x2;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3645 glClipPlane (GL_CLIP_PLANE0, p.data ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3646 p(0) = 1; p(3) = -x1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3647 glClipPlane (GL_CLIP_PLANE1, p.data ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3648 p(0) = 0; p(1) = -1; p(3) = y2;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3649 glClipPlane (GL_CLIP_PLANE2, p.data ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3650 p(1) = 1; p(3) = -y1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3651 glClipPlane (GL_CLIP_PLANE3, p.data ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3652 p(1) = 0; p(2) = -1; p(3) = z2;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3653 glClipPlane (GL_CLIP_PLANE4, p.data ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3654 p(2) = 1; p(3) = -z1;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3655 glClipPlane (GL_CLIP_PLANE5, p.data ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3656
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3657 xmin = x1; xmax = x2;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3658 ymin = y1; ymax = y2;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3659 zmin = z1; zmax = z2;
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3660
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3661 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3662
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3663 octave_unused_parameter (x1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3664 octave_unused_parameter (x2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3665 octave_unused_parameter (y1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3666 octave_unused_parameter (y2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3667 octave_unused_parameter (z1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3668 octave_unused_parameter (z2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3669
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3670 // 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	3671 // 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	3672
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3673 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3674
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3675 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3676 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3677
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3678 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3679 opengl_renderer::set_clipping (bool enable)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3680 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3681 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3682
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3683 bool has_clipping = (glIsEnabled (GL_CLIP_PLANE0) == GL_TRUE);
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 if (enable != has_clipping)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3686 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3687 if (enable)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3688 for (int i = 0; i < 6; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3689 glEnable (GL_CLIP_PLANE0+i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3690 else
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3691 for (int i = 0; i < 6; i++)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3692 glDisable (GL_CLIP_PLANE0+i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3693 }
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3694
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3695 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3696
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3697 octave_unused_parameter (enable);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3698
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3699 // 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	3700 // 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	3701
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3702 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3703
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3704 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3705 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3706
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3707 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3708 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	3709 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3710 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3711
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3712 # if defined (HAVE_FRAMEWORK_OPENGL)
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3713 GLint vw[4];
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3714 # else
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3715 int vw[4];
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3716 # endif
7825 13871b7de124 Import sources for OpenGL-based renderer. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3717
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3718 glGetIntegerv (GL_VIEWPORT, vw);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3719
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3720 glMatrixMode (GL_PROJECTION);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3721 glPushMatrix ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3722 glLoadIdentity ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3723 glOrtho (0, vw[2], vw[3], 0, xZ1, xZ2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3724 glMatrixMode (GL_MODELVIEW);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3725 glPushMatrix ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3726
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3727 set_clipping (false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3728 set_linewidth (width);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3729
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3730 marker_id = make_marker_list (m, size, false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3731 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	3732
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3733 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3734
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3735 octave_unused_parameter (m);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3736 octave_unused_parameter (size);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3737 octave_unused_parameter (width);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3738
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3739 // 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	3740 // 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	3741
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3742 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3743
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3744 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3745 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3746
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3747 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3748 opengl_renderer::end_marker (void)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3749 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3750 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3751
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3752 glDeleteLists (marker_id, 1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3753 glDeleteLists (filled_marker_id, 1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3754
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3755 glMatrixMode (GL_MODELVIEW);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3756 glPopMatrix ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3757 glMatrixMode (GL_PROJECTION);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3758 glPopMatrix ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3759 set_linewidth (0.5f);
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3760
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3761 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3762
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3763 // 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	3764 // 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	3765
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3766 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3767
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3768 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3769 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3770
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3771 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3772 opengl_renderer::draw_marker (double x, double y, double z,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3773 const Matrix& lc, const Matrix& fc)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3774 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3775 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3776
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3777 ColumnVector tmp = xform.transform (x, y, z, false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3778
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3779 glLoadIdentity ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3780 glTranslated (tmp(0), tmp(1), -tmp(2));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3781
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3782 if (filled_marker_id > 0 && fc.numel () > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3783 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3784 glColor3dv (fc.data ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3785 set_polygon_offset (true, -1.0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3786 glCallList (filled_marker_id);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3787 if (lc.numel () > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3788 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3789 glColor3dv (lc.data ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3790 glPolygonMode (GL_FRONT_AND_BACK, GL_LINE);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3791 glEdgeFlag (GL_TRUE);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3792 set_polygon_offset (true, -2.0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3793 glCallList (filled_marker_id);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3794 glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3795 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3796 set_polygon_offset (false);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3797 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3798 else if (marker_id > 0 && lc.numel () > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3799 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3800 glColor3dv (lc.data ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3801 glCallList (marker_id);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3802 }
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3803
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3804 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3805
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3806 octave_unused_parameter (x);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3807 octave_unused_parameter (y);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3808 octave_unused_parameter (z);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3809 octave_unused_parameter (lc);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3810 octave_unused_parameter (fc);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3811
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3812 // 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	3813 // 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	3814
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3815 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	3816
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3817 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3818 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3819
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3820 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3821 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	3822 {
21797 e5f083f9704e eliminate some duplicate code in gl-render.cc John W. Eaton <jwe@octave.org> parents: 21790 diff changeset	3823 #if defined (HAVE_OPENGL)
e5f083f9704e eliminate some duplicate code in gl-render.cc John W. Eaton <jwe@octave.org> parents: 21790 diff changeset	3824
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3825 double x = n(j,i,0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3826 double y = n(j,i,1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3827 double z = n(j,i,2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3828
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3829 double d = sqrt (xx + yy + z*z);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3830
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3831 double dir = 1.0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3832
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3833 if (bfl_mode > 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3834 dir = ((x * view_vector(0) + y * view_vector(1) + z * view_vector(2) < 0)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3835 ? ((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	3836
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3837 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	3838
e5f083f9704e eliminate some duplicate code in gl-render.cc John W. Eaton <jwe@octave.org> parents: 21790 diff changeset	3839 #else
e5f083f9704e eliminate some duplicate code in gl-render.cc John W. Eaton <jwe@octave.org> parents: 21790 diff changeset	3840
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3841 octave_unused_parameter (bfl_mode);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3842 octave_unused_parameter (n);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3843 octave_unused_parameter (j);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3844 octave_unused_parameter (i);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3845
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3846 // 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	3847 // 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	3848
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3849 panic_impossible ();
21797 e5f083f9704e eliminate some duplicate code in gl-render.cc John W. Eaton <jwe@octave.org> parents: 21790 diff changeset	3850
e5f083f9704e eliminate some duplicate code in gl-render.cc John W. Eaton <jwe@octave.org> parents: 21790 diff changeset	3851 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3852 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3853
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3854 unsigned int
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3855 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	3856 bool filled) const
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3857 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3858 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	3859
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3860 char c = marker[0];
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3861
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3862 if (filled && (c == '+' \|\| c == 'x' \|\| c == '*' \|\| c == '.'))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3863 return 0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3864
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3865 unsigned int ID = glGenLists (1);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3866 double sz = size * toolkit.get_screen_resolution () / 72.0;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3867
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3868 // constants for the * marker
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3869 const double sqrt2d4 = 0.35355339059327;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3870 double tt = sz*sqrt2d4;
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 glNewList (ID, GL_COMPILE);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3873
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3874 switch (marker[0])
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	3875 {
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3876 case '+':
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3877 glBegin (GL_LINES);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3878 glVertex2d (-sz/2, 0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3879 glVertex2d (sz/2, 0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3880 glVertex2d (0, -sz/2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3881 glVertex2d (0, sz/2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3882 glEnd ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3883 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3884 case 'x':
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3885 glBegin (GL_LINES);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3886 glVertex2d (-sz/2, -sz/2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3887 glVertex2d (sz/2, sz/2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3888 glVertex2d (-sz/2, sz/2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3889 glVertex2d (sz/2, -sz/2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3890 glEnd ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3891 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3892 case '*':
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3893 glBegin (GL_LINES);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3894 glVertex2d (-sz/2, 0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3895 glVertex2d (sz/2, 0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3896 glVertex2d (0, -sz/2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3897 glVertex2d (0, sz/2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3898 glVertex2d (-tt, -tt);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3899 glVertex2d (+tt, +tt);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3900 glVertex2d (-tt, +tt);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3901 glVertex2d (+tt, -tt);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3902 glEnd ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3903 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3904 case '.':
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3905 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3906 // 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	3907
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3908 // 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	3909 if (sz > 0 && sz < 3)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3910 sz = 3;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3911
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3912 int div = static_cast <int> (M_PI * sz / 12);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3913 if (! (div % 2))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3914 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	3915 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	3916 double ang_step = M_PI / div;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3917
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3918 glBegin (GL_POLYGON);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3919 for (double ang = 0; ang < 2*M_PI; ang += ang_step)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3920 glVertex2d (sz/6cos (ang), sz/6sin (ang));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3921 glEnd ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3922 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3923 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3924 case 's':
22268 a54d6b9c08bc Fix badly drawn 'o' and '.' markers at small and large sizes (OpenGL). Rik <rik@octave.org> parents: 22258 diff changeset	3925 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	3926 glVertex2d (-sz/2, -sz/2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3927 glVertex2d (-sz/2, sz/2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3928 glVertex2d (sz/2, sz/2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3929 glVertex2d (sz/2, -sz/2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3930 glEnd ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3931 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3932 case 'o':
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3933 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3934 int div = static_cast <int> (M_PI * sz / 4);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3935 if (! (div % 2))
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3936 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	3937 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	3938 double ang_step = M_PI / div;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3939
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3940 glBegin (filled ? GL_POLYGON : GL_LINE_LOOP);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3941 for (double ang = 0; ang < 2*M_PI; ang += ang_step)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3942 glVertex2d (sz/2cos (ang), sz/2sin (ang));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3943 glEnd ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3944 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3945 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3946 case 'd':
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3947 glBegin (filled ? GL_POLYGON : GL_LINE_LOOP);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3948 glVertex2d (0, -sz/2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3949 glVertex2d (sz/2, 0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3950 glVertex2d (0, sz/2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3951 glVertex2d (-sz/2, 0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3952 glEnd ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3953 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3954 case 'v':
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3955 glBegin (filled ? GL_POLYGON : GL_LINE_LOOP);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3956 glVertex2d (0, sz/2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3957 glVertex2d (sz/2, -sz/2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3958 glVertex2d (-sz/2, -sz/2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3959 glEnd ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3960 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3961 case '^':
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3962 glBegin (filled ? GL_POLYGON : GL_LINE_LOOP);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3963 glVertex2d (0, -sz/2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3964 glVertex2d (-sz/2, sz/2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3965 glVertex2d (sz/2, sz/2);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10202 diff changeset	3966 glEnd ();
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3967 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3968 case '>':
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3969 glBegin (filled ? GL_POLYGON : GL_LINE_LOOP);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3970 glVertex2d (sz/2, 0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3971 glVertex2d (-sz/2, sz/2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3972 glVertex2d (-sz/2, -sz/2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3973 glEnd ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3974 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3975 case '<':
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3976 glBegin (filled ? GL_POLYGON : GL_LINE_LOOP);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3977 glVertex2d (-sz/2, 0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3978 glVertex2d (sz/2, -sz/2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3979 glVertex2d (sz/2, sz/2);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3980 glEnd ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3981 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3982 case 'p':
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3983 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3984 double ang, r, dr;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3985 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	3986
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3987 glBegin (filled ? GL_POLYGON : GL_LINE_LOOP);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3988 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	3989 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3990 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	3991 r = 1.0 - (dr * fmod (double (i+1), 2.0));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3992 glVertex2d (sz/2rcos (ang), sz/2rsin (ang));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3993 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3994 glEnd ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3995 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3996 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3997 case 'h':
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3998 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	3999 double ang, r, dr;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4000 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	4001
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4002 glBegin (filled ? GL_POLYGON : GL_LINE_LOOP);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4003 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	4004 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4005 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	4006 r = 1.0 - (dr * fmod (double (i+1), 2.0));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4007 glVertex2d (sz/2rcos (ang), sz/2rsin (ang));
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4008 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4009 glEnd ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4010 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4011 break;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4012 default:
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4013 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	4014 break;
7851 002b1d8460d2 added some more markers Shai Ayal <shaiay@users.sourceforge.net> parents: 7846 diff changeset	4015 }
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4016
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4017 glEndList ();
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4018
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4019 return ID;
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4020
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4021 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4022
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4023 octave_unused_parameter (marker);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4024 octave_unused_parameter (size);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4025 octave_unused_parameter (filled);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4026
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4027 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4028 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4029
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4030 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4031
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4032 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4033 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4034
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4035 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4036 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	4037 uint8NDArray& pixels,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4038 Matrix& bbox,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4039 int halign, int valign, double rotation)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4040 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4041 txt_renderer.text_to_pixels (txt, pixels, bbox, halign, valign,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4042 rotation, interpreter);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4043 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4044
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4045 void
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4046 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	4047 std::list<text_renderer::string>& lst,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4048 Matrix& bbox,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4049 int halign, int valign, double rotation)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4050 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4051 txt_renderer.text_to_strlist (txt, lst, bbox, halign, valign,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4052 rotation, interpreter);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4053 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4054
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4055 Matrix
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4056 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	4057 double x, double y, double z,
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4058 int halign, int valign, double rotation)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4059 {
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4060 #if defined (HAVE_OPENGL)
e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4061
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4062 Matrix bbox (1, 4, 0.0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4063
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4064 if (txt.empty ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4065 return bbox;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4066
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4067 if (txt_renderer.ok ())
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4068 {
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4069 uint8NDArray pixels;
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4070 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	4071
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4072 bool blend = glIsEnabled (GL_BLEND);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4073
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4074 glEnable (GL_BLEND);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4075 glEnable (GL_ALPHA_TEST);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4076 glRasterPos3d (x, y, z);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4077 glBitmap(0, 0, 0, 0, bbox(0), bbox(1), 0);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4078 glDrawPixels (bbox(2), bbox(3),
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4079 GL_RGBA, GL_UNSIGNED_BYTE, pixels.data ());
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4080 glDisable (GL_ALPHA_TEST);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4081
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4082 if (! blend)
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4083 glDisable (GL_BLEND);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4084 }
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4085
21209 67d2965af0b5 revamp text rendering classes John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	4086 return bbox;
67d2965af0b5 revamp text rendering classes John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	4087
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4088 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4089
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4090 octave_unused_parameter (txt);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4091 octave_unused_parameter (x);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4092 octave_unused_parameter (y);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4093 octave_unused_parameter (z);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4094 octave_unused_parameter (halign);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4095 octave_unused_parameter (valign);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4096 octave_unused_parameter (rotation);
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4097
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4098 // This shouldn't happen because construction of opengl_renderer
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4099 // objects is supposed to be impossible if OpenGL is not available.
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4100
b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4101 panic_impossible ();
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21689 diff changeset	4102
21353 e4fc19d8c6c3 remove HAVE_OPENGL from public header file John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	4103 #endif
22331 b81b08cc4c83 maint: Indent namespaces in more files. John W. Eaton <jwe@octave.org> parents: 22326 diff changeset	4104 }
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 8920 diff changeset	4105 }

Mercurial > octave

annotate libinterp/corefcn/gl-render.cc @ 22396:52c205a0ad88